Bläddra i källkod

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

zhangweixin 4 år sedan
förälder
incheckning
580be39b33
100 ändrade filer med 272 tillägg och 152 borttagningar
  1. 9 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/dao/mappers/SchemeMapper.kt
  2. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/EquipmentBase.kt
  3. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationOne.kt
  4. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationTwoSy.kt
  5. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentEq2SpControlEquipNetwork.kt
  6. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentEq2SpOther.kt
  7. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentSensorNetworkOne.kt
  8. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentSs2Eq.kt
  9. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentSs2Sy.kt
  10. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentVv2Eq.kt
  11. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentVv2Sp.kt
  12. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentVv2Sy.kt
  13. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDHWNetworkOne.kt
  14. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDHWNetworkTwo.kt
  15. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrainingWaterNetworkOne.kt
  16. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrainingWaterNetworkTwo.kt
  17. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrinkingWaterNetworkOne.kt
  18. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrinkingWaterNetworkTwo.kt
  19. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireVentNetworkOne.kt
  20. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireWaterNetworkOne.kt
  21. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireWaterNetworkTwo.kt
  22. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentGasNetworkOne.kt
  23. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentGasNetworkTwo.kt
  24. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentRecycleWaterNetworkOne.kt
  25. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentRecycleWaterNetworkTwo.kt
  26. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentSupplyWaterNetworkOne.kt
  27. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentSupplyWaterNetworkTwo.kt
  28. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentHubOrdinary.kt
  29. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentHubPrepare.kt
  30. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentLubOrdinary.kt
  31. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentLubPrepare.kt
  32. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentRoutinePower.kt
  33. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentSparePower.kt
  34. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentSyRoutinePower.kt
  35. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentSySparePower.kt
  36. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkOne.kt
  37. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkThree.kt
  38. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkTwo.kt
  39. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopFour.kt
  40. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopOne.kt
  41. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopThree.kt
  42. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopTwo.kt
  43. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCondWaterNetwork.kt
  44. 1 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopFour.kt
  45. 1 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopOne.kt
  46. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopThree.kt
  47. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopTwo.kt
  48. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentFreshAirNetworkOne.kt
  49. 1 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopFour.kt
  50. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopOne.kt
  51. 1 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopThree.kt
  52. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopTwo.kt
  53. 1 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVentNetworkOne.kt
  54. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVentNetworkThree.kt
  55. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVentNetworkTwo.kt
  56. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVrfNetworkOne.kt
  57. 1 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/objects/Property.kt
  58. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/objects/Tenant.kt
  59. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/EquipScanTask.kt
  60. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/EquipScanTaskQuery.kt
  61. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/EquipmentTaskTwo.kt
  62. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/ModelScanTask.kt
  63. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/ModelScanTaskQuery.kt
  64. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/PropertyScanTask.kt
  65. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/ScanSchemeInfo.kt
  66. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/tool/ObjectBaseRequest.kt
  67. 10 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/requests/ManualRelationCalcRequest.kt
  68. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/response/EquipAssetComponentsReqponse.kt
  69. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/response/SpaceSQueryResponse.kt
  70. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/AttPic.kt
  71. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/dict/DictInfosWanDa.kt
  72. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/dict/DictStage.kt
  73. 3 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/objects/Building.kt
  74. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/objects/Component.kt
  75. 2 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/wanda/obj/Equipment.kt
  76. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/objects/Floor.kt
  77. 3 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/objects/GeneralSystem.kt
  78. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/objects/Project.kt
  79. 1 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/objects/Shaft.kt
  80. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/objects/ZoneIspace.kt
  81. 4 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/objects/ZoneSpace.kt
  82. 125 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/rel/EquipmentBase.kt
  83. 7 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/rel/REq2Eq.kt
  84. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/rel/RSp2Sp.kt
  85. 2 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/rel/RSy2Sp.kt
  86. 0 35
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/RelBuilding.kt
  87. 20 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/rel/RelEq2BdEquip.kt
  88. 3 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/wanda/rel/RelZoneSpaceBd.kt
  89. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/wanda/rel/SpaceBaseZone.kt
  90. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/response/DictInfoResponse.kt
  91. 2 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/response/ManualRelationCalcResponse.kt
  92. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/test.java
  93. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/objects/FloorController.kt
  94. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/objects/GeneralSystemController.kt
  95. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/objects/ISpaceController.kt
  96. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/objects/ShaftController.kt
  97. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/objects/ZoneSpaceController.kt
  98. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RelationObjectController.kt
  99. 1 1
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/relation_calc/CalcSpecialController.kt
  100. 0 0
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/relation_calc/ManualRelationCalcController.kt

