Explorar el Código

**************************************万达adm**********************************************
首次提交

zhangweixin hace 4 años
padre
commit
7cdfa9a857
Se han modificado 73 ficheros con 581 adiciones y 300 borrados
  1. 2 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/objects/Property.kt
  2. 2 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/objects/Tenant.kt
  3. 4 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/EquipScanTask.kt
  4. 4 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/EquipScanTaskQuery.kt
  5. 4 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/EquipmentTaskTwo.kt
  6. 4 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/ModelScanTask.kt
  7. 5 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/ModelScanTaskQuery.kt
  8. 5 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/PropertyScanTask.kt
  9. 2 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/response/SpaceSQueryResponse.kt
  10. 0 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/obj/Building.kt
  11. 0 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/obj/GeneralSystem.kt
  12. 4 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/rel/RelEq2BdEquip.kt
  13. 23 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/rel/RelEq2FlEquip.kt
  14. 93 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/rel/RelFloor.kt
  15. 0 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/rel/RelZoneSpaceBd.kt
  16. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/objects/EquipController.kt
  17. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/objects/PropertyController.kt
  18. 2 2
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/objects/TenantController.kt
  19. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/objects/ZoneSpaceController.kt
  20. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RShContainSpBaseController.kt
  21. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyForSpController.kt
  22. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyInSpController.kt
  23. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/relation_calc/MepSystemCalcController.kt
  24. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/mappers/StatisticsCountMapper.kt
  25. 3 3
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/assistant/UpDataFloorAndBuildingServuce.kt
  26. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/base/ServiceSpace.kt
  27. 4 4
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/graphtype/GraphicTypeMapperService.kt
  28. 3 2
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/BuildingService.kt
  29. 2 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/EquipmentProSyService.kt
  30. 2 10
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/EquipmentService.kt
  31. 1 0
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/FloorService.kt
  32. 4 4
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/GeneralSystemService.kt
  33. 3 4
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/PropertyService.kt
  34. 1 3
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/ShaftService.kt
  35. 3 3
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/TenantService.kt
  36. 5 4
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/ZoneSpaceBaseService.kt
  37. 4 3
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/rel/RShContainSpBaseService.kt
  38. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/rel/RShaftThroughShaftService.kt
  39. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/rel/RSpatialConnectionService.kt
  40. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/rel/RSyEqService.kt
  41. 4 4
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/rel/RSyForSpBaseService.kt
  42. 4 4
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/rel/RSyInSpBaseService.kt
  43. 2 3
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/CalcSpecialService.kt
  44. 3 3
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/ManualRelationCalcAddService.kt
  45. 323 148
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/ManualRelationCalcService.kt
  46. 2 3
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/MepSystemCalcService.kt
  47. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/MepSystemTransformer.kt
  48. 3 3
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/RelationCalcService.kt
  49. 3 3
      datacenter/src/main/kotlin/com/persagy/server/datacenter/wanda/controllers/obj/BuildingController.kt
  50. 1 5
      datacenter/src/main/kotlin/com/persagy/server/datacenter/wanda/controllers/obj/EquipController.kt
  51. 1 4
      datacenter/src/main/kotlin/com/persagy/server/datacenter/wanda/controllers/obj/FloorController.kt
  52. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/wanda/controllers/obj/GeneralSystemController.kt
  53. 3 9
      datacenter/src/main/kotlin/com/persagy/server/datacenter/wanda/controllers/obj/ZoneSpaceController.kt
  54. 7 5
      datacenter/src/main/kotlin/com/persagy/server/datacenter/wanda/controllers/relation/ManualRelationCalcController.kt
  55. 1 1
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/tools/VOTnUtil.kt
  56. 1 1
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterVOTn.kt
  57. 1 1
      equip-component/src/main/kotlin/com/persagy/server/controllers/EquipController.kt
  58. 1 1
      equip-component/src/main/kotlin/com/persagy/server/dao/mappers/StatisticsCountMapper.kt
  59. 1 1
      equip-component/src/main/kotlin/com/persagy/server/models/EquipmentDel.kt
  60. 1 1
      equip-component/src/main/kotlin/com/persagy/server/models/PropertyEquip.kt
  61. 1 1
      equip-component/src/main/kotlin/com/persagy/server/service/EquipmentProSyService.kt
  62. 1 1
      equip-component/src/main/kotlin/com/persagy/server/service/objects/PropertyService.kt
  63. 1 1
      equip-component/src/main/kotlin/com/persagy/server/service/objects/TenantService.kt
  64. 2 0
      scanbuilding/src/main/kotlin/com/persagy/server/controller/task/EquipScanTaskController.kt
  65. 1 0
      scanbuilding/src/main/kotlin/com/persagy/server/controller/task/ModelScanTaskController.kt
  66. 1 1
      scanbuilding/src/main/kotlin/com/persagy/server/controller/task/PropertyScanTaskController.kt
  67. 1 1
      scanbuilding/src/main/kotlin/com/persagy/server/controller/task/ScanTaskBaseController.kt
  68. 1 1
      scanbuilding/src/main/kotlin/com/persagy/server/mappers/StatisticsCountMapper.kt
  69. 1 1
      scanbuilding/src/main/kotlin/com/persagy/server/services/task/EquipScanTaskQueryService.kt
  70. 1 1
      scanbuilding/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskQueryService.kt
  71. 2 0
      scanbuilding/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskService.kt
  72. 2 2
      scanbuilding/src/main/kotlin/com/persagy/server/services/task/PropertyScanTaskService.kt
  73. 1 0
      scanbuilding/src/main/kotlin/com/persagy/server/services/task/ScanTaskBaseService.kt

+ 2 - 3
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/objects/Property.kt

@@ -24,16 +24,15 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.objects
+package com.persagy.server.datacenter.datacenter.models.entities.objects
 
 
-import com.persagy.server.datacenter.datacenter.wanda.obj.ZoneSpace
 import com.persagy.server.datacenter.models.entities.assistant.BIMLocation
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.server.datacenter.models.entities.dict.EquipFamilyCategory
 import com.persagy.server.datacenter.models.entities.dict.Family
 import com.persagy.server.datacenter.models.entities.task.SchemeUtils
-import com.persagy.server.datacenter.wanda.obj.Equipment
+import com.persagy.server.datacenter.wanda.obj.*
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column

+ 2 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/objects/Tenant.kt

@@ -24,10 +24,10 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.objects
+package com.persagy.server.datacenter.datacenter.models.entities.objects
 
-import com.persagy.server.datacenter.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
+import com.persagy.server.datacenter.wanda.obj.ZoneSpace
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column

+ 4 - 3
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/EquipScanTask.kt

@@ -24,14 +24,15 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.task
+package com.persagy.server.datacenter.datacenter.models.entities.task
 
 import com.persagy.server.datacenter.models.entities.dict.EquipCategory
 import com.persagy.server.datacenter.models.entities.dict.EquipFamily
+import com.persagy.server.datacenter.models.entities.task.ScanScheme
 import com.persagy.server.datacenter.wanda.obj.Building
-import com.persagy.server.datacenter.models.entities.objects.Floor
-import com.persagy.server.datacenter.models.entities.objects.Project
 import com.persagy.server.datacenter.models.entities.task.base.ScanTaskBase
+import com.persagy.server.datacenter.wanda.obj.Floor
+import com.persagy.server.datacenter.wanda.obj.Project
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column

+ 4 - 3
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/EquipScanTaskQuery.kt

@@ -24,16 +24,17 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.task
+package com.persagy.server.datacenter.datacenter.models.entities.task
 
 import com.persagy.server.datacenter.models.entities.assistant.BIMLocation
 import com.persagy.server.datacenter.models.entities.assistant.TaskPic
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import com.persagy.server.datacenter.models.entities.dict.EquipFamily
 import com.persagy.server.datacenter.datacenter.models.entities.dictnew.DefClass
+import com.persagy.server.datacenter.models.entities.task.ScanScheme
 import com.persagy.server.datacenter.wanda.obj.Building
-import com.persagy.server.datacenter.models.entities.objects.Floor
-import com.persagy.server.datacenter.models.entities.objects.Project
+import com.persagy.server.datacenter.wanda.obj.Floor
+import com.persagy.server.datacenter.wanda.obj.Project
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column

+ 4 - 3
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/EquipmentTaskTwo.kt

@@ -24,12 +24,13 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.task
+package com.persagy.server.datacenter.datacenter.models.entities.task
 
-import com.persagy.server.datacenter.datacenter.models.entities.objects.ZoneSpace
+import com.persagy.server.datacenter.datacenter.models.entities.objects.Property
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.server.datacenter.models.entities.dict.EquipCategory
-import com.persagy.server.datacenter.models.entities.objects.*
+import com.persagy.server.datacenter.models.entities.task.SchemeUtils
+import com.persagy.server.datacenter.wanda.obj.*
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column

+ 4 - 3
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/ModelScanTask.kt

@@ -24,13 +24,14 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.task
+package com.persagy.server.datacenter.datacenter.models.entities.task
 
 import com.persagy.server.datacenter.models.entities.dict.EquipCategory
+import com.persagy.server.datacenter.models.entities.task.ScanScheme
 import com.persagy.server.datacenter.wanda.obj.Building
-import com.persagy.server.datacenter.models.entities.objects.Floor
-import com.persagy.server.datacenter.models.entities.objects.Project
 import com.persagy.server.datacenter.models.entities.task.base.ScanTaskBase
+import com.persagy.server.datacenter.wanda.obj.Floor
+import com.persagy.server.datacenter.wanda.obj.Project
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column

+ 5 - 4
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/ModelScanTaskQuery.kt

@@ -24,15 +24,16 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.task
+package com.persagy.server.datacenter.datacenter.models.entities.task
 
 import com.persagy.server.datacenter.models.entities.assistant.BIMLocation
 import com.persagy.server.datacenter.models.entities.assistant.TaskPic
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import com.persagy.server.datacenter.datacenter.models.entities.dictnew.DefClass
-import com.persagy.server.datacenter.datacenter.wanda.obj.Building
-import com.persagy.server.datacenter.models.entities.objects.Floor
-import com.persagy.server.datacenter.models.entities.objects.Project
+import com.persagy.server.datacenter.models.entities.task.ScanScheme
+import com.persagy.server.datacenter.wanda.obj.Building
+import com.persagy.server.datacenter.wanda.obj.Floor
+import com.persagy.server.datacenter.wanda.obj.Project
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column

+ 5 - 4
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/PropertyScanTask.kt

@@ -24,13 +24,14 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.task
+package com.persagy.server.datacenter.datacenter.models.entities.task
 
 import com.persagy.server.datacenter.models.entities.dict.EquipFamilyCategory
-import com.persagy.server.datacenter.datacenter.wanda.obj.Building
-import com.persagy.server.datacenter.models.entities.objects.Floor
-import com.persagy.server.datacenter.models.entities.objects.Project
+import com.persagy.server.datacenter.models.entities.task.ScanScheme
 import com.persagy.server.datacenter.models.entities.task.base.ScanTaskBase
+import com.persagy.server.datacenter.wanda.obj.Building
+import com.persagy.server.datacenter.wanda.obj.Floor
+import com.persagy.server.datacenter.wanda.obj.Project
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table

+ 2 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/response/SpaceSQueryResponse.kt

@@ -24,9 +24,9 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.response
+package com.persagy.server.datacenter.datacenter.models.response
 
-import com.persagy.server.datacenter.datacenter.models.entities.objects.ZoneSpace
+import com.persagy.server.datacenter.wanda.obj.ZoneSpace
 import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.v3.oas.annotations.media.Schema
 

+ 0 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/obj/Building.kt

