瀏覽代碼

**************************************万达adm**********************************************
提交

zhangweixin 4 年之前
父節點
當前提交
3718ff8f0e
共有 28 個文件被更改,包括 158 次插入79 次删除
  1. 65 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/EquipComp.kt
  2. 2 2
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/ManualRelationCalcAddService.kt
  3. 8 3
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/controllers/TestController.kt
  4. 3 1
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/controllers/obj/ObjectFromToControllers.kt
  5. 5 6
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/controllers/obj/ObjectToFromController.kt
  6. 7 6
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/controllers/obj/RelFromToControllers.kt
  7. 6 5
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/controllers/obj/RelToFromController.kt
  8. 2 1
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/controllers/obj/TestControllers.kt
  9. 6 3
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/jms/DataCenterSync.kt
  10. 1 0
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/jms/MessageProcessing.kt
  11. 1 0
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/jms/RwdSync.kt
  12. 6 3
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/tools/EquipUtil.kt
  13. 4 4
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/tools/SpaceUtil.kt
  14. 2 3
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/BaseDataService.kt
  15. 2 2
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterBuilding.kt
  16. 3 3
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterComponent.kt
  17. 1 1
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterEquipment.kt
  18. 3 3
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterSpace.kt
  19. 1 0
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterVOTn.kt
  20. 3 3
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/RwdBuilding.kt
  21. 3 3
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/RwdComponent.kt
  22. 3 3
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/RwdEquip.kt
  23. 3 3
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/RwdFloor.kt
  24. 4 6
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/RwdRelationAdd.kt
  25. 4 6
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/RwdRelationDel.kt
  26. 3 3
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/RwdSpace.kt
  27. 5 4
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/rel/AutomaticCalculationSync.kt
  28. 2 2
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/rel/EquipinSpaceSync.kt

+ 65 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/EquipComp.kt

@@ -0,0 +1,65 @@
+package com.persagy.server.datacenter.wanda
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+
+/**
+ * 设备对照表
+ * @author  Cainga
+ * @date  2020/12/3 15:53
+ */
+
+@Schema(description = "设备对照")
+@Table(name = "revit.equip_comp")
+@JsonIgnoreProperties(ignoreUnknown = true)
+open class EquipComp {
+
+//    /** id */
+//   @Schema(description = "id")
+    @Column(name = "id", updatable = false)
+    @Id
+    var id: Int? = null
+
+    /** 万达BIMTypeID */
+    @Schema(description = "万达BIMTypeID")
+    @Column(name = "bim_type_id")
+//    @JSONField(name = "BIMTypeID")
+//    @JsonProperty("BIMTypeID")
+    var bimTypeId: String? = null
+
+    /** 万达BIMTypeName */
+    @Schema(description = "万达BIMTypeName")
+    @Column(name = "bim_type_name")
+//    @JSONField(name = "BIMTypeID")
+//    @JsonProperty("BIMTypeID")
+    var bimTypeName: String? = null
+
+    /** 系统分类 */
+    @Schema(description = "系统分类")
+    @Column(name = "sys_name")
+    var sysName: String? = null
+
+
+    /** 设备设施类编码 */
+    @Schema(description = "设备设施类编码")
+    @Column(name = "class_code")
+    var classCode: String? = null
+    set(description) {
+        field = description?.trim()
+    }
+
+
+    /** 设备设施类名称 */
+    @Schema(description = "设备设施类名称")
+    @Column(name = "class_name")
+    var className: String? = null
+
+
+//    /** 慧云码*/
+//    @Schema(description = "慧云码")
+//    @Column(name = "alias_code")
+//    var aliasCode: String? = null
+}

+ 2 - 2
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/ManualRelationCalcAddService.kt

@@ -4,13 +4,13 @@ import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.datacenter.models.entities.graphtype.block.RelationAddRequest
 import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
-import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Sp
-import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Sy
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
 import com.persagy.server.datacenter.models.response.ManualRelationCalcSCreateResponse
 import com.persagy.server.datacenter.services.objects.BuildingService
 import com.persagy.server.datacenter.services.objects.EquipmentService
 import com.persagy.server.datacenter.services.objects.GeneralSystemService