+ 9 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/dao/mappers/SchemeMapper.kt

@@ -24,10 +24,11 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.dao.mappers
+package com.persagy.server.datacenter.datacenter.dao.mappers
 
 import com.persagy.server.datacenter.models.entities.assistant.ModelKey
 import com.persagy.server.datacenter.models.entities.dict.Family
+import com.persagy.server.datacenter.wanda.obj.Building
 import org.apache.ibatis.annotations.Mapper
 import org.apache.ibatis.annotations.Param
 import org.apache.ibatis.annotations.Select
@@ -114,6 +115,13 @@ interface SchemeMapper {
     fun modelId(@Param("id") id: String): ArrayList<ModelKey>
 
 
+    /**
+     * 统计建筑id
+     */
+    @Select("SELECT building_id AS id FROM public.equipment WHERE project_id = #{projectId} AND  NOT building_id IS NULL GROUP BY building_id")
+    fun buildingId(@Param("projectId") projectId: String):ArrayList<Building>
+
+
 
 
 } // interface SchemeMapper

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/EquipmentBase.kt

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.graphtype.rel
+package com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationOne.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationTwoSy.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelGeneralSystem
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentEq2SpControlEquipNetwork.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentEq2SpOther.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentSensorNetworkOne.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentSs2Eq.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentSs2Sy.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelGeneralSystem
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentVv2Eq.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentVv2Sp.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentVv2Sy.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelGeneralSystem
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDHWNetworkOne.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDHWNetworkTwo.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrainingWaterNetworkOne.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 4
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrainingWaterNetworkTwo.kt

@@ -26,13 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 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
 
 /**

+ 1 - 4
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrinkingWaterNetworkOne.kt

@@ -26,13 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 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
 
 /**

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrinkingWaterNetworkTwo.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireVentNetworkOne.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireWaterNetworkOne.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireWaterNetworkTwo.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentGasNetworkOne.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentGasNetworkTwo.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentRecycleWaterNetworkOne.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentRecycleWaterNetworkTwo.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentSupplyWaterNetworkOne.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentSupplyWaterNetworkTwo.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentHubOrdinary.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentHubPrepare.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentLubOrdinary.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentLubPrepare.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentRoutinePower.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentSparePower.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentSyRoutinePower.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentSySparePower.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkOne.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkThree.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkTwo.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopFour.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopOne.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopThree.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopTwo.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCondWaterNetwork.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopFour.kt

@@ -26,8 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopOne.kt

@@ -26,8 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopThree.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopTwo.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentFreshAirNetworkOne.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 5
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopFour.kt

@@ -26,14 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 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
 
 /**

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopOne.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopThree.kt

@@ -26,8 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopTwo.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVentNetworkOne.kt

@@ -26,8 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVentNetworkThree.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVentNetworkTwo.kt

@@ -27,7 +27,7 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVrfNetworkOne.kt

@@ -27,7 +27,7 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

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

@@ -27,6 +27,7 @@
 package com.persagy.server.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

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

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.objects
 
-import com.alibaba.fastjson.annotation.JSONField
+import com.persagy.server.datacenter.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

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

@@ -28,7 +28,7 @@ package com.persagy.server.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.objects.Building
+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

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

@@ -31,7 +31,7 @@ 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.objects.Building
+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.service.models.annotations.SCascade

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

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.task
 
-import com.alibaba.fastjson.annotation.JSONField
+import com.persagy.server.datacenter.datacenter.models.entities.objects.ZoneSpace
 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.*

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

@@ -27,7 +27,7 @@
 package com.persagy.server.datacenter.models.entities.task
 
 import com.persagy.server.datacenter.models.entities.dict.EquipCategory
-import com.persagy.server.datacenter.models.entities.objects.Building
+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

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

@@ -30,7 +30,7 @@ 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.models.entities.objects.Building
+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.service.models.annotations.SCascade

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

@@ -27,7 +27,7 @@
 package com.persagy.server.datacenter.models.entities.task
 
 import com.persagy.server.datacenter.models.entities.dict.EquipFamilyCategory
-import com.persagy.server.datacenter.models.entities.objects.Building
+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.base.ScanTaskBase

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/task/ScanSchemeInfo.kt

@@ -27,7 +27,7 @@
 package com.persagy.server.datacenter.models.entities.task
 
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
-import com.persagy.server.datacenter.models.entities.objects.Project
+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

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/tool/ObjectBaseRequest.kt

@@ -29,7 +29,7 @@ package com.persagy.server.datacenter.models.entities.tool
 import com.alibaba.fastjson.annotation.JSONField
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.persagy.server.datacenter.models.entities.assistant.AttPic
+import com.persagy.server.datacenter.wanda.AttPic
 import com.persagy.server.datacenter.models.entities.assistant.TaskPic
 import org.json.JSONObject
 import org.slf4j.LoggerFactory

+ 10 - 4
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/requests/ManualRelationCalcRequest.kt

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.requests
+package com.persagy.server.datacenter.datacenter.models.requests
 
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
@@ -37,7 +37,7 @@ import javax.validation.constraints.NotNull
  */
 class ManualRelationCalcRequest : Serializable {
 
-    @Schema(description = "主从对象类型,主1、从2")
+    @Schema(description = "主从对象类型,主1、从2,双向3")
     var objectType: String? = null
 
     @Schema(description = "关系类型")
@@ -48,7 +48,10 @@ class ManualRelationCalcRequest : Serializable {
     var graphicType: String? = null
 
     @Schema(description = "分类类型")
-    var category: String? = null
+    var categoryFrom: String? = null
+
+    @Schema(description = "分类类型")
+    var categoryTo: String? = null
 
     @Schema(description = "空间类型")
     var zoneType: String? = null
@@ -60,7 +63,10 @@ class ManualRelationCalcRequest : Serializable {
     var buildingId: String? = null
 
     @Schema(description = "模糊查询 关键词")
-    var vague: String? = null
+    var vagueFrom: String? = null
+
+    @Schema(description = "模糊查询 关键词")
+    var vagueTo: String? = null
 
     /** 第几页 */
     @Schema(description = "第几页(从1开始)", example = "1")

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

@@ -28,7 +28,7 @@ package com.persagy.server.datacenter.models.response
 
 import com.persagy.server.datacenter.datacenter.models.entities.dictnew.DefClass
 import com.persagy.server.datacenter.wanda.obj.Equipment
-import com.persagy.server.datacenter.models.entities.objects.GeneralSystem
+import com.persagy.server.datacenter.wanda.obj.GeneralSystem
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column

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

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.response
 
-import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
+import com.persagy.server.datacenter.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.v3.oas.annotations.media.Schema
 

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/AttPic.kt

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.assistant
+package com.persagy.server.datacenter.wanda
 
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable

data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/wanda/dict/DictInfosWanDa.kt → data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/dict/DictInfosWanDa.kt


data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/wanda/dict/DictStage.kt → data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/dict/DictStage.kt


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

@@ -24,9 +24,11 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.objects
+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

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

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.objects
+package com.persagy.server.datacenter.wanda.obj
 
 import com.persagy.server.datacenter.wanda.obj.Equipment
 

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

@@ -29,10 +29,8 @@ package com.persagy.server.datacenter.wanda.obj
 import com.alibaba.fastjson.annotation.JSONField
 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.EquipCategory
-import com.persagy.server.datacenter.models.entities.objects.*
 import com.persagy.server.datacenter.models.entities.task.SchemeUtils
-import com.persagy.service.models.annotations.SCascade
+import com.persagy.server.datacenter.wanda.AttPic
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
@@ -71,7 +69,7 @@ open class Equipment : BaseInfo() {
     /** 二维码图片 */
     @Schema(description = "二维码图片")
     @Column(name = "qr_code_pic")
-    var qRCodePic: String? = null
+    var qRCodePic: ArrayList<AttPic>? = null
 
     /** 二维码内容 */
     @Schema(description = "二维码内容")

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

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.objects
+package com.persagy.server.datacenter.wanda.obj
 
 import com.persagy.server.datacenter.models.entities.assistant.PointPosition
 import com.persagy.server.datacenter.models.entities.base.BaseInfo

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

@@ -24,13 +24,14 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.objects
+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.wanda.obj.Equipment
+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

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

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

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

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

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

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.objects
+package com.persagy.server.datacenter.wanda.obj
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.persagy.server.datacenter.models.entities.assistant.PointPosition

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

@@ -24,12 +24,14 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.objects
+package com.persagy.server.datacenter.wanda.obj
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.assistant.PointPosition
 import com.persagy.server.datacenter.models.entities.assistant.TaskPic
 import com.persagy.server.datacenter.datacenter.models.entities.dictnew.DefClass
+import com.persagy.server.datacenter.models.entities.objects.SpaceOutline
+import com.persagy.server.datacenter.wanda.AttPic
 import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.service.models.SBaseEntity
 import com.persagy.service.models.annotations.SCascade
@@ -87,7 +89,7 @@ open class ZoneSpace: Serializable, SBaseEntity() {
     /** 空间二维码图片 */
     @Schema(description = "空间二维码图片")
     @Column(name = "qr_code_pic")
-    var qRCodePic: String? = null
+    var qRCodePic: ArrayList<AttPic>? = null
 
     /** 平台二维码 */
     @Schema(description = "平台二维码")

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

@@ -0,0 +1,125 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .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.BIMLocation
+import com.persagy.server.datacenter.models.entities.base.BaseInfo
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+
+/**
+ * 设备信息实体类、部件实体类
+ *
+ * @author  张维新
+ */
+@Schema(description = "设备信息实体类")
+@Table(name = "equipment")
+open class EquipmentBase : BaseInfo() {
+
+    /** 设备id */
+    @Schema(description = "设备id",required = true)
+    @Id
+    @Column(name = "id")
+    var id: String? = null
+
+    /** 设备名称 */
+    @Schema(description = "设备名称",required = true)
+    @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
+
+    /** BIM模型中编码 */
+    @Schema(description = "BIM模型中编码")
+    @Column(name = "bim_id")
+    var bimId: String? = null
+
+    /** BIM构建编码 */
+    @Schema(description = "BIM构建编码")
+    @Column(name = "bim_type_id")
+    var bimTypeId: String? = null
+
+    /** BIM模型中坐标 */
+    @Schema(description = "BIM模型中坐标")
+    @Column(name = "bim_location")
+    var bimLocation: String? = null
+
+    /** 项目id */
+    @Schema(description = "项目id",required = true)
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+    /** 设备类型code */
+    @Schema(description = "设备类型code")
+    @Column(name = "class_code")
+    var classCode: String? = null
+    set(value) {
+        field = value?.trim()
+    }
+
+    /** 设备所在建筑id */
+    @Schema(description = "设备所在建筑id")
+    @Column(name = "building_id")
+    var buildingId: String? = null
+
+    /** 设备所在楼层id */
+    @Schema(description = "设备所在楼层id")
+    @Column(name = "floor_id")
+    var floorId: String? = null
+
+    //    /** 设备关联的资产id */
+    @Schema(description = "设备关联的资产id")
+    @Column(name = "property_id",insertable = false,updatable = false )
+    var propertyId: String? = null
+
+    /** 对象类型 */
+    @Schema(description = "对象类型")
+    @Column(name = "object_type")
+    override var objectType: String? = "Equipment"
+
+    /** 系统分类 */
+    @Schema(description = "系统分类")
+    @Column(name = "system_category")
+    var systemCategory: String? = null
+
+    /** 系统分类 */
+    @Schema(description = "设备类型名称")
+    @Column(name = "code_name")
+    var codeName: String? = null
+
+
+}

+ 7 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/rel/REq2Eq.kt

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.rel
+package com.persagy.server.datacenter.wanda.rel
 
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
@@ -65,6 +65,12 @@ class REq2Eq : RBaseInfo(){
     @Column(name = "type")
     var type: String? = null
 
+    /** 图类型编码 */
+    @Schema(description = "图类型编码")
+    @Id
+    @Column(name = "graph_code")
+    var graphCode: String? = null
+
     /** 计算标记 1 为手动 2为自动 */
     @Schema(description = "计算标记 1 为手动 2为自动 ")
     @Column(name = "sign")

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/rel/RSp2Sp.kt

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.datacenter.models.entities.rel
+package com.persagy.server.datacenter.wanda.rel
 
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import io.swagger.v3.oas.annotations.media.Schema

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

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.rel
+package com.persagy.server.datacenter.wanda.rel
 
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
@@ -60,7 +60,7 @@ class RSy2Sp : RBaseInfo(){
     var projectId: String? = null
 
     /** 类型 */
-    @Schema(description = "类型 " )
+    @Schema(description = "类型" )
     @Id
     @Column(name = "type")
     var type: String? = null

+ 0 - 35
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/RelBuilding.kt

@@ -70,39 +70,4 @@ open class RelBuilding : BaseInfo() {
     @Column(name = "bim_id")
     var bimId: String? = null
 
-    /** 建筑信息 */
-    @Schema(description = "建筑信息")
-    @Column(name = "building_info")
-    var buildingInfo: HashMap<String,Any?>? = null
-
-    /** 工作历 */
-    @Schema(description = "工作历")
-    @Column(name = "schedule")
-    var schedule: HashMap<String,Any?>? = null
-
-    /** 人员信息 */
-    @Schema(description = "人员信息")
-    @Column(name = "people_info")
-    var peopleInfo: HashMap<String,Any?>? = null
-
-    /** 能耗信息 */
-    @Schema(description = "能耗信息")
-    @Column(name = "consumption_info")
-    var consumptionInfo: HashMap<String,Any?>? = null
-
-    /** 自定义 */
-    @Schema(description = "自定义")
-    @Column(name = "custom_param")
-    var customParam: HashMap<String,Any?>? = null
-
-    /** 建筑文档 */
-    @Schema(description = "建筑文档")
-    @Column(name = "building_doc")
-    var buildingDoc: HashMap<String,Any?>? = null
-
-    /** 对象类型 */
-    @Schema(description = "对象类型")
-    @Column(name = "object_type")
-    override var objectType: String? = "Building"
-
 } // Class RelBuilding

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

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

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

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

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

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.datacenter.wanda.rel
+package com.persagy.server.datacenter.wanda.rel
 
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import io.swagger.v3.oas.annotations.media.Schema

data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/wanda/response/DictInfoResponse.kt → data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/response/DictInfoResponse.kt


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

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.response
+package com.persagy.server.datacenter.wanda.response
 
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.service.models.responses.SQueryResponse
@@ -35,5 +35,4 @@ open class ManualRelationCalcResponse : SQueryResponse<BaseInfo>() {
     /** 方向 */
     @Schema(description = "方向 Left、right")
     var direction: String? = null
-
-} // Class ManualRelationCalcResponse
+}

data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/wanda/test.java → data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/test.java


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

@@ -29,7 +29,7 @@
 //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

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

@@ -31,7 +31,7 @@
 //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.models.entities.objects.ZoneSpace
+//import com.persagy.server.datacenter.datacenter.models.entities.objects.ZoneSpace
 //import com.persagy.server.datacenter.models.entities.rel.RSyEq
 //import com.persagy.server.datacenter.models.entities.rel.RSyEqList
 //import com.persagy.server.services.objects.GeneralSystemService

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

@@ -27,7 +27,7 @@
 //package com.persagy.server.controllers.objects
 //
 //import com.persagy.base.extensions.toJson
-//import com.persagy.server.datacenter.models.entities.objects.ZoneIspace
+//import com.persagy.server.datacenter.wanda.obj.ZoneIspace
 //import com.persagy.server.datacenter.models.requests.DCSQueryRequest
 //import com.persagy.server.datacenter.wanda.controllers.obj.ISpaceController
 //import com.persagy.server.services.objects.SpaceService

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

@@ -31,7 +31,7 @@
 //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.objects.Shaft
-//import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
+//import com.persagy.server.datacenter.datacenter.models.entities.objects.ZoneSpace
 //import com.persagy.server.datacenter.models.entities.rel.RelationSpaceShaft
 //import com.persagy.server.datacenter.models.entities.task.BuildingDic
 //import com.persagy.server.services.objects.ShaftService

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

@@ -30,7 +30,7 @@
 //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.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

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

@@ -29,7 +29,7 @@
 //import com.persagy.database.SFilter
 //import com.persagy.mybatis.SMybatisDao
 //import com.persagy.server.Opt
-//import com.persagy.server.datacenter.models.entities.rel.REq2Eq
+//import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Eq
 //import com.persagy.service.SObjectService
 //import com.persagy.service.models.requests.SQueryRequest
 //import io.swagger.v3.oas.annotations.Operation

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

@@ -26,7 +26,7 @@
 //
 //package com.persagy.server.controllers.relation_calc
 //
-//import com.persagy.server.services.relation_calc.CalcSpecialService
+//import com.persagy.server.datacenter.services.relation_calc.CalcSpecialService
 //import com.persagy.service.models.responses.SBaseResponse
 //import io.swagger.v3.oas.annotations.Operation
 //import io.swagger.v3.oas.annotations.tags.Tag

+ 0 - 0
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/relation_calc/ManualRelationCalcController.kt


Vissa filer visades inte eftersom för många filer har ändrats