@@ -27,8 +27,6 @@
 package com.persagy.server.datacenter.wanda.obj
 
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import com.persagy.server.datacenter.models.entities.objects.Floor
-import com.persagy.server.datacenter.models.entities.objects.Project
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column

+ 0 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/obj/GeneralSystem.kt

@@ -27,11 +27,9 @@
 package com.persagy.server.datacenter.wanda.obj
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.datacenter.wanda.obj.ZoneSpace
 import com.persagy.server.datacenter.models.entities.assistant.BuildingFloorInfo
 import com.persagy.server.datacenter.models.entities.assistant.GeneralSystemCategory
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import com.persagy.server.datacenter.models.entities.objects.Shaft
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column

+ 4 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/rel/RelEq2BdEquip.kt

@@ -3,6 +3,7 @@ package com.persagy.server.datacenter.wanda.rel
 import RelBuilding
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
 
 /**
  * 设备和建筑的关系
@@ -10,11 +11,13 @@ import io.swagger.v3.oas.annotations.media.Schema
  * @author wx  <zhangweixin@sagacloud.com>
  * @date  2021/2/25 18:16
  */
+@Schema(description = "设备信息实体类")
+@Table(name = "equipment")
 class RelEq2BdEquip: EquipmentBase() {
 
     /** 级联-设备服务的建筑 */
     @Schema(description = "级联-设备服务的建筑")
-    @SCascade(table="public.equipment", idColumn="id", childIdColumn="buildingId")
+    @SCascade(table="public.equipment", idColumn="id", childIdColumn="building_id")
     var objectInfo: ArrayList<RelBuilding>? = null
 
 }

+ 23 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/rel/RelEq2FlEquip.kt

@@ -0,0 +1,23 @@
+package com.persagy.server.datacenter.wanda.rel
+
+import RelBuilding
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
+
+/**
+ * 设备和建筑的关系
+ *
+ * @author wx  <zhangweixin@sagacloud.com>
+ * @date  2021/2/25 18:16
+ */
+@Schema(description = "设备信息实体类")
+@Table(name = "equipment")
+class RelEq2FlEquip: EquipmentBase() {
+
+    /** 级联-设备服务的建筑 */
+    @Schema(description = "级联-设备服务的建筑")
+    @SCascade(table="public.equipment", idColumn="id", childIdColumn="floor_id")
+    var objectInfo: ArrayList<RelBuilding>? = null
+
+}

+ 93 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/rel/RelFloor.kt

@@ -0,0 +1,93 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.wanda.rel
+
+import com.persagy.server.datacenter.models.entities.assistant.PointPosition
+import com.persagy.server.datacenter.models.entities.base.BaseInfo
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+
+/**
+ * 楼层信息实体类
+ *
+ * @author  张维新
+ */
+@Schema(name = "关系楼层信息实体类")
+@Table(name = "v_floor_buildingname")
+open class RelFloor : BaseInfo() {
+
+    /** 楼层ID */
+    @Schema(description = "楼层ID")
+    @Id
+    @Column(name = "id")
+    var id: String? = null
+
+    /** 楼层名称 */
+    @Schema(description = "楼层名称")
+    @Column(name = "name")
+    var name: String? = null
+
+    /** 楼层本地编码 */
+    @Schema(description = "楼层本地编码")
+    @Column(name = "local_id")
+    var localId: String? = null
+
+    /** 楼层本地名称 */
+    @Schema(description = "楼层本地名称")
+    @Column(name = "local_name")
+    var localName: String? = null
+
+    /** 项目id */
+    @Schema(description = "项目id")
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+    /** 建筑id */
+    @Schema(description = "建筑id")
+    @Column(name = "building_id")
+    var buildingId: String? = null
+
+    /** 建筑id */
+    @Schema(description = "建筑id")
+    @Column(name = "building_name")
+    var buildingName: String? = null
+
+    /** 楼层顺序码 */
+    @Schema(description = "楼层顺序码")
+    @Column(name = "sequence_id")
+    var floorSequenceId: Int? = null
+
+    /** 对象类型 */
+    @Schema(description = "对象类型")
+    @Column(name = "object_type")
+    override var objectType: String? = "floor"
+
+
+}

+ 0 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/rel/RelZoneSpaceBd.kt

@@ -1,6 +1,5 @@
 package com.persagy.server.datacenter.wanda.rel
 