+import com.persagy.server.datacenter.wanda.rel.REq2Sp
+import com.persagy.server.datacenter.wanda.rel.REq2Sy
 import com.persagy.server.datacenter.wanda.rel.RSp2Sp
 import com.persagy.server.services.objects.FloorService
 import com.persagy.service.SObjectService

+ 8 - 3
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/controllers/TestController.kt

@@ -24,14 +24,15 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.controllers
+package com.persagy.server.datacenter.syn.controllers
 
 import com.alibaba.fastjson.JSONObject
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DefFuncId
+import com.persagy.server.datacenter.wanda.EquipComp
 import com.persagy.server.datacenter.wanda.dict.DictInfosWanDa
-import com.persagy.server.datacenter.datacenter.wanda.obj.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.syn.models.response.GroupResponse
 import com.persagy.service.SObjectService
 import com.persagy.service.models.enums.SResponseType
@@ -66,6 +67,9 @@ class TestController {
      */
     private val equipmentService = SObjectService(SMybatisDao(Equipment::class.java))
 
+    private val equipCompService = SObjectService(SMybatisDao(EquipComp::class.java))
+
+
 
     // 注意获取这个实例
     @Autowired
@@ -94,7 +98,8 @@ class TestController {
     fun analogData(@RequestParam groupCode: String,@RequestParam projectId: String): SBaseResponse{
         try {
 
-            val equipmentList = equipmentService.select(SFilter.eq("projectId", projectId)).exec()
+            val equipmentList = equipCompService.selectAll().exec()
+
             var setCode = HashSet<String>()
             for (equipment in equipmentList){
                 setCode.add(equipment.classCode!!)

+ 3 - 1
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/controllers/obj/ObjectFromToControllers.kt

@@ -34,9 +34,11 @@ import com.persagy.server.datacenter.models.entities.assistant.PointPosition
 import com.persagy.server.datacenter.models.entities.objects.SpaceOutline
 import com.persagy.server.datacenter.models.entities.rel.RSpinBd
 import com.persagy.server.datacenter.models.entities.rel.RSpinFl
+import com.persagy.server.datacenter.syn.models.tools.EquipUtil
+import com.persagy.server.datacenter.syn.models.tools.SpaceUtil
 import com.persagy.server.syn.models.api.obj.*
 import com.persagy.server.syn.models.tools.*
-import com.persagy.server.syn.services.BaseDataService
+import com.persagy.server.datacenter.syn.services.BaseDataService
 import com.persagy.server.syn.services.dict.DClassDefService
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SBaseResponse

+ 5 - 6
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/controllers/obj/ObjectToFromController.kt

@@ -24,24 +24,23 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.controllers.obj
+package com.persagy.server.datacenter.syn.controllers.obj
 
 import com.alibaba.fastjson.JSONArray
 import com.alibaba.fastjson.JSONObject
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.datacenter.wanda.obj.ZoneSpace
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
 import com.persagy.server.datacenter.models.entities.objects.*
-import com.persagy.server.datacenter.wanda.obj.Equipment
+import com.persagy.server.datacenter.syn.models.tools.EquipUtil
+import com.persagy.server.datacenter.syn.models.tools.SpaceUtil
+import com.persagy.server.datacenter.wanda.obj.*
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.models.api.obj.BuildingApi
 import com.persagy.server.syn.models.api.obj.EquipApi
 import com.persagy.server.syn.models.api.obj.FloorApi
-import com.persagy.server.syn.models.tools.EquipUtil
 import com.persagy.server.syn.models.tools.ShaftUtil
-import com.persagy.server.syn.models.tools.SpaceUtil
 import com.persagy.server.syn.models.tools.SystemUtil
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
@@ -264,7 +263,7 @@ class ObjectToFromController {
 //                        space.outline = spaceOutline.outline
 //                    }
                     val createObj =
-                        EquipApi.createObj(dictProject!!.groupCode!!, projectId,SpaceUtil.spaceTools(projectId, space))
+                        EquipApi.createObj(dictProject!!.groupCode!!, projectId, SpaceUtil.spaceTools(projectId, space))
                     if (!createObj) {
                         val updateObj =
                             EquipApi.updateObj(dictProject!!.groupCode!!, projectId,SpaceUtil.spaceTools(projectId, space))

+ 7 - 6
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/controllers/obj/RelFromToControllers.kt

@@ -1,15 +1,16 @@
-package com.persagy.server.syn.controllers.obj
+package com.persagy.server.datacenter.syn.controllers.obj
 
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Eq
-import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Sp
-import com.persagy.server.datacenter.datacenter.models.entities.rel.RSp2Sp
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
 import com.persagy.server.datacenter.wanda.obj.Equipment
-import com.persagy.server.datacenter.models.entities.objects.Floor
-import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.*
+import com.persagy.server.datacenter.wanda.obj.Floor
+import com.persagy.server.datacenter.wanda.obj.ZoneSpace
+import com.persagy.server.datacenter.wanda.rel.REq2Eq
+import com.persagy.server.datacenter.wanda.rel.REq2Sp
+import com.persagy.server.datacenter.wanda.rel.RSp2Sp
+import com.persagy.server.datacenter.wanda.rel.RSy2Sp
 import com.persagy.server.syn.models.api.obj.EquipApi
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService

+ 6 - 5
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/controllers/obj/RelToFromController.kt

@@ -24,19 +24,20 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.controllers.obj
+package com.persagy.server.datacenter.syn.controllers.obj
 
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.database.functions.SLength
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Eq
-import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Sp
-import com.persagy.server.datacenter.datacenter.models.entities.rel.RSp2Sp
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
 import com.persagy.server.datacenter.wanda.obj.Equipment
-import com.persagy.server.datacenter.models.entities.objects.Floor
 import com.persagy.server.datacenter.models.entities.rel.*
+import com.persagy.server.datacenter.wanda.obj.Floor
+import com.persagy.server.datacenter.wanda.rel.REq2Eq
+import com.persagy.server.datacenter.wanda.rel.REq2Sp
+import com.persagy.server.datacenter.wanda.rel.RSp2Sp
+import com.persagy.server.datacenter.wanda.rel.RSy2Sp
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.models.api.obj.EquipApi
 import com.persagy.service.SBaseService

+ 2 - 1
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/controllers/obj/TestControllers.kt

@@ -26,6 +26,7 @@
 
 package com.persagy.server.syn.controllers.obj
 
+import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
@@ -34,7 +35,7 @@ import com.persagy.server.datacenter.wanda.obj.Floor
 import com.persagy.server.datacenter.wanda.obj.Project
 import com.persagy.server.syn.models.api.obj.BuildingApi
 import com.persagy.server.syn.models.api.obj.EquipApi
-import com.persagy.server.syn.models.tools.EquipUtil
+import com.persagy.server.datacenter.syn.models.tools.EquipUtil
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
 import com.persagy.service.models.enums.SResponseType

+ 6 - 3
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/jms/DataCenterSync.kt

@@ -1,14 +1,17 @@
-package com.persagy.server.syn.jms
+package com.persagy.server.datacenter.syn.jms
 
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.persagy.base.extensions.toJson
 import com.persagy.server.datacenter.models.jms.SynchronousMessage
 import com.persagy.server.datacenter.models.jms.SynchronousMessageRel
+import com.persagy.server.datacenter.syn.services.jms.DataCenterBuilding
+import com.persagy.server.datacenter.syn.services.jms.DataCenterComponent
+import com.persagy.server.datacenter.syn.services.jms.DataCenterSpace
+import com.persagy.server.datacenter.syn.services.jms.rel.AutomaticCalculationSync
+import com.persagy.server.datacenter.syn.services.jms.rel.EquipinSpaceSync
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.services.jms.*
-import com.persagy.server.syn.services.jms.rel.AutomaticCalculationSync
-import com.persagy.server.syn.services.jms.rel.EquipinSpaceSync
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service

+ 1 - 0
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/jms/MessageProcessing.kt

@@ -30,6 +30,7 @@ import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.jms.SynchronousMessage
 import com.persagy.server.datacenter.models.jms.SynchronousMessageRel
+import com.persagy.server.datacenter.syn.jms.DataCenterSync
 import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
 import com.persagy.server.syn.task.SchedulerTask
 import com.persagy.service.SObjectService

+ 1 - 0
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/jms/RwdSync.kt

@@ -26,6 +26,7 @@
 
 package com.persagy.server.syn.jms
 
+import com.persagy.server.datacenter.syn.services.jms.*
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
 import com.persagy.server.syn.services.jms.*

+ 6 - 3
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/tools/EquipUtil.kt

@@ -24,15 +24,16 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.models.tools
+package com.persagy.server.datacenter.syn.models.tools
 
 import com.persagy.base.extensions.toInt
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DefFuncId
-import com.persagy.server.datacenter.datacenter.wanda.obj.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.syn.Opts
+import com.persagy.server.syn.models.tools.ProjectUtil
 import com.persagy.service.SObjectService
 import com.persagy.service.utils.SSpringContextUtil
 import org.slf4j.LoggerFactory
@@ -2529,7 +2530,9 @@ object EquipUtil {
                                 "localId" -> equipment.localId =  mapObj[key]!!.toString()
                                 "localName" -> equipment.localName =  mapObj[key]!!.toString()
                                 "defaultQRCode" -> equipment.defaultQRCode =  mapObj[key]!!.toString()
-                                "qRCodePic" -> equipment.qRCodePic =  mapObj[key]!!.toString()
+//                                "qRCodePic" ->{
+//                                    equipment.qRCodePic =  mapObj[key]
+//                                }
                                 "rfId" -> equipment.rfId =  mapObj[key]!!.toString()
                                 "cadId" -> equipment.cadId =  mapObj[key]!!.toString()
                                 "bimFamilyName" -> equipment.bimFamilyName =  mapObj[key]!!.toString()

+ 4 - 4
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/tools/SpaceUtil.kt

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.models.tools
+package com.persagy.server.datacenter.syn.models.tools
 
 import com.alibaba.fastjson.JSON
 import com.google.gson.Gson
@@ -33,11 +33,11 @@ import com.persagy.base.extensions.toInt
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.models.entities.assistant.AttPic
 import com.persagy.server.datacenter.models.entities.assistant.PointPosition
 import com.persagy.server.datacenter.models.entities.assistant.TaskPic
 import com.persagy.server.datacenter.models.entities.dictnew.DefFuncId
-import com.persagy.server.datacenter.datacenter.models.entities.objects.ZoneSpace
+import com.persagy.server.datacenter.wanda.AttPic
+import com.persagy.server.datacenter.wanda.obj.ZoneSpace
 import com.persagy.server.syn.Opts
 import com.persagy.server.syn.controllers.obj.ObjectFromToControllers
 import com.persagy.service.SObjectService
@@ -487,7 +487,7 @@ object SpaceUtil {
                         "localId" -> zoneSpace.localId =  mapObj[key]!!.toString()
                         "localName" -> zoneSpace.localName =  mapObj[key]!!.toString()
                         "defaultQRCode" -> zoneSpace.defaultQRCode =  mapObj[key]!!.toString()
-                        "qRCodePic" -> zoneSpace.qRCodePic =  mapObj[key]!!.toString()
+//                        "qRCodePic" -> zoneSpace.qRCodePic =  mapObj[key]!!.toString()
                         "roomSerial" -> zoneSpace.roomSerial =  mapObj[key]!!.toString().toDoubleOrNull()
                         "roomFuncType" -> zoneSpace.roomFuncType =  mapObj[key]!!.toString()
                         "depth" -> zoneSpace.depth =  mapObj[key]!!.toString().toDoubleOrNull()

+ 2 - 3
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/BaseDataService.kt

@@ -24,16 +24,15 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.services
+package com.persagy.server.datacenter.syn.services
 
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
 import com.persagy.server.datacenter.models.entities.dictnew.Group
 import com.persagy.server.datacenter.models.entities.objects.*
 import com.persagy.server.datacenter.models.entities.rel.RSpinBd
 import com.persagy.server.datacenter.models.entities.rel.RSpinFl
-import com.persagy.server.datacenter.wanda.obj.Equipment
+import com.persagy.server.datacenter.wanda.obj.*
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
 

+ 2 - 2
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterBuilding.kt

@@ -24,14 +24,14 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.services.jms
+package com.persagy.server.datacenter.syn.services.jms
 
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
-import com.persagy.server.datacenter.datacenter.wanda.obj.Building
 import com.persagy.server.datacenter.models.jms.SynchronousMessage
+import com.persagy.server.datacenter.wanda.obj.Building
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.models.api.obj.BuildingApi
 import com.persagy.service.SBaseService

+ 3 - 3
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterComponent.kt

@@ -24,16 +24,16 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.services.jms
+package com.persagy.server.datacenter.syn.services.jms
 
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
-import com.persagy.server.datacenter.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.jms.SynchronousMessage
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.models.api.obj.EquipApi
-import com.persagy.server.syn.models.tools.EquipUtil
+import com.persagy.server.datacenter.syn.models.tools.EquipUtil
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
 import org.springframework.stereotype.Service

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterEquipment.kt

@@ -33,7 +33,7 @@ import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.jms.SynchronousMessage
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.models.api.obj.EquipApi
-import com.persagy.server.syn.models.tools.EquipUtil
+import com.persagy.server.datacenter.syn.models.tools.EquipUtil
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
 import org.springframework.stereotype.Service

+ 3 - 3
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterSpace.kt

@@ -24,20 +24,20 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.services.jms
+package com.persagy.server.datacenter.syn.services.jms
 
 import com.alibaba.fastjson.JSONArray
 import com.alibaba.fastjson.JSONObject
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
-import com.persagy.server.datacenter.datacenter.wanda.obj.ZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.RSpinBd
 import com.persagy.server.datacenter.models.entities.rel.RSpinFl
 import com.persagy.server.datacenter.models.jms.SynchronousMessage
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.models.api.obj.EquipApi
-import com.persagy.server.syn.models.tools.SpaceUtil
+import com.persagy.server.datacenter.syn.models.tools.SpaceUtil
+import com.persagy.server.datacenter.wanda.obj.ZoneSpace
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
 import org.springframework.stereotype.Service

+ 1 - 0
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterVOTn.kt

@@ -6,6 +6,7 @@ import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
 import com.persagy.server.datacenter.datacenter.models.entities.objects.Tenant
 import com.persagy.server.datacenter.models.jms.SynchronousMessage
+import com.persagy.server.datacenter.syn.services.jms.DataCenterBuilding
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.models.api.obj.EquipApi
 import com.persagy.server.syn.models.tools.VOTnUtil

+ 3 - 3
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/RwdBuilding.kt

@@ -24,13 +24,13 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.services.jms
+package com.persagy.server.datacenter.syn.services.jms
 
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
-import com.persagy.server.datacenter.datacenter.wanda.obj.Building
-import com.persagy.server.datacenter.models.entities.objects.Project
+import com.persagy.server.datacenter.wanda.obj.Building
+import com.persagy.server.datacenter.wanda.obj.Project
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
 import com.persagy.server.syn.models.api.obj.BuildingApi

+ 3 - 3
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/RwdComponent.kt

@@ -24,18 +24,18 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.services.jms
+package com.persagy.server.datacenter.syn.services.jms
 
 import com.alibaba.fastjson.JSONObject
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
-import com.persagy.server.datacenter.datacenter.wanda.obj.Equipment
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
 import com.persagy.server.syn.models.api.obj.BuildingApi
 import com.persagy.server.syn.models.api.obj.EquipApi
-import com.persagy.server.syn.models.tools.EquipUtil
+import com.persagy.server.datacenter.syn.models.tools.EquipUtil
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
 import org.springframework.stereotype.Service

+ 3 - 3
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/RwdEquip.kt

@@ -24,17 +24,17 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.services.jms
+package com.persagy.server.datacenter.syn.services.jms
 
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
-import com.persagy.server.datacenter.datacenter.wanda.obj.Equipment
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
 import com.persagy.server.syn.models.api.obj.BuildingApi
 import com.persagy.server.syn.models.api.obj.EquipApi
-import com.persagy.server.syn.models.tools.EquipUtil
+import com.persagy.server.datacenter.syn.models.tools.EquipUtil
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
 import org.springframework.stereotype.Service

+ 3 - 3
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/RwdFloor.kt

@@ -24,13 +24,13 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.services.jms
+package com.persagy.server.datacenter.syn.services.jms
 
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
-import com.persagy.server.datacenter.datacenter.wanda.obj.Building
-import com.persagy.server.datacenter.models.entities.objects.Floor
+import com.persagy.server.datacenter.wanda.obj.Building
+import com.persagy.server.datacenter.wanda.obj.Floor
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
 import com.persagy.server.syn.models.api.obj.BuildingApi

+ 4 - 6
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/RwdRelationAdd.kt

@@ -24,18 +24,16 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.services.jms
+package com.persagy.server.datacenter.syn.services.jms
 
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Sp
-import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Sy
-import com.persagy.server.datacenter.datacenter.models.entities.rel.RSp2Sp
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
 import com.persagy.server.datacenter.wanda.obj.Equipment
-import com.persagy.server.datacenter.models.entities.objects.Floor
-import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.*
+import com.persagy.server.datacenter.wanda.obj.Floor
+import com.persagy.server.datacenter.wanda.obj.ZoneSpace
+import com.persagy.server.datacenter.wanda.rel.*
 import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService

+ 4 - 6
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/RwdRelationDel.kt

@@ -24,18 +24,16 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.services.jms
+package com.persagy.server.datacenter.syn.services.jms
 
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Sp
-import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Sy
-import com.persagy.server.datacenter.datacenter.models.entities.rel.RSp2Sp
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
 import com.persagy.server.datacenter.wanda.obj.Equipment
-import com.persagy.server.datacenter.models.entities.objects.Floor
-import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.*
+import com.persagy.server.datacenter.wanda.obj.Floor
+import com.persagy.server.datacenter.wanda.obj.ZoneSpace
+import com.persagy.server.datacenter.wanda.rel.*
 import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService

+ 3 - 3
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/RwdSpace.kt

@@ -24,21 +24,21 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.services.jms
+package com.persagy.server.datacenter.syn.services.jms
 
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
-import com.persagy.server.datacenter.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.RSpinBd
 import com.persagy.server.datacenter.models.entities.rel.RSpinFl
+import com.persagy.server.datacenter.syn.models.tools.SpaceUtil
+import com.persagy.server.datacenter.wanda.obj.ZoneSpace
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.controllers.obj.ObjectFromToControllers
 import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
 import com.persagy.server.syn.models.api.obj.BuildingApi
 import com.persagy.server.syn.models.api.obj.EquipApi
-import com.persagy.server.syn.models.tools.SpaceUtil
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
 import org.slf4j.LoggerFactory

+ 5 - 4
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/rel/AutomaticCalculationSync.kt

@@ -24,16 +24,17 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.services.jms.rel
+package com.persagy.server.datacenter.syn.services.jms.rel
 
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Eq
-import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Sp
-import com.persagy.server.datacenter.datacenter.models.entities.rel.RSp2Sp
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
 import com.persagy.server.datacenter.models.entities.rel.*
 import com.persagy.server.datacenter.models.jms.SynchronousMessageRel
+import com.persagy.server.datacenter.wanda.rel.REq2Eq
+import com.persagy.server.datacenter.wanda.rel.REq2Sp
+import com.persagy.server.datacenter.wanda.rel.RSp2Sp
+import com.persagy.server.datacenter.wanda.rel.RSy2Sp
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.models.api.obj.EquipApi
 import com.persagy.service.SObjectService

+ 2 - 2
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/rel/EquipinSpaceSync.kt

@@ -1,11 +1,11 @@
-package com.persagy.server.syn.services.jms.rel
+package com.persagy.server.datacenter.syn.services.jms.rel
 
 import com.alibaba.fastjson.JSONArray
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
-import com.persagy.server.datacenter.datacenter.wanda.obj.ZoneSpace
 import com.persagy.server.datacenter.models.jms.SynchronousMessageRel
+import com.persagy.server.datacenter.wanda.obj.ZoneSpace
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.models.api.obj.EquipApi
 import com.persagy.service.SBaseService