-import com.persagy.server.datacenter.datacenter.wanda.rel.SpaceBaseZone
 
 /**
  * 空间和建筑

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/objects/EquipController.kt

@@ -30,7 +30,7 @@
 ////import com.persagy.server.datacenter.models.entities.assistant.EquipmentProSy
 ////import com.persagy.server.datacenter.wanda.obj.Equipment
 ////import com.persagy.server.services.objects.EquipmentProSyService
-////import com.persagy.server.services.objects.EquipmentService
+////import com.persagy.server.datacenter.services.objects.EquipmentService
 ////import com.persagy.service.SPageContext
 ////import com.persagy.service.models.requests.SCountRequest
 ////import com.persagy.service.models.requests.SCreateRequest

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/objects/PropertyController.kt

@@ -27,7 +27,7 @@
 //package com.persagy.server.controllers.objects
 //
 //import com.persagy.database.SFilter
-//import com.persagy.server.datacenter.models.entities.objects.Property
+//import com.persagy.server.datacenter.datacenter.models.entities.objects.Property
 //import com.persagy.server.services.objects.PropertyService
 //import com.persagy.service.SPageContext
 //import com.persagy.service.models.requests.SCountRequest

+ 2 - 2
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/objects/TenantController.kt

@@ -27,9 +27,9 @@
 //package com.persagy.server.controllers.objects
 //
 //import com.persagy.database.SFilter
-//import com.persagy.server.datacenter.models.entities.objects.Tenant
+//import com.persagy.server.datacenter.datacenter.models.entities.objects.Tenant
 //import com.persagy.server.datacenter.models.entities.objects.TenantWithCount
-//import com.persagy.server.services.objects.TenantService
+//import com.persagy.server.datacenter.services.objects.TenantService
 //import com.persagy.service.SPageContext
 //import com.persagy.service.models.requests.SCountRequest
 //import com.persagy.service.models.requests.SCreateRequest

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/objects/ZoneSpaceController.kt

@@ -34,7 +34,7 @@
 //import com.persagy.server.datacenter.models.entities.task.SpaceType
 //import com.persagy.server.datacenter.models.requests.DCSQueryRequest
 //import com.persagy.server.datacenter.models.requests.UpDataFloorAndBuildingRequests
-//import com.persagy.server.datacenter.models.response.SpaceSQueryResponse
+//import com.persagy.server.datacenter.datacenter.models.response.SpaceSQueryResponse
 //import com.persagy.server.services.objects.ZoneSpaceBaseService
 //import com.persagy.server.services.relation_calc.MepSystemCalcService
 //import com.persagy.service.SPageContext

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RShContainSpBaseController.kt

@@ -30,7 +30,7 @@
 //import com.persagy.server.datacenter.models.entities.dict.SpaceInfoDic
 //import com.persagy.server.datacenter.models.entities.rel.RShContainSpBase
 //import com.persagy.server.datacenter.models.entities.rel.RShContainSpBaseList
-//import com.persagy.server.services.rel.RShContainSpBaseService
+//import com.persagy.server.datacenter.services.rel.RShContainSpBaseService
 //import com.persagy.server.services.rel.RSpContainShBaseList
 //import com.persagy.service.SPageContext
 //import com.persagy.service.models.requests.SCreateRequest

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyForSpController.kt

@@ -30,7 +30,7 @@
 //import com.persagy.server.datacenter.models.entities.rel.RSpForSyBaseList
 //import com.persagy.server.datacenter.models.entities.rel.RSyForSpBase
 //import com.persagy.server.datacenter.models.entities.rel.RSyForSpBaseList
-//import com.persagy.server.services.rel.RSyForSpBaseService
+//import com.persagy.server.datacenter.services.rel.RSyForSpBaseService
 //import com.persagy.service.models.responses.SBaseResponse
 //import com.persagy.service.models.responses.SCreateResponse
 //import io.swagger.v3.oas.annotations.Operation

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyInSpController.kt

@@ -30,7 +30,7 @@
 //import com.persagy.server.datacenter.models.entities.rel.RSpInSyBaseList
 //import com.persagy.server.datacenter.models.entities.rel.RSyInSpBase
 //import com.persagy.server.datacenter.models.entities.rel.RSyInSpBaseList
-//import com.persagy.server.services.rel.RSyInSpBaseService
+//import com.persagy.server.datacenter.services.rel.RSyInSpBaseService
 //import com.persagy.service.models.requests.SCreateRequest
 //import com.persagy.service.models.responses.SBaseResponse
 //import com.persagy.service.models.responses.SCreateResponse

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/relation_calc/MepSystemCalcController.kt

@@ -28,7 +28,7 @@
 //
 //import com.persagy.database.SFilter
 //import com.persagy.server.datacenter.models.entities.graphtype.block.MepSourceTypeEntity
-//import com.persagy.server.services.relation_calc.MepSystemCalcService
+//import com.persagy.server.datacenter.services.relation_calc.MepSystemCalcService
 //import com.persagy.service.SPageContext
 //import com.persagy.service.models.requests.SCreateRequest
 //import com.persagy.service.models.requests.SQueryRequest

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/datacenter/mappers/StatisticsCountMapper.kt

@@ -27,7 +27,7 @@
 package com.persagy.server.mappers
 
 import com.persagy.server.datacenter.models.entities.task.CategoryStatistics
-import com.persagy.server.datacenter.models.entities.task.EquipmentTaskTwo
+import com.persagy.server.datacenter.datacenter.models.entities.task.EquipmentTaskTwo
 import com.persagy.server.datacenter.models.response.StatisticsCountResponse
 import org.apache.ibatis.annotations.Mapper
 import org.apache.ibatis.annotations.Select

+ 3 - 3
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/assistant/UpDataFloorAndBuildingServuce.kt

@@ -24,18 +24,18 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.services.assistant
+package com.persagy.server.datacenter.services.assistant
 
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.wanda.obj.Equipment
-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.models.requests.UpDataFloorAndBuildingRequests
+import com.persagy.server.datacenter.wanda.obj.ZoneSpace
 import com.persagy.server.services.base.Service
 import com.persagy.server.services.objects.FloorService
-import com.persagy.server.services.objects.ZoneSpaceBaseService
+import com.persagy.server.datacenter.services.objects.ZoneSpaceBaseService
 import com.persagy.server.services.rel.RSpInBdService
 import com.persagy.server.services.rel.RSpInFlService
 import com.persagy.service.SPageContext

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/base/ServiceSpace.kt

@@ -33,7 +33,7 @@ import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.logs.DataCenterLogs
 import com.persagy.server.jms.RabbitMqService
 import com.persagy.server.services.assistant.SchemeService
-import com.persagy.server.services.objects.ZoneSpaceBaseService
+import com.persagy.server.datacenter.services.objects.ZoneSpaceBaseService
 import com.persagy.server.services.rel.RSpInBdService
 import com.persagy.server.services.rel.RSpInFlService
 import com.persagy.server.synchronize.MessageHandler

+ 4 - 4
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/graphtype/GraphicTypeMapperService.kt

@@ -30,14 +30,14 @@ 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.wanda.rel.REq2Eq
-import com.persagy.server.datacenter.datacenter.wanda.rel.RSp2Sp
 import com.persagy.server.datacenter.models.entities.graphtype.GraphicType
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
 import com.persagy.server.mappers.IRelationCountMapper
 import com.persagy.server.datacenter.services.base.RService
-import com.persagy.server.services.objects.EquipmentService
-import com.persagy.server.services.objects.ZoneSpaceBaseService
+import com.persagy.server.datacenter.wanda.rel.REq2Eq
+import com.persagy.server.datacenter.wanda.rel.RSp2Sp
+import com.persagy.server.datacenter.services.objects.EquipmentService
+import com.persagy.server.datacenter.services.objects.ZoneSpaceBaseService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType

+ 3 - 2
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/BuildingService.kt

@@ -24,15 +24,16 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.services.objects
+package com.persagy.server.datacenter.services.objects
 
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
-import com.persagy.server.datacenter.datacenter.wanda.obj.Building
+import com.persagy.server.datacenter.wanda.obj.Building
 import com.persagy.server.services.assistant.ObjInfoService
 import com.persagy.server.services.base.Service
 import com.persagy.server.services.log.DataCenterLogsService
+import com.persagy.server.services.objects.FloorService
 import com.persagy.server.utils.IdUtils
 import com.persagy.server.utils.ShaftNameUtil
 import com.persagy.service.SPageContext

+ 2 - 1
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/EquipmentProSyService.kt

@@ -31,8 +31,9 @@ import com.persagy.database.extensions.keyValue
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.assistant.EquipmentProSy
-import com.persagy.server.datacenter.models.entities.objects.Property
+import com.persagy.server.datacenter.datacenter.models.entities.objects.Property
 import com.persagy.server.datacenter.models.entities.rel.RSyEq
+import com.persagy.server.datacenter.services.objects.PropertyService
 import com.persagy.server.services.base.Service
 import com.persagy.server.services.dict.EquipFamilyService
 import com.persagy.server.services.rel.RSyEqService

+ 2 - 10
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/EquipmentService.kt

@@ -24,28 +24,20 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.services.objects
+package com.persagy.server.datacenter.services.objects
 
-import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
-import com.persagy.database.SQueryBuilder
 import com.persagy.database.extensions.keyValue
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
-import com.persagy.server.datacenter.models.entities.assistant.ObjInfos
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
 import com.persagy.server.datacenter.wanda.obj.Equipment
-import com.persagy.server.datacenter.models.entities.objects.Property
-import com.persagy.server.scanbuilding.UserLog
-import com.persagy.server.services.assistant.ObjInfoService
 import com.persagy.server.services.base.Service
 import com.persagy.server.services.log.DataCenterLogsService
 import com.persagy.server.utils.IdUtils
 import com.persagy.server.utils.ShaftNameUtil
 import com.persagy.service.SBaseService
-import com.persagy.service.models.enums.SResponseType
-import com.persagy.service.models.requests.SUpdateRequest
-import com.persagy.service.models.responses.SQueryResponse
+
 import org.slf4j.LoggerFactory
 
 /**

+ 1 - 0
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/FloorService.kt

@@ -31,6 +31,7 @@ import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
 import com.persagy.server.datacenter.wanda.obj.Floor
 import com.persagy.server.datacenter.models.entities.objects.FloorOutline
+import com.persagy.server.datacenter.services.objects.EquipmentService
 import com.persagy.server.services.base.Service
 import com.persagy.server.services.log.DataCenterLogsService
 import com.persagy.server.utils.IdUtils

+ 4 - 4
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/GeneralSystemService.kt

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.services.objects
+package com.persagy.server.datacenter.services.objects
 
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
@@ -33,13 +33,13 @@ import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.assistant.BuildingFloorInfo
 import com.persagy.server.datacenter.wanda.obj.Equipment
-import com.persagy.server.datacenter.models.entities.objects.GeneralSystem
-import com.persagy.server.datacenter.models.entities.objects.Shaft
-import com.persagy.server.datacenter.datacenter.wanda.obj.ZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.RSyEq
 import com.persagy.server.datacenter.models.entities.rel.RSyEqList
 import com.persagy.server.datacenter.models.entities.rel.RSyInBd
 import com.persagy.server.datacenter.models.entities.rel.RSyInFl
+import com.persagy.server.datacenter.wanda.obj.GeneralSystem
+import com.persagy.server.datacenter.wanda.obj.Shaft
+import com.persagy.server.datacenter.wanda.obj.ZoneSpace
 import com.persagy.server.services.assistant.ObjInfoService
 import com.persagy.server.services.base.Service
 import com.persagy.server.services.log.DataCenterLogsService

+ 3 - 4
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/PropertyService.kt

@@ -24,17 +24,16 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.services.objects
+package com.persagy.server.datacenter.services.objects
 
 import cn.sagacloud.server.scanbuilding.User
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.database.SQueryBuilder
 import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.datacenter.datacenter.models.entities.objects.Property
 import com.persagy.server.datacenter.models.entities.logs.DataCenterLogs
-import com.persagy.server.datacenter.datacenter.wanda.obj.Equipment
-import com.persagy.server.datacenter.models.entities.objects.Property
-import com.persagy.server.datacenter.services.objects.ComponentService
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.scanbuilding.UserLog
 import com.persagy.server.services.base.Service
 import com.persagy.server.services.dict.EquipFamilyService

+ 1 - 3
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/ShaftService.kt

@@ -34,15 +34,13 @@ import com.persagy.database.SFilter
 import com.persagy.database.SPageQueryInfo
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
-import com.persagy.server.datacenter.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.assistant.ShaftFuncType
 import com.persagy.server.datacenter.models.entities.assistant.ShaftWithCount
 import com.persagy.server.datacenter.models.entities.dictnew.DefFuncId
-import com.persagy.server.datacenter.models.entities.objects.*
 import com.persagy.server.datacenter.models.entities.rel.*
 import com.persagy.server.datacenter.models.entities.task.BuildingDic
 import com.persagy.server.datacenter.models.entities.task.FloorDic
-import com.persagy.server.datacenter.wanda.obj.Equipment
+import com.persagy.server.datacenter.wanda.obj.*
 import com.persagy.server.services.base.Service
 import com.persagy.server.services.log.DataCenterLogsService
 import com.persagy.server.synchronize.MessageHandler

+ 3 - 3
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/TenantService.kt

@@ -24,14 +24,14 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.services.objects
+package com.persagy.server.datacenter.services.objects
 
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
-import com.persagy.server.datacenter.models.entities.objects.Tenant
+import com.persagy.server.datacenter.datacenter.models.entities.objects.Tenant
 import com.persagy.server.datacenter.models.entities.objects.TenantWithCount
-import com.persagy.server.datacenter.datacenter.wanda.obj.ZoneSpace
+import com.persagy.server.datacenter.wanda.obj.ZoneSpace
 import com.persagy.server.services.assistant.ObjInfoService
 import com.persagy.server.services.base.Service
 import com.persagy.server.services.log.DataCenterLogsService

+ 5 - 4
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/ZoneSpaceBaseService.kt

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.services.objects
+package com.persagy.server.datacenter.services.objects
 
 
 import com.persagy.database.SFilter
@@ -32,18 +32,19 @@ import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.assistant.DictSpaceProject
 import com.persagy.server.datacenter.datacenter.models.entities.dictnew.DefClass
+import com.persagy.server.datacenter.datacenter.models.response.SpaceSQueryResponse
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
-import com.persagy.server.datacenter.models.entities.objects.Building
 import com.persagy.server.datacenter.models.entities.objects.SpaceOutline
-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.requests.DCSQueryRequest
 import com.persagy.server.datacenter.models.requests.UpDataFloorAndBuildingRequests
-import com.persagy.server.datacenter.models.response.SpaceSQueryResponse
+import com.persagy.server.datacenter.wanda.obj.Building
+import com.persagy.server.datacenter.wanda.obj.ZoneSpace
 import com.persagy.server.services.assistant.ObjInfoService
 import com.persagy.server.services.base.ServiceSpace
 import com.persagy.server.services.log.DataCenterLogsService
+import com.persagy.server.services.objects.FloorService
 import com.persagy.server.services.rel.RSpInBdService
 import com.persagy.server.services.rel.RSpInFlService
 import com.persagy.server.utils.IdUtils

+ 4 - 3
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/rel/RShContainSpBaseService.kt

@@ -24,19 +24,20 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.services.rel
+package com.persagy.server.datacenter.services.rel
 
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.dict.SpaceInfoDic
-import com.persagy.server.datacenter.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.RSh2Sp
 import com.persagy.server.datacenter.models.entities.rel.RShContainSpBase
 import com.persagy.server.datacenter.models.entities.rel.RShContainSpBaseList
 import com.persagy.server.datacenter.services.base.RService
-import com.persagy.server.services.objects.EquipmentService
+import com.persagy.server.datacenter.services.objects.EquipmentService
+import com.persagy.server.datacenter.wanda.obj.ZoneSpace
+import com.persagy.server.services.rel.RSpContainShBaseList
 import com.persagy.service.SBaseService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/rel/RShaftThroughShaftService.kt

@@ -33,7 +33,7 @@ import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.rel.RShaftThroughShaft
 import com.persagy.server.datacenter.models.entities.rel.RShaftThroughShaftOtherList
 import com.persagy.server.datacenter.services.base.RService
-import com.persagy.server.services.objects.EquipmentService
+import com.persagy.server.datacenter.services.objects.EquipmentService
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCreateResponse

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/rel/RSpatialConnectionService.kt

@@ -29,7 +29,7 @@ package com.persagy.server.services.rel
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.rel.RSpatialConnection
-import com.persagy.server.services.objects.ZoneSpaceBaseService
+import com.persagy.server.datacenter.services.objects.ZoneSpaceBaseService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/rel/RSyEqService.kt

@@ -34,7 +34,7 @@ import com.persagy.server.datacenter.models.entities.rel.REqSyList
 import com.persagy.server.datacenter.models.entities.rel.RSyEq
 import com.persagy.server.datacenter.models.entities.rel.RSyEqList
 import com.persagy.server.datacenter.services.base.RService
-import com.persagy.server.services.objects.EquipmentService
+import com.persagy.server.datacenter.services.objects.EquipmentService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SBaseResponse

+ 4 - 4
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/rel/RSyForSpBaseService.kt

@@ -24,18 +24,18 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.services.rel
+package com.persagy.server.datacenter.services.rel
 
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.rel.RSpForSyBaseList
-import com.persagy.server.datacenter.datacenter.wanda.rel.RSy2Sp
 import com.persagy.server.datacenter.models.entities.rel.RSyForSpBase
 import com.persagy.server.datacenter.models.entities.rel.RSyForSpBaseList
 import com.persagy.server.datacenter.services.base.RService
-import com.persagy.server.services.objects.ZoneSpaceBaseService
+import com.persagy.server.datacenter.services.objects.ZoneSpaceBaseService
+import com.persagy.server.datacenter.wanda.rel.RSy2Sp
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
@@ -96,7 +96,7 @@ object RSyForSpBaseService: RService<RSyForSpBase>(SMybatisDao(RSyForSpBase::cla
             rSy2Sp.projectId = projectId
             rSy2Sp.type = "sy2sp_for"
             rSy2Sp.zoneType = entity!!.classCode
-            val isDelete =rSy2SpService.delete(rSy2Sp)
+            val isDelete = rSy2SpService.delete(rSy2Sp)
             /** 删除成功 */
             if (isDelete) {
                 /** 发送消息 */

+ 4 - 4
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/rel/RSyInSpBaseService.kt

@@ -24,19 +24,19 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.services.rel
+package com.persagy.server.datacenter.services.rel
 
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.rel.RSpInSyBaseList
-import com.persagy.server.datacenter.datacenter.wanda.rel.RSy2Sp
 import com.persagy.server.datacenter.models.entities.rel.RSyInSpBase
 import com.persagy.server.datacenter.models.entities.rel.RSyInSpBaseList
 import com.persagy.server.datacenter.services.base.RService
-import com.persagy.server.services.objects.EquipmentService
-import com.persagy.server.services.objects.ZoneSpaceBaseService
+import com.persagy.server.datacenter.services.objects.EquipmentService
+import com.persagy.server.datacenter.services.objects.ZoneSpaceBaseService
+import com.persagy.server.datacenter.wanda.rel.RSy2Sp
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType

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

@@ -28,15 +28,14 @@ package com.persagy.server.datacenter.services.relation_calc
 
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.datacenter.wanda.rel.REq2Eq
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
 import com.persagy.server.datacenter.models.entities.graphtype.block.ConnectedBlock
+import com.persagy.server.datacenter.services.objects.EquipmentService
+import com.persagy.server.datacenter.wanda.rel.REq2Eq
 import com.persagy.server.mappers.ICalcSpecialMapper
 import com.persagy.server.models.entities.Connector
 import com.persagy.server.services.assistant.RUpDateEquipAndSapceService
-import com.persagy.server.services.objects.EquipmentService
 import com.persagy.server.services.objects.FloorService
-import com.persagy.server.services.relation_calc.MepSystemCalcService
 import com.persagy.server.utils.IdUtils
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService

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

@@ -8,11 +8,11 @@ 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.RSp2Sp
-import com.persagy.server.services.objects.BuildingService
-import com.persagy.server.services.objects.EquipmentService
 import com.persagy.server.services.objects.FloorService
-import com.persagy.server.services.objects.GeneralSystemService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType

+ 323 - 148
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/ManualRelationCalcService.kt

@@ -45,11 +45,11 @@ import com.persagy.server.datacenter.models.entities.graphtype.rel.hvac.*
 import com.persagy.server.datacenter.models.entities.rel.*
 import com.persagy.server.datacenter.models.requests.ManualRelationCalcDel
 import com.persagy.server.datacenter.datacenter.models.requests.ManualRelationCalcRequest
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelFloor
+import com.persagy.server.datacenter.services.objects.BuildingService
+import com.persagy.server.datacenter.services.objects.EquipmentService
 import com.persagy.server.datacenter.wanda.obj.Equipment
-import com.persagy.server.datacenter.wanda.rel.REq2Eq
-import com.persagy.server.datacenter.wanda.rel.RSp2Sp
-import com.persagy.server.datacenter.wanda.rel.RSy2Sp
-import com.persagy.server.datacenter.wanda.rel.RelEq2BdEquip
+import com.persagy.server.datacenter.wanda.rel.*
 import com.persagy.server.datacenter.wanda.response.ManualRelationCalcResponse
 import com.persagy.server.jms.RabbitMqService
 import com.persagy.server.services.objects.*
@@ -60,7 +60,6 @@ import com.persagy.service.models.SCascadeQuery
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.requests.SQueryRequest
 import com.persagy.service.models.responses.SBaseResponse
-import com.persagy.service.models.responses.SQueryResponse
 import com.persagy.service.utils.SSpringContextUtil
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
@@ -94,7 +93,13 @@ open class ManualRelationCalcService {
 
     /** 设备建筑 设备 */
     private val relEquipBuildingService = SObjectService(SMybatisDao(RelEq2BdEquip::class.java))
+    /** 设备级联楼层 */
+    private val relEquipFloorService = SObjectService(SMybatisDao(RelEq2FlEquip::class.java))
+    /** 关系建筑 */
     private val relBuildingService = SObjectService(SMybatisDao(RelBuilding::class.java))
+    /** 关系楼层 */
+    private val relFloorService = SObjectService(SMybatisDao(RelFloor::class.java))
+
 
 
 
@@ -152,174 +157,313 @@ open class ManualRelationCalcService {
     /**
      * 查询关系数据
      */
-    fun query(manualRelationCalcRequest: ManualRelationCalcRequest): ManualRelationCalcResponse {
-
-        try {
-            /** 项目id */
-            val projectId = SPageContext.getHeader("ProjectId")
-            val list = ArrayList<SFilter>()
-            list.add(SFilter.eq("projectId",projectId!!))
-            /** 模糊查询 */
-            if(!manualRelationCalcRequest.vague.isNullOrEmpty()){
-                list.add( SFilter.or(SFilter.contain("id",manualRelationCalcRequest.vague!!),SFilter.contain("name",manualRelationCalcRequest.vague!!)
-                    ,SFilter.contain("localName",manualRelationCalcRequest.vague!!),SFilter.contain("localId",manualRelationCalcRequest.vague!!)))
-            }
-
-            val sQueryRequest = SQueryRequest()
-
-            if(manualRelationCalcRequest.pageNumber>0&&manualRelationCalcRequest.pageSize>0){
-                SQueryRequest.maxRow = 400000
-                sQueryRequest.pageSize= manualRelationCalcRequest.pageSize
-                sQueryRequest.pageNumber = manualRelationCalcRequest.pageNumber
-            }else{
-                /** 控制条数 */
-                SQueryRequest.maxRow = 100000
-                sQueryRequest.pageSize= 100000
-            }
-            val sCascadeQueryList = ArrayList<SCascadeQuery>()
-            /** 级联资产 */
-            val sCascadeQuery = SCascadeQuery()
-            sCascadeQuery.name = "objectInfo"
-            if (!manualRelationCalcRequest.category.isNullOrEmpty()) {
-                sCascadeQuery.filters = "zoneType = '${manualRelationCalcRequest.category}'"
-            }
-            sCascadeQueryList.add(sCascadeQuery)
-            sQueryRequest.cascade = sCascadeQueryList
+//    fun query(manualRelationCalcRequest: ManualRelationCalcRequest): ManualRelationCalcResponse {
+//
+//        try {
+//            /** 项目id */
+//            val projectId = SPageContext.getHeader("ProjectId")
+//            val list = ArrayList<SFilter>()
+//            list.add(SFilter.eq("projectId",projectId!!))
+//            /** 模糊查询 */
+//            if(!manualRelationCalcRequest.vague.isNullOrEmpty()){
+//                list.add( SFilter.or(SFilter.contain("id",manualRelationCalcRequest.vague!!),SFilter.contain("name",manualRelationCalcRequest.vague!!)
+//                    ,SFilter.contain("localName",manualRelationCalcRequest.vague!!),SFilter.contain("localId",manualRelationCalcRequest.vague!!)))
+//            }
+//
+//            val sQueryRequest = SQueryRequest()
+//
+//            if(manualRelationCalcRequest.pageNumber>0&&manualRelationCalcRequest.pageSize>0){
+//                SQueryRequest.maxRow = 400000
+//                sQueryRequest.pageSize= manualRelationCalcRequest.pageSize
+//                sQueryRequest.pageNumber = manualRelationCalcRequest.pageNumber
+//            }else{
+//                /** 控制条数 */
+//                SQueryRequest.maxRow = 100000
+//                sQueryRequest.pageSize= 100000
+//            }
+//            val sCascadeQueryList = ArrayList<SCascadeQuery>()
+//            /** 级联资产 */
+//            val sCascadeQuery = SCascadeQuery()
+//            sCascadeQuery.name = "objectInfo"
+//            if (!manualRelationCalcRequest.category.isNullOrEmpty()) {
+//                sCascadeQuery.filters = "zoneType = '${manualRelationCalcRequest.category}'"
+//            }
+//            sCascadeQueryList.add(sCascadeQuery)
+//            sQueryRequest.cascade = sCascadeQueryList
+//
+//
+//            if (manualRelationCalcRequest.graphicType == "ArchSubset" && manualRelationCalcRequest.relType == "Bd2Sp") {
+//
+//            } else if (manualRelationCalcRequest.graphicType == "ArchSubset" && manualRelationCalcRequest.relType == "Fl2Sp") {
+//
+//            } else if (manualRelationCalcRequest.graphicType == "MechInArch" && manualRelationCalcRequest.relType == "Eq2Bd") {
+//
+//            } else if (manualRelationCalcRequest.graphicType == "MechInArch" && manualRelationCalcRequest.relType == "Eq2Fl") {
+//
+//            } else if (manualRelationCalcRequest.graphicType == "ArchForArch" && manualRelationCalcRequest.relType == "Sp2Sp") {
+//
+//            } else if (manualRelationCalcRequest.graphicType == "MechSubset" && manualRelationCalcRequest.relType == "Sy2Eq") {
+//
+//            } else if (manualRelationCalcRequest.graphicType == "MechInArch" && manualRelationCalcRequest.relType == "Eq2Sp") {
+//
+//            } else if (manualRelationCalcRequest.graphicType == "MechForArch" && manualRelationCalcRequest.relType == "Eq2Sp") {
+//
+//            }
+//
+//            if (manualRelationCalcRequest.relType == "pe2sp"){
+//                /** 资产所在业务空间 */
+//                return queryPe2Sp(projectId,list,sQueryRequest,manualRelationCalcRequest)
+//            }else if (manualRelationCalcRequest.relType == "pe2sh"){
+//                /** 资产所在竖井 */
+//                return queryPe2Sh(projectId,list,sQueryRequest,manualRelationCalcRequest)
+//            }else if (manualRelationCalcRequest.relType == "eq2sh_for"){
+//                /** 设备服务于竖井 */
+//                return queryEqForSh(projectId,list,sQueryRequest,manualRelationCalcRequest)
+//            }else if (manualRelationCalcRequest.relType == "eq2fl_for"){
+//                /** 设备服务于楼层 */
+//                return queryEqForFl(projectId,list,sQueryRequest,manualRelationCalcRequest)
+//            }else if (manualRelationCalcRequest.relType == "eq2bd_for"){
+//                /** 设备服务于建筑 */
+//                return queryEqForBd(projectId,list,sQueryRequest,manualRelationCalcRequest)
+//            }else if (manualRelationCalcRequest.relType == "sy2sp_for"){
+//                /** 系统服务于业务空间 */
+//                return querySyForSp(projectId,list,sQueryRequest,manualRelationCalcRequest)
+//            }else if(manualRelationCalcRequest.relType == "sy2sh_for"){
+//                /** 系统服务于竖井 */
+//                return querySyForSh(projectId,list,sQueryRequest,manualRelationCalcRequest)
+//            }else if (manualRelationCalcRequest.relType == "sy2fl_for"){
+//                /** 系统服务于楼层 */
+//                return querySyForFl(projectId,list,sQueryRequest,manualRelationCalcRequest)
+//            }else if (manualRelationCalcRequest.relType == "sy2bd_for"){
+//                /** 系统服务于建筑 */
+//                return querySyForBd(projectId,list,sQueryRequest,manualRelationCalcRequest)
+//            }else if (manualRelationCalcRequest.relType == "sp2sp_ConvectionNetwork_1"||manualRelationCalcRequest.relType == "sp2sp_ConvectionNetwork_2"||manualRelationCalcRequest.relType == "sp2sp_ConvectionNetwork_3"
+//                ||manualRelationCalcRequest.relType == "sp2sp_SpaceNeighborhood_5"||manualRelationCalcRequest.relType == "sp2sp_SpaceNeighborhood_2"||manualRelationCalcRequest.relType == "sp2sp_SpaceNeighborhood_4"
+//                ||manualRelationCalcRequest.relType == "sp2sp_TrafficNetwork_3"||manualRelationCalcRequest.relType == "sp2sp_TrafficNetwork_2"||manualRelationCalcRequest.relType == "sp2sp_RadiationNetwork_1"
+//                ||manualRelationCalcRequest.relType == "sp2sp_RadiationNetwork_2"||manualRelationCalcRequest.relType == "sp2sp_SpaceNeighborhood_1"||manualRelationCalcRequest.relType == "sp2sp_TrafficNetwork_1"
+//                ||manualRelationCalcRequest.relType == "sp2sp_SpaceNeighborhood_3" ){
+//                /** 空间 空气自然对流 */
+//                return querySpAirConvection(projectId,list,sQueryRequest,manualRelationCalcRequest)
+//            }else if (manualRelationCalcRequest.relType == "eq2eq_LUDistribution_1"||manualRelationCalcRequest.relType == "eq2eq_LUDistribution_2"||manualRelationCalcRequest.relType == "eq2eq_HUDistribution_1"
+//                ||manualRelationCalcRequest.relType == "eq2eq_HUDistribution_2"||manualRelationCalcRequest.relType == "eq2eq_EquipPower_1"||manualRelationCalcRequest.relType == "eq2eq_EquipPower_2"
+//                ||manualRelationCalcRequest.relType == "eq2eq_EquipPower_3"||manualRelationCalcRequest.relType == "eq2eq_EquipPower_4"){
+//                /** 系统备用电源 */ /** 强电类 */
+//                return queryElectricity(projectId,list,sQueryRequest,manualRelationCalcRequest)
+//            } else if (manualRelationCalcRequest.relType == "eq2eq_ACAirNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_ACAirNetwork_3"||manualRelationCalcRequest.relType == "eq2eq_ACAirNetwork_2"
+//                ||manualRelationCalcRequest.relType == "eq2eq_ChillWaterLoop_4"|| manualRelationCalcRequest.relType == "eq2eq_ChillWaterLoop_1"||manualRelationCalcRequest.relType == "eq2eq_ChillWaterLoop_3"
+//                || manualRelationCalcRequest.relType == "eq2eq_ChillWaterLoop_2"||manualRelationCalcRequest.relType == "eq2eq_CondWaterNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_CoolingWaterLoop_4"
+//                ||manualRelationCalcRequest.relType == "eq2eq_CoolingWaterLoop_1"||manualRelationCalcRequest.relType == "eq2eq_CoolingWaterLoop_3"||manualRelationCalcRequest.relType == "eq2eq_CoolingWaterLoop_2"
+//                ||manualRelationCalcRequest.relType == "eq2eqFreshAirNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_HeatWaterLoop_4"||manualRelationCalcRequest.relType == "eq2eq_HeatWaterLoop_1"
+//                ||manualRelationCalcRequest.relType == "eq2eq_HeatWaterLoop_3"||manualRelationCalcRequest.relType == "eq2eq_HeatWaterLoop_2"||manualRelationCalcRequest.relType == "eq2eq_VentNetwork_1"
+//                ||manualRelationCalcRequest.relType == "eq2eq_VentNetwork_3"||manualRelationCalcRequest.relType == "eq2eq_VentNetwork_2"||manualRelationCalcRequest.relType == "eq2eq_VRFNetwork_1"){
+//                /** 暖通空调类 */
+//                return hvac(projectId,list,sQueryRequest,manualRelationCalcRequest)
+//            }else if (manualRelationCalcRequest.relType == "eq2eq_SupplyWaterNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_SupplyWaterNetwork_2"||manualRelationCalcRequest.relType == "eq2eq_DrainingWaterNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_DrainingWaterNetwork_2"
+//                ||manualRelationCalcRequest.relType == "eq2eq_DrinkingWaterNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_DrinkingWaterNetwork_2"||manualRelationCalcRequest.relType == "eq2eq_DHWNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_DHWNetwork_2"
+//                ||manualRelationCalcRequest.relType == "eq2eq_GasNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_GasNetwork_2"||manualRelationCalcRequest.relType == "eq2eq_FireWaterNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_FireWaterNetwork_2"
+//                ||manualRelationCalcRequest.relType == "eq2eq_FireVentNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_RecycleWaterNetwork_1" ||manualRelationCalcRequest.relType == "eq2eq_RecycleWaterNetwork_2"){
+//                /** 给排水类 和 消防类 */
+//                return drainage(projectId,list,sQueryRequest,manualRelationCalcRequest)
+//            }else if (manualRelationCalcRequest.relType == "eq2eq_SensorNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_ControlRelation_1"
+//                ||manualRelationCalcRequest.relType == "eq2eq_SensorRelationship_ss2eq"||manualRelationCalcRequest.relType == "eq2eq_ValveRelationship_vv2eq"||manualRelationCalcRequest.relType =="eq2eq_ControlEquipNetwork"){
+//                /** 测控类 */
+//                return control(projectId,list,sQueryRequest,manualRelationCalcRequest)
+//            }else if (manualRelationCalcRequest.relType == "eq2eq_ControlRelation_2"||manualRelationCalcRequest.relType == "eq2sy_SensorRelationship_ss2sy"
+//                ||manualRelationCalcRequest.relType == "eq2sy_ValveRelationship_vv2sy"){
+//                /** 测控类 */
+//                return controlSy(projectId,list,sQueryRequest,manualRelationCalcRequest)
+//            }else if(manualRelationCalcRequest.relType == "eq2sp_SensorRelationship_ss2sp"){
+//                return ss2sps(projectId,list,sQueryRequest,manualRelationCalcRequest)
+//            }else if (manualRelationCalcRequest.relType == "eq2sp_x"){
+//                return  eq2spsOther(projectId,list,sQueryRequest,manualRelationCalcRequest)
+//            }else{
+//                /** 暂无数据 */
+//                val manualRelationCalcResponse = ManualRelationCalcResponse()
+//                manualRelationCalcResponse.result = SResponseType.success
+//                manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//                return manualRelationCalcResponse
+//            }
+//            /** 暂无数据 */
+//            val manualRelationCalcResponse = ManualRelationCalcResponse()
+//            manualRelationCalcResponse.result = SResponseType.success
+//            manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//            return manualRelationCalcResponse
+//        } catch (e: Exception) {
+//            e.printStackTrace()
+//            val manualRelationCalcResponse = ManualRelationCalcResponse()
+//            manualRelationCalcResponse.result = SResponseType.failure
+//            manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//            manualRelationCalcResponse.message = e.message.toString()
+//            return manualRelationCalcResponse
+//        }
+//    }
 
 
-            if (manualRelationCalcRequest.graphicType == "ArchSubset" && manualRelationCalcRequest.relType == "Bd2Sp") {
+    fun  queryRel(manualRelationCalcRequest: ManualRelationCalcRequest): ManualRelationCalcResponse {
 
-            } else if (manualRelationCalcRequest.graphicType == "ArchSubset" && manualRelationCalcRequest.relType == "Fl2Sp") {
 
-            } else if (manualRelationCalcRequest.graphicType == "MechInArch" && manualRelationCalcRequest.relType == "Eq2Bd") {
+//        if (manualRelationCalcRequest.graphicType == "ArchSubset" && manualRelationCalcRequest.relType == "Bd2Sp") {
+//
+//        } else if (manualRelationCalcRequest.graphicType == "ArchSubset" && manualRelationCalcRequest.relType == "Fl2Sp") {
+//
+//        } else
+            if (manualRelationCalcRequest.graphicType == "MechInArch" && manualRelationCalcRequest.relType == "Eq2Bd") {
 
-            } else if (manualRelationCalcRequest.graphicType == "MechInArch" && manualRelationCalcRequest.relType == "Eq2Fl") {
+            return  queryEq2Bd(manualRelationCalcRequest)
+        }
+//            else if (manualRelationCalcRequest.graphicType == "MechInArch" && manualRelationCalcRequest.relType == "Eq2Fl") {
+//
+//        } else if (manualRelationCalcRequest.graphicType == "ArchForArch" && manualRelationCalcRequest.relType == "Sp2Sp") {
+//
+//        } else if (manualRelationCalcRequest.graphicType == "MechSubset" && manualRelationCalcRequest.relType == "Sy2Eq") {
+//
+//        } else if (manualRelationCalcRequest.graphicType == "MechInArch" && manualRelationCalcRequest.relType == "Eq2Sp") {
+//
+//        }
+        return ManualRelationCalcResponse()
 
-            } else if (manualRelationCalcRequest.graphicType == "ArchForArch" && manualRelationCalcRequest.relType == "Sp2Sp") {
+    }
 
-            } else if (manualRelationCalcRequest.graphicType == "MechSubset" && manualRelationCalcRequest.relType == "Sy2Eq") {
+    /**
+     * 设备所在建筑查询
+     */
+    fun queryEq2Bd(manualRelationCalcRequest: ManualRelationCalcRequest): ManualRelationCalcResponse {
+        val sQueryRequest = SQueryRequest()
+        if(manualRelationCalcRequest.pageNumber>0&&manualRelationCalcRequest.pageSize>0){
+            SQueryRequest.maxRow = 400000
+            sQueryRequest.pageSize= manualRelationCalcRequest.pageSize
+            sQueryRequest.pageNumber = manualRelationCalcRequest.pageNumber
+        }else{
+            /** 控制条数 */
+            SQueryRequest.maxRow = 100000
+            sQueryRequest.pageSize= 100000
+        }
 
-            } else if (manualRelationCalcRequest.graphicType == "MechInArch" && manualRelationCalcRequest.relType == "Eq2Sp") {
+        val sCascadeQueryList = ArrayList<SCascadeQuery>()
+        /** 级联资产 */
+        val sCascadeQuery = SCascadeQuery()
+        sCascadeQuery.name = "objectInfo"
+        sCascadeQueryList.add(sCascadeQuery)
+        sQueryRequest.cascade = sCascadeQueryList
 
-            } else if (manualRelationCalcRequest.graphicType == "MechForArch" && manualRelationCalcRequest.relType == "Eq2Sp") {
+        val manualRelationCalcResponse = ManualRelationCalcResponse()
+        manualRelationCalcResponse.direction = "Left"
+        val list = ArrayList<SFilter>()
+        list.add(SFilter.eq("projectId",Opt.projectId!!))
+        if (manualRelationCalcRequest.objectType == "1") {
 
+            list.add(SFilter.not(SFilter.isNull("buildingId")))
+            /** 模糊查询 */
+            if(!manualRelationCalcRequest.vagueFrom.isNullOrEmpty()){
+                list.add( SFilter.or(SFilter.contain("id",manualRelationCalcRequest.vagueFrom!!),SFilter.contain("name",manualRelationCalcRequest.vagueFrom!!)
+                        ,SFilter.contain("localName",manualRelationCalcRequest.vagueFrom!!),SFilter.contain("localId",manualRelationCalcRequest.vagueFrom!!)))
             }
-
-            if (manualRelationCalcRequest.relType == "pe2sp"){
-                /** 资产所在业务空间 */
-                return queryPe2Sp(projectId,list,sQueryRequest,manualRelationCalcRequest)
-            }else if (manualRelationCalcRequest.relType == "pe2sh"){
-                /** 资产所在竖井 */
-                return queryPe2Sh(projectId,list,sQueryRequest,manualRelationCalcRequest)
-            }else if (manualRelationCalcRequest.relType == "eq2sh_for"){
-                /** 设备服务于竖井 */
-                return queryEqForSh(projectId,list,sQueryRequest,manualRelationCalcRequest)
-            }else if (manualRelationCalcRequest.relType == "eq2fl_for"){
-                /** 设备服务于楼层 */
-                return queryEqForFl(projectId,list,sQueryRequest,manualRelationCalcRequest)
-            }else if (manualRelationCalcRequest.relType == "eq2bd_for"){
-                /** 设备服务于建筑 */
-                return queryEqForBd(projectId,list,sQueryRequest,manualRelationCalcRequest)
-            }else if (manualRelationCalcRequest.relType == "sy2sp_for"){
-                /** 系统服务于业务空间 */
-                return querySyForSp(projectId,list,sQueryRequest,manualRelationCalcRequest)
-            }else if(manualRelationCalcRequest.relType == "sy2sh_for"){
-                /** 系统服务于竖井 */
-                return querySyForSh(projectId,list,sQueryRequest,manualRelationCalcRequest)
-            }else if (manualRelationCalcRequest.relType == "sy2fl_for"){
-                /** 系统服务于楼层 */
-                return querySyForFl(projectId,list,sQueryRequest,manualRelationCalcRequest)
-            }else if (manualRelationCalcRequest.relType == "sy2bd_for"){
-                /** 系统服务于建筑 */
-                return querySyForBd(projectId,list,sQueryRequest,manualRelationCalcRequest)
-            }else if (manualRelationCalcRequest.relType == "sp2sp_ConvectionNetwork_1"||manualRelationCalcRequest.relType == "sp2sp_ConvectionNetwork_2"||manualRelationCalcRequest.relType == "sp2sp_ConvectionNetwork_3"
-                ||manualRelationCalcRequest.relType == "sp2sp_SpaceNeighborhood_5"||manualRelationCalcRequest.relType == "sp2sp_SpaceNeighborhood_2"||manualRelationCalcRequest.relType == "sp2sp_SpaceNeighborhood_4"
-                ||manualRelationCalcRequest.relType == "sp2sp_TrafficNetwork_3"||manualRelationCalcRequest.relType == "sp2sp_TrafficNetwork_2"||manualRelationCalcRequest.relType == "sp2sp_RadiationNetwork_1"
-                ||manualRelationCalcRequest.relType == "sp2sp_RadiationNetwork_2"||manualRelationCalcRequest.relType == "sp2sp_SpaceNeighborhood_1"||manualRelationCalcRequest.relType == "sp2sp_TrafficNetwork_1"
-                ||manualRelationCalcRequest.relType == "sp2sp_SpaceNeighborhood_3" ){
-                /** 空间 空气自然对流 */
-                return querySpAirConvection(projectId,list,sQueryRequest,manualRelationCalcRequest)
-            }else if (manualRelationCalcRequest.relType == "eq2eq_LUDistribution_1"||manualRelationCalcRequest.relType == "eq2eq_LUDistribution_2"||manualRelationCalcRequest.relType == "eq2eq_HUDistribution_1"
-                ||manualRelationCalcRequest.relType == "eq2eq_HUDistribution_2"||manualRelationCalcRequest.relType == "eq2eq_EquipPower_1"||manualRelationCalcRequest.relType == "eq2eq_EquipPower_2"
-                ||manualRelationCalcRequest.relType == "eq2eq_EquipPower_3"||manualRelationCalcRequest.relType == "eq2eq_EquipPower_4"){
-                /** 系统备用电源 */ /** 强电类 */
-                return queryElectricity(projectId,list,sQueryRequest,manualRelationCalcRequest)
-            } else if (manualRelationCalcRequest.relType == "eq2eq_ACAirNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_ACAirNetwork_3"||manualRelationCalcRequest.relType == "eq2eq_ACAirNetwork_2"
-                ||manualRelationCalcRequest.relType == "eq2eq_ChillWaterLoop_4"|| manualRelationCalcRequest.relType == "eq2eq_ChillWaterLoop_1"||manualRelationCalcRequest.relType == "eq2eq_ChillWaterLoop_3"
-                || manualRelationCalcRequest.relType == "eq2eq_ChillWaterLoop_2"||manualRelationCalcRequest.relType == "eq2eq_CondWaterNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_CoolingWaterLoop_4"
-                ||manualRelationCalcRequest.relType == "eq2eq_CoolingWaterLoop_1"||manualRelationCalcRequest.relType == "eq2eq_CoolingWaterLoop_3"||manualRelationCalcRequest.relType == "eq2eq_CoolingWaterLoop_2"
-                ||manualRelationCalcRequest.relType == "eq2eqFreshAirNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_HeatWaterLoop_4"||manualRelationCalcRequest.relType == "eq2eq_HeatWaterLoop_1"
-                ||manualRelationCalcRequest.relType == "eq2eq_HeatWaterLoop_3"||manualRelationCalcRequest.relType == "eq2eq_HeatWaterLoop_2"||manualRelationCalcRequest.relType == "eq2eq_VentNetwork_1"
-                ||manualRelationCalcRequest.relType == "eq2eq_VentNetwork_3"||manualRelationCalcRequest.relType == "eq2eq_VentNetwork_2"||manualRelationCalcRequest.relType == "eq2eq_VRFNetwork_1"){
-                /** 暖通空调类 */
-                return hvac(projectId,list,sQueryRequest,manualRelationCalcRequest)
-            }else if (manualRelationCalcRequest.relType == "eq2eq_SupplyWaterNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_SupplyWaterNetwork_2"||manualRelationCalcRequest.relType == "eq2eq_DrainingWaterNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_DrainingWaterNetwork_2"
-                ||manualRelationCalcRequest.relType == "eq2eq_DrinkingWaterNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_DrinkingWaterNetwork_2"||manualRelationCalcRequest.relType == "eq2eq_DHWNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_DHWNetwork_2"
-                ||manualRelationCalcRequest.relType == "eq2eq_GasNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_GasNetwork_2"||manualRelationCalcRequest.relType == "eq2eq_FireWaterNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_FireWaterNetwork_2"
-                ||manualRelationCalcRequest.relType == "eq2eq_FireVentNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_RecycleWaterNetwork_1" ||manualRelationCalcRequest.relType == "eq2eq_RecycleWaterNetwork_2"){
-                /** 给排水类 和 消防类 */
-                return drainage(projectId,list,sQueryRequest,manualRelationCalcRequest)
-            }else if (manualRelationCalcRequest.relType == "eq2eq_SensorNetwork_1"||manualRelationCalcRequest.relType == "eq2eq_ControlRelation_1"
-                ||manualRelationCalcRequest.relType == "eq2eq_SensorRelationship_ss2eq"||manualRelationCalcRequest.relType == "eq2eq_ValveRelationship_vv2eq"||manualRelationCalcRequest.relType =="eq2eq_ControlEquipNetwork"){
-                /** 测控类 */
-                return control(projectId,list,sQueryRequest,manualRelationCalcRequest)
-            }else if (manualRelationCalcRequest.relType == "eq2eq_ControlRelation_2"||manualRelationCalcRequest.relType == "eq2sy_SensorRelationship_ss2sy"
-                ||manualRelationCalcRequest.relType == "eq2sy_ValveRelationship_vv2sy"){
-                /** 测控类 */
-                return controlSy(projectId,list,sQueryRequest,manualRelationCalcRequest)
-            }else if(manualRelationCalcRequest.relType == "eq2sp_SensorRelationship_ss2sp"){
-                return ss2sps(projectId,list,sQueryRequest,manualRelationCalcRequest)
-            }else if (manualRelationCalcRequest.relType == "eq2sp_x"){
-                return  eq2spsOther(projectId,list,sQueryRequest,manualRelationCalcRequest)
-            }else{
-                /** 暂无数据 */
-                val manualRelationCalcResponse = ManualRelationCalcResponse()
-                manualRelationCalcResponse.result = SResponseType.success
-                manualRelationCalcResponse.content = ArrayList<RelProperty>()
-                return manualRelationCalcResponse
+            if (!manualRelationCalcRequest.categoryFrom.isNullOrEmpty()) {
+                list.add(SFilter.eq("classCode",manualRelationCalcRequest.categoryFrom!!))
             }
-            /** 暂无数据 */
-            val manualRelationCalcResponse = ManualRelationCalcResponse()
-            manualRelationCalcResponse.result = SResponseType.success
-            manualRelationCalcResponse.content = ArrayList<RelProperty>()
-            return manualRelationCalcResponse
-        } catch (e: Exception) {
-            e.printStackTrace()
-            val manualRelationCalcResponse = ManualRelationCalcResponse()
-            manualRelationCalcResponse.result = SResponseType.failure
-            manualRelationCalcResponse.content = ArrayList<RelProperty>()
-            manualRelationCalcResponse.message = e.message.toString()
+            val pageQuery = relEquipBuildingService.pageQuery(sQueryRequest,list)
+            manualRelationCalcResponse.content = pageQuery.content
+            manualRelationCalcResponse.message = pageQuery.message
+            manualRelationCalcResponse.pageNumber = pageQuery.pageNumber
+            manualRelationCalcResponse.pageSize = pageQuery.pageSize
+            manualRelationCalcResponse.result = pageQuery.result
+            manualRelationCalcResponse.total = pageQuery.total
+
             return manualRelationCalcResponse
-        }
-    }
+        }else if (manualRelationCalcRequest.objectType == "2"){
 
+            if (!manualRelationCalcRequest.vagueFrom.isNullOrEmpty()) {
+                val relEquipBuildingList = relEquipBuildingService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.not(SFilter.isNull("buildingId"))).exec()
+                if (relEquipBuildingList.size>0) {
 
-    fun  query(manualRelationCalcRequest: ManualRelationCalcRequest): ManualRelationCalcResponse {
+                    val buildingIdList = schemeMapper.buildingId(Opt.projectId!!)
+                    val listId = ArrayList<String>()
+                    for (buildingId in buildingIdList) {
+                        listId.add(buildingId.id!!)
+                    }
 
+                    val relBuildinglist = relBuildingService.select(SFilter.inList("id", listId), SFilter.contain("localName", manualRelationCalcRequest.vagueFrom!!)).exec()
+                    if (relBuildinglist.size>0) {
+                        val listIds = ArrayList<String>()
+                        for (building in relBuildinglist) {
+                            listIds.add(building.id!!)
+                        }
+                        list.add(SFilter.inList("buildingId",listIds))
+                        val pageQuery = relEquipBuildingService.pageQuery(sQueryRequest,list)
+                        manualRelationCalcResponse.content = pageQuery.content
+                        manualRelationCalcResponse.message = pageQuery.message
+                        manualRelationCalcResponse.pageNumber = pageQuery.pageNumber
+                        manualRelationCalcResponse.pageSize = pageQuery.pageSize
+                        manualRelationCalcResponse.result = pageQuery.result
+                        manualRelationCalcResponse.total = pageQuery.total
 
-        if (manualRelationCalcRequest.graphicType == "ArchSubset" && manualRelationCalcRequest.relType == "Bd2Sp") {
+                        return manualRelationCalcResponse
+                    }else {
+                        manualRelationCalcResponse.content = ArrayList()
+                        manualRelationCalcResponse.result = SResponseType.success
+                    }
+                }else {
+                    manualRelationCalcResponse.content = ArrayList()
+                    manualRelationCalcResponse.result = SResponseType.success
+                }
+            }else {
+                manualRelationCalcResponse.content = ArrayList()
+                manualRelationCalcResponse.result = SResponseType.success
+            }
 
-        } else if (manualRelationCalcRequest.graphicType == "ArchSubset" && manualRelationCalcRequest.relType == "Fl2Sp") {
+        }else if (manualRelationCalcRequest.objectType == "3") {
 
-        } else if (manualRelationCalcRequest.graphicType == "MechInArch" && manualRelationCalcRequest.relType == "Eq2Bd") {
+            val listType = ArrayList<SFilter>()
+            /** 模糊查询 */
+            if(!manualRelationCalcRequest.vagueFrom.isNullOrEmpty()){
+                listType.add( SFilter.or(SFilter.contain("id",manualRelationCalcRequest.vagueFrom!!),SFilter.contain("name",manualRelationCalcRequest.vagueFrom!!)
+                        ,SFilter.contain("localName",manualRelationCalcRequest.vagueFrom!!),SFilter.contain("localId",manualRelationCalcRequest.vagueFrom!!)))
+            }
+            if (!manualRelationCalcRequest.categoryFrom.isNullOrEmpty()) {
+                listType.add(SFilter.eq("classCode",manualRelationCalcRequest.categoryFrom!!))
+            }
+            listType.add(SFilter.not(SFilter.isNull("buildingId")))
+            val relEquipBuildingList = relEquipBuildingService.select(listType).exec()
+            if (relEquipBuildingList.size>0) {
 
-            return  queryEq2Bd(manualRelationCalcRequest)
-        } else if (manualRelationCalcRequest.graphicType == "MechInArch" && manualRelationCalcRequest.relType == "Eq2Fl") {
+                val relBuildinglist = relBuildingService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.contain("localName", manualRelationCalcRequest.vagueFrom!!)).exec()
+                if (relBuildinglist.size>0) {
+                    val listIds = ArrayList<String>()
+                    for (building in relBuildinglist) {
+                        listIds.add(building.id!!)
+                    }
+                    val listEquipIds = ArrayList<String>()
+                    for (relEquipBuilding in relEquipBuildingList) {
+                        listEquipIds.add(relEquipBuilding.id!!)
+                    }
 
-        } else if (manualRelationCalcRequest.graphicType == "ArchForArch" && manualRelationCalcRequest.relType == "Sp2Sp") {
+                    list.add(SFilter.inList("buildingId",listIds))
+                    list.add(SFilter.inList("id",listEquipIds))
+                    val pageQuery = relEquipBuildingService.pageQuery(sQueryRequest,list)
+                    manualRelationCalcResponse.content = pageQuery.content
+                    manualRelationCalcResponse.message = pageQuery.message
+                    manualRelationCalcResponse.pageNumber = pageQuery.pageNumber
+                    manualRelationCalcResponse.pageSize = pageQuery.pageSize
+                    manualRelationCalcResponse.result = pageQuery.result
+                    manualRelationCalcResponse.total = pageQuery.total
+                    return manualRelationCalcResponse
+                }else {
+                    manualRelationCalcResponse.content = ArrayList()
+                    manualRelationCalcResponse.result = SResponseType.success
+                }
 
-        } else if (manualRelationCalcRequest.graphicType == "MechSubset" && manualRelationCalcRequest.relType == "Sy2Eq") {
 
-        } else if (manualRelationCalcRequest.graphicType == "MechInArch" && manualRelationCalcRequest.relType == "Eq2Sp") {
+            }else {
+                manualRelationCalcResponse.content = ArrayList()
+                manualRelationCalcResponse.result = SResponseType.success
+            }
 
         }
+        return  manualRelationCalcResponse
 
     }
 
-    /**
-     * 设备所在建筑查询
-     */
-    fun queryEq2Bd(manualRelationCalcRequest: ManualRelationCalcRequest): ManualRelationCalcResponse {
+    fun queryEq2Fl(manualRelationCalcRequest: ManualRelationCalcRequest): ManualRelationCalcResponse {
         val sQueryRequest = SQueryRequest()
         if(manualRelationCalcRequest.pageNumber>0&&manualRelationCalcRequest.pageSize>0){
             SQueryRequest.maxRow = 400000
@@ -414,17 +558,48 @@ open class ManualRelationCalcService {
             if (!manualRelationCalcRequest.categoryFrom.isNullOrEmpty()) {
                 listType.add(SFilter.eq("classCode",manualRelationCalcRequest.categoryFrom!!))
             }
-            relEquipBuildingService
+            listType.add(SFilter.not(SFilter.isNull("buildingId")))
+            val relEquipBuildingList = relEquipBuildingService.select(listType).exec()
+            if (relEquipBuildingList.size>0) {
+
+                val relBuildinglist = relBuildingService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.contain("localName", manualRelationCalcRequest.vagueFrom!!)).exec()
+                if (relBuildinglist.size>0) {
+                    val listIds = ArrayList<String>()
+                    for (building in relBuildinglist) {
+                        listIds.add(building.id!!)
+                    }
+                    val listEquipIds = ArrayList<String>()
+                    for (relEquipBuilding in relEquipBuildingList) {
+                        listEquipIds.add(relEquipBuilding.id!!)
+                    }
+
+                    list.add(SFilter.inList("buildingId",listIds))
+                    list.add(SFilter.inList("id",listEquipIds))
+                    val pageQuery = relEquipBuildingService.pageQuery(sQueryRequest,list)
+                    manualRelationCalcResponse.content = pageQuery.content
+                    manualRelationCalcResponse.message = pageQuery.message
+                    manualRelationCalcResponse.pageNumber = pageQuery.pageNumber
+                    manualRelationCalcResponse.pageSize = pageQuery.pageSize
+                    manualRelationCalcResponse.result = pageQuery.result
+                    manualRelationCalcResponse.total = pageQuery.total
+                    return manualRelationCalcResponse
+                }else {
+                    manualRelationCalcResponse.content = ArrayList()
+                    manualRelationCalcResponse.result = SResponseType.success
+                }
 
 
+            }else {
+                manualRelationCalcResponse.content = ArrayList()
+                manualRelationCalcResponse.result = SResponseType.success
+            }
 
         }
+        return  manualRelationCalcResponse
 
     }
 
 
-
-
     /**
      * 删除关系
      */

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

@@ -24,19 +24,18 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.services.relation_calc
+package com.persagy.server.datacenter.services.relation_calc
 
 import com.persagy.database.SFilter
 import com.persagy.database.SOrder
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.datacenter.wanda.rel.REq2Eq
 import com.persagy.server.datacenter.models.entities.graphtype.block.ConnectedBlock
 import com.persagy.server.datacenter.models.entities.graphtype.block.ConnectedBlockSource
 import com.persagy.server.datacenter.models.entities.graphtype.block.EquipIdUUIDMap
 import com.persagy.server.datacenter.models.entities.graphtype.block.MepSourceTypeEntity
 import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.task.SpaceType
-import com.persagy.server.datacenter.services.relation_calc.MepSystemTransformer
+import com.persagy.server.datacenter.wanda.rel.REq2Eq
 import com.persagy.server.mappers.MepSystemMapper
 import com.persagy.service.SObjectService
 import com.persagy.service.models.enums.SResponseType

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/MepSystemTransformer.kt

@@ -26,8 +26,8 @@
 
 package com.persagy.server.datacenter.services.relation_calc
 
-import com.persagy.server.datacenter.datacenter.wanda.rel.REq2Eq
 import com.persagy.server.datacenter.models.entities.graphtype.block.EquipIdUUIDMap
+import com.persagy.server.datacenter.wanda.rel.REq2Eq
 import java.util.stream.Collectors
 
 /**

+ 3 - 3
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/RelationCalcService.kt

@@ -29,18 +29,18 @@ package com.persagy.server.datacenter.services.relation_calc
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
-import com.persagy.server.datacenter.datacenter.wanda.rel.RSp2Sp
 import com.persagy.server.datacenter.models.entities.graphtype.MPoint
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
 import com.persagy.server.datacenter.services.base.RService
+import com.persagy.server.datacenter.services.objects.EquipmentService
+import com.persagy.server.datacenter.services.objects.ZoneSpaceBaseService
+import com.persagy.server.datacenter.wanda.rel.RSp2Sp
 import com.persagy.server.jms.RabbitMqService
 import com.persagy.server.mappers.IRelationCalcMapper
 import com.persagy.server.models.`object`.TwicePoint
 import com.persagy.server.models.service.BaseDataService
 import com.persagy.server.services.assistant.RUpDateEquipAndSapceService
-import com.persagy.server.services.objects.EquipmentService
 import com.persagy.server.services.objects.FloorService
-import com.persagy.server.services.objects.ZoneSpaceBaseService
 import com.persagy.server.services.rel.REq2SpService
 import com.persagy.server.services.relation_calc.CommonService
 import com.persagy.server.utils.IdUtils

+ 3 - 3
datacenter/src/main/kotlin/com/persagy/server/datacenter/wanda/controllers/obj/BuildingController.kt

@@ -24,12 +24,12 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.wanda.controllers.obj
+package com.persagy.server.datacenter.wanda.controllers.obj
 
 import com.persagy.database.SFilter
 import com.persagy.server.Opt
-import com.persagy.server.datacenter.datacenter.wanda.obj.Building
-import com.persagy.server.services.objects.BuildingService
+import com.persagy.server.datacenter.services.objects.BuildingService
+import com.persagy.server.datacenter.wanda.obj.Building
 import com.persagy.service.models.requests.SCountRequest
 import com.persagy.service.models.requests.SCreateRequest
 import com.persagy.service.models.requests.SQueryRequest

+ 1 - 5
datacenter/src/main/kotlin/com/persagy/server/datacenter/wanda/controllers/obj/EquipController.kt

@@ -28,11 +28,8 @@ package com.persagy.server.datacenter.wanda.controllers.obj
 
 import com.persagy.database.SFilter
 import com.persagy.server.Opt
-import com.persagy.server.datacenter.models.entities.assistant.EquipmentProSy
+import com.persagy.server.datacenter.services.objects.EquipmentService
 import com.persagy.server.datacenter.wanda.obj.Equipment
-import com.persagy.server.services.objects.EquipmentProSyService
-import com.persagy.server.services.objects.EquipmentService
-import com.persagy.service.SPageContext
 import com.persagy.service.models.requests.SCountRequest
 import com.persagy.service.models.requests.SCreateRequest
 import com.persagy.service.models.requests.SQueryRequest
@@ -43,7 +40,6 @@ import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
-import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.*
 
 /**

+ 1 - 4
datacenter/src/main/kotlin/com/persagy/server/datacenter/wanda/controllers/obj/FloorController.kt

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.wanda.controllers.obj
 
-import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.server.Opt
-import com.persagy.server.datacenter.models.entities.objects.Floor
+import com.persagy.server.datacenter.wanda.obj.Floor
 import com.persagy.server.services.objects.FloorService
-import com.persagy.service.SPageContext
 import com.persagy.service.models.requests.SCreateRequest
 import com.persagy.service.models.requests.SQueryRequest
 import com.persagy.service.models.requests.SUpdateRequest
@@ -40,7 +38,6 @@ import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
-import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/datacenter/wanda/controllers/obj/GeneralSystemController.kt

@@ -28,8 +28,8 @@ package com.persagy.server.datacenter.wanda.controllers.obj
 
 import com.persagy.database.SFilter
 import com.persagy.server.Opt
+import com.persagy.server.datacenter.services.objects.GeneralSystemService
 import com.persagy.server.datacenter.wanda.obj.GeneralSystem
-import com.persagy.server.services.objects.GeneralSystemService
 import com.persagy.service.models.requests.SCountRequest
 import com.persagy.service.models.requests.SCreateRequest
 import com.persagy.service.models.requests.SQueryRequest

+ 3 - 9
datacenter/src/main/kotlin/com/persagy/server/datacenter/wanda/controllers/obj/ZoneSpaceController.kt

@@ -28,15 +28,9 @@ package com.persagy.server.datacenter.wanda.controllers.obj
 
 import com.persagy.database.SFilter
 import com.persagy.server.Opt
-import com.persagy.server.datacenter.models.entities.assistant.DictSpaceProject
-import com.persagy.server.datacenter.models.entities.objects.Building
-import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
-import com.persagy.server.datacenter.models.entities.task.SpaceType
-import com.persagy.server.datacenter.models.requests.DCSQueryRequest
-import com.persagy.server.datacenter.models.requests.UpDataFloorAndBuildingRequests
-import com.persagy.server.datacenter.models.response.SpaceSQueryResponse
-import com.persagy.server.services.objects.ZoneSpaceBaseService
-import com.persagy.server.services.relation_calc.MepSystemCalcService
+import com.persagy.server.datacenter.services.objects.ZoneSpaceBaseService
+import com.persagy.server.datacenter.services.relation_calc.MepSystemCalcService
+import com.persagy.server.datacenter.wanda.obj.ZoneSpace
 import com.persagy.service.SPageContext
 import com.persagy.service.models.requests.SCountRequest
 import com.persagy.service.models.requests.SCreateRequest

+ 7 - 5
datacenter/src/main/kotlin/com/persagy/server/datacenter/wanda/controllers/relation/ManualRelationCalcController.kt

@@ -27,10 +27,12 @@
 package com.persagy.server.datacenter.wanda.controllers.relation
 
 import com.persagy.server.datacenter.datacenter.models.entities.graphtype.block.RelationAddRequest
+import com.persagy.server.datacenter.datacenter.models.requests.ManualRelationCalcRequest
 import com.persagy.server.datacenter.models.requests.ManualRelationCalcDel
 import com.persagy.server.datacenter.models.response.ManualRelationCalcSCreateResponse
 import com.persagy.server.datacenter.services.relation_calc.ManualRelationCalcAddService
 import com.persagy.server.datacenter.services.relation_calc.ManualRelationCalcService
+import com.persagy.server.datacenter.wanda.response.ManualRelationCalcResponse
 import com.persagy.service.models.responses.SBaseResponse
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
@@ -63,11 +65,11 @@ class ManualRelationCalcController {
     /**
      * 查询关系数据
      */
-//    @Operation(summary = "查询关系数据", description = "")
-//    @PostMapping(value = ["/query"])
-//    fun query(@RequestBody manualRelationCalcRequest: ManualRelationCalcRequest): ManualRelationCalcResponse {
-//        return service.query(manualRelationCalcRequest)
-//    }
+    @Operation(summary = "查询关系数据", description = "")
+    @PostMapping(value = ["/query"])
+    fun query(@RequestBody manualRelationCalcRequest: ManualRelationCalcRequest): ManualRelationCalcResponse {
+        return service.queryRel(manualRelationCalcRequest)
+    }
 
     /**
      * 添加关系

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

@@ -5,7 +5,7 @@ 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.models.entities.objects.Tenant
+import com.persagy.server.datacenter.datacenter.models.entities.objects.Tenant
 import com.persagy.service.SObjectService
 import org.slf4j.LoggerFactory
 

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

@@ -4,7 +4,7 @@ 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.models.entities.objects.Tenant
+import com.persagy.server.datacenter.datacenter.models.entities.objects.Tenant
 import com.persagy.server.datacenter.models.jms.SynchronousMessage
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.models.api.obj.EquipApi

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/controllers/EquipController.kt

@@ -29,7 +29,7 @@
 //import com.persagy.database.SFilter
 //import com.persagy.server.datacenter.datacenter.models.entities.dictnew.DefClass
 //import com.persagy.server.datacenter.datacenter.wanda.obj.Equipment
-//import com.persagy.server.datacenter.models.entities.objects.Property
+//import com.persagy.server.datacenter.datacenter.models.entities.objects.Property
 //import com.persagy.server.datacenter.models.response.EquipAssetComponentsReqponse
 //import com.persagy.server.models.*
 //import com.persagy.server.models.requests.EquipUpDateEnclosure

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/dao/mappers/StatisticsCountMapper.kt

@@ -2,7 +2,7 @@ package com.persagy.server.dao.mappers
 
 
 import com.persagy.server.datacenter.models.entities.task.CategoryStatistics
-import com.persagy.server.datacenter.models.entities.task.EquipmentTaskTwo
+import com.persagy.server.datacenter.datacenter.models.entities.task.EquipmentTaskTwo
 import com.persagy.server.datacenter.models.response.StatisticsCountResponse
 import org.apache.ibatis.annotations.Mapper
 import org.apache.ibatis.annotations.Select

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/models/EquipmentDel.kt

@@ -28,7 +28,7 @@ package com.persagy.server.models
 
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.server.datacenter.models.entities.dict.EquipCategory
-import com.persagy.server.datacenter.models.entities.objects.Property
+import com.persagy.server.datacenter.datacenter.models.entities.objects.Property
 import com.persagy.server.datacenter.models.entities.task.base.ScanTaskBase
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/models/PropertyEquip.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.models
 
-import com.persagy.server.datacenter.models.entities.objects.Property
+import com.persagy.server.datacenter.datacenter.models.entities.objects.Property
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Table

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/service/EquipmentProSyService.kt

@@ -30,7 +30,7 @@ import com.persagy.database.SFilter
 import com.persagy.database.extensions.keyValue
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.datacenter.models.entities.dictnew.DefClass
-import com.persagy.server.datacenter.models.entities.objects.Property
+import com.persagy.server.datacenter.datacenter.models.entities.objects.Property
 import com.persagy.server.datacenter.models.entities.rel.RSyEq
 import com.persagy.server.models.EquipmentProSy
 import com.persagy.server.service.base.Service

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/service/objects/PropertyService.kt

@@ -30,7 +30,7 @@ import com.persagy.server.utils.ShaftNameUtil
 import com.persagy.database.SFilter
 import com.persagy.database.SQueryBuilder
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.models.entities.objects.Property
+import com.persagy.server.datacenter.datacenter.models.entities.objects.Property
 import com.persagy.server.service.EquipFamilyService
 import com.persagy.server.service.base.Service
 import com.persagy.server.utils.IdUtils

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/service/objects/TenantService.kt

@@ -28,7 +28,7 @@ package com.persagy.server.service.objects
 
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.models.entities.objects.Tenant
+import com.persagy.server.datacenter.datacenter.models.entities.objects.Tenant
 import com.persagy.server.models.objects.Building
 import com.persagy.server.models.objects.FloorCompon
 import com.persagy.server.service.CustomSqlService

+ 2 - 0
scanbuilding/src/main/kotlin/com/persagy/server/controller/task/EquipScanTaskController.kt

@@ -28,6 +28,8 @@ package com.persagy.server.controller.task
 
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
+import com.persagy.server.datacenter.datacenter.models.entities.task.EquipScanTask
+import com.persagy.server.datacenter.datacenter.models.entities.task.EquipScanTaskQuery
 import com.persagy.server.datacenter.models.entities.assistant.TaskPic
 import com.persagy.server.datacenter.models.entities.task.*
 import com.persagy.server.services.EquipmentService

+ 1 - 0
scanbuilding/src/main/kotlin/com/persagy/server/controller/task/ModelScanTaskController.kt

@@ -30,6 +30,7 @@ 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.task.EquipmentTaskTwo
 import com.persagy.server.datacenter.models.entities.task.*
 import com.persagy.server.datacenter.models.requests.ModelScanSQueryRequest
 import com.persagy.server.services.task.ModelScanTaskQueryService

+ 1 - 1
scanbuilding/src/main/kotlin/com/persagy/server/controller/task/PropertyScanTaskController.kt

@@ -30,7 +30,7 @@ import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.server.datacenter.models.entities.task.BuildingDic
 import com.persagy.server.datacenter.models.entities.task.EquipCategoryDic
-import com.persagy.server.datacenter.models.entities.task.PropertyScanTask
+import com.persagy.server.datacenter.datacenter.models.entities.task.PropertyScanTask
 import com.persagy.server.services.task.PropertyScanTaskService
 import com.persagy.server.services.task.ScanTaskBaseService
 import com.persagy.service.SPageContext

+ 1 - 1
scanbuilding/src/main/kotlin/com/persagy/server/controller/task/ScanTaskBaseController.kt

@@ -29,7 +29,7 @@ package com.persagy.server.controller.task
 import com.persagy.database.SFilter
 import com.persagy.database.functions.SLength
 import com.persagy.server.datacenter.models.entities.task.CategoryStatistics
-import com.persagy.server.datacenter.models.entities.task.ModelScanTask
+import com.persagy.server.datacenter.datacenter.models.entities.task.ModelScanTask
 import com.persagy.server.services.task.ScanTaskBaseService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.requests.SCountRequest

+ 1 - 1
scanbuilding/src/main/kotlin/com/persagy/server/mappers/StatisticsCountMapper.kt

@@ -27,7 +27,7 @@
 package com.persagy.server.mappers
 
 import com.persagy.server.datacenter.models.entities.task.CategoryStatistics
-import com.persagy.server.datacenter.models.entities.task.EquipmentTaskTwo
+import com.persagy.server.datacenter.datacenter.models.entities.task.EquipmentTaskTwo
 import com.persagy.server.datacenter.models.response.StatisticsCountResponse
 import org.apache.ibatis.annotations.Mapper
 import org.apache.ibatis.annotations.Select

+ 1 - 1
scanbuilding/src/main/kotlin/com/persagy/server/services/task/EquipScanTaskQueryService.kt

@@ -30,7 +30,7 @@ import com.persagy.database.SFilter
 import com.persagy.database.functions.SLength
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.datacenter.models.entities.dictnew.DefClass
-import com.persagy.server.datacenter.models.entities.task.EquipScanTaskQuery
+import com.persagy.server.datacenter.datacenter.models.entities.task.EquipScanTaskQuery
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext

+ 1 - 1
scanbuilding/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskQueryService.kt

@@ -30,7 +30,7 @@ import com.persagy.database.SFilter
 import com.persagy.database.functions.SLength
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.datacenter.models.entities.dictnew.DefClass
-import com.persagy.server.datacenter.models.entities.task.ModelScanTaskQuery
+import com.persagy.server.datacenter.datacenter.models.entities.task.ModelScanTaskQuery
 import com.persagy.server.services.base.RService
 import com.persagy.service.SBaseService
 import com.persagy.service.SPageContext

+ 2 - 0
scanbuilding/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskService.kt

@@ -35,6 +35,8 @@ import com.persagy.database.SFilter
 import com.persagy.database.SPageQueryInfo
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opts
+import com.persagy.server.datacenter.datacenter.models.entities.task.EquipmentTaskTwo
+import com.persagy.server.datacenter.datacenter.models.entities.task.ModelScanTask
 import com.persagy.server.datacenter.models.entities.assistant.TaskPic
 import com.persagy.server.datacenter.models.entities.dict.EquipCategory
 import com.persagy.server.datacenter.wanda.obj.Equipment

+ 2 - 2
scanbuilding/src/main/kotlin/com/persagy/server/services/task/PropertyScanTaskService.kt

@@ -37,8 +37,8 @@ import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opts
 import com.persagy.server.datacenter.models.entities.assistant.TaskPic
 import com.persagy.server.datacenter.models.entities.dict.EquipFamilyCategory
-import com.persagy.server.datacenter.models.entities.objects.Property
-import com.persagy.server.datacenter.models.entities.task.PropertyScanTask
+import com.persagy.server.datacenter.datacenter.models.entities.objects.Property
+import com.persagy.server.datacenter.datacenter.models.entities.task.PropertyScanTask
 import com.persagy.server.datacenter.models.entities.task.SchemeUtils
 import com.persagy.server.scanbuilding.UserLog
 import com.persagy.server.services.base.RService

+ 1 - 0
scanbuilding/src/main/kotlin/com/persagy/server/services/task/ScanTaskBaseService.kt

@@ -31,6 +31,7 @@ import com.google.gson.reflect.TypeToken
 import com.persagy.database.SFilter
 import com.persagy.database.SPageQueryInfo
 import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.datacenter.datacenter.models.entities.task.EquipScanTask
 import com.persagy.server.datacenter.models.entities.task.*
 import com.persagy.server.datacenter.models.entities.task.base.ScanTaskBase
 import com.persagy.server.mappers.StatisticsCountMapper