Pārlūkot izejas kodu

********************WX***********************
屏蔽不规范编码

zhangweixin 4 gadi atpakaļ
vecāks
revīzija
f65b6027eb
94 mainītis faili ar 392 papildinājumiem un 338 dzēšanām
  1. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirConvection.kt
  2. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirMixing.kt
  3. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirUnidirectional.kt
  4. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceConnectedSp.kt
  5. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceDoors.kt
  6. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceDoorsWind.kt
  7. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceLightConnection.kt
  8. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceLightTrans.kt
  9. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceNotDoorsWind.kt
  10. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceOrdinary.kt
  11. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceWind.kt
  12. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpacefireClose.kt
  13. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpacefireOpen.kt
  14. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationOne.kt
  15. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentEq2SpControlEquipNetwork.kt
  16. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentSensorNetworkOne.kt
  17. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentSs2Eq.kt
  18. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentVv2Eq.kt
  19. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDHWNetworkOne.kt
  20. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDHWNetworkTwo.kt
  21. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrainingWaterNetworkOne.kt
  22. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrainingWaterNetworkTwo.kt
  23. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrinkingWaterNetworkOne.kt
  24. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrinkingWaterNetworkTwo.kt
  25. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireVentNetworkOne.kt
  26. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireWaterNetworkOne.kt
  27. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireWaterNetworkTwo.kt
  28. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentGasNetworkOne.kt
  29. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentGasNetworkTwo.kt
  30. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentRecycleWaterNetworkOne.kt
  31. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentRecycleWaterNetworkTwo.kt
  32. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentSupplyWaterNetworkOne.kt
  33. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentSupplyWaterNetworkTwo.kt
  34. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentHubOrdinary.kt
  35. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentHubPrepare.kt
  36. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentLubOrdinary.kt
  37. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentLubPrepare.kt
  38. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentRoutinePower.kt
  39. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentSparePower.kt
  40. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentSyRoutinePower.kt
  41. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentSySparePower.kt
  42. 1 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelFloorForBd.kt
  43. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelFloorForFl.kt
  44. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelFloorForSp.kt
  45. 1 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelShaftForBd.kt
  46. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelShaftForFl.kt
  47. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelShaftForSh.kt
  48. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelShaftForSp.kt
  49. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelZoneSpaceFor.kt
  50. 3 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelZoneSpaceForBd.kt
  51. 3 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelZoneSpaceForFl.kt
  52. 3 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelZoneSpaceForSh.kt
  53. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkOne.kt
  54. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkThree.kt
  55. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkTwo.kt
  56. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopFour.kt
  57. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopOne.kt
  58. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopThree.kt
  59. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopTwo.kt
  60. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCondWaterNetwork.kt
  61. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopFour.kt
  62. 1 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopOne.kt
  63. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopThree.kt
  64. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopTwo.kt
  65. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentFreshAirNetworkOne.kt
  66. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopFour.kt
  67. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopOne.kt
  68. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopThree.kt
  69. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopTwo.kt
  70. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVentNetworkOne.kt
  71. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVentNetworkThree.kt
  72. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVentNetworkTwo.kt
  73. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVrfNetworkOne.kt
  74. 5 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Equipment.kt
  75. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Floor.kt
  76. 0 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RBd2Bd.kt
  77. 4 2
      datacenter/src/main/kotlin/com/persagy/server/jms/TopicReceiver.kt
  78. 8 1
      datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationCountMapper.kt
  79. 20 0
      datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationCountProvider.kt
  80. 92 1
      datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationExcelExportMapper.kt
  81. 3 3
      datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationExcelImportMapper.kt
  82. 5 0
      datacenter/src/main/kotlin/com/persagy/server/services/graphtype/GraphicTypeMapperService.kt
  83. 20 2
      datacenter/src/main/kotlin/com/persagy/server/services/graphtype/RelationTypeProjectService.kt
  84. 3 0
      datacenter/src/main/kotlin/com/persagy/server/services/objects/EquipmentService.kt
  85. 2 0
      datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/CalcSpecialService.kt
  86. 3 2
      datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationAddService.kt
  87. 117 110
      datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationCalcService.kt
  88. 9 9
      datacenter/src/main/resources/application-test.yml
  89. 5 5
      equip-component/src/main/kotlin/com/persagy/server/Opt.kt
  90. 8 107
      equip-component/src/main/kotlin/com/persagy/server/models/PropertySupplement.kt
  91. 1 1
      equip-component/src/main/kotlin/com/persagy/server/models/TenantCascade.kt
  92. 1 1
      equip-component/src/main/kotlin/com/persagy/server/models/objects/FloorCompon.kt
  93. 4 4
      equip-component/src/main/kotlin/com/persagy/server/service/objects/EquipmentService.kt
  94. 2 2
      equip-component/src/main/resources/application-test.yml

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

@@ -41,7 +41,7 @@ open class RelZoneSpaceAirConvection: SpaceBaseZone() {
 
     /** 级联-资产所在的空间的 */
     @Schema(description = "级联-设备所在的空间的")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_ConvectionNetwork_1'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_ConvectionNetwork_1'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

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

@@ -41,7 +41,7 @@ open class RelZoneSpaceAirMixing: SpaceBaseZone() {
 
     /** 级联-资产所在的空间的 */
     @Schema(description = "级联-设备所在的空间的")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_ConvectionNetwork_2'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_ConvectionNetwork_2'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

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

@@ -41,7 +41,7 @@ open class RelZoneSpaceAirUnidirectional: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_ConvectionNetwork_3'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_ConvectionNetwork_3'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

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

@@ -42,7 +42,7 @@ open class RelZoneSpaceConnectedSp: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_SpaceNeighborhood_5'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_SpaceNeighborhood_5'" )
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 

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

@@ -41,7 +41,7 @@ open class RelZoneSpaceDoors: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_SpaceNeighborhood_2'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_SpaceNeighborhood_2'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

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

@@ -41,7 +41,7 @@ open class RelZoneSpaceDoorsWind: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_SpaceNeighborhood_4'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_SpaceNeighborhood_4'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

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

@@ -41,7 +41,7 @@ open class RelZoneSpaceLightConnection: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_RadiationNetwork_1'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_RadiationNetwork_1'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

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

@@ -41,7 +41,7 @@ open class RelZoneSpaceLightTrans: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_RadiationNetwork_2'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_RadiationNetwork_2'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

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

@@ -41,7 +41,7 @@ open class RelZoneSpaceNotDoorsWind: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_SpaceNeighborhood_1'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_SpaceNeighborhood_1'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

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

@@ -41,7 +41,7 @@ open class RelZoneSpaceOrdinary: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_TrafficNetwork_1'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_TrafficNetwork_1'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

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

@@ -41,7 +41,7 @@ open class RelZoneSpaceWind: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_SpaceNeighborhood_3'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_SpaceNeighborhood_3'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

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

@@ -41,7 +41,7 @@ open class RelZoneSpacefireClose: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_TrafficNetwork_3'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_TrafficNetwork_3'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

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

@@ -41,7 +41,7 @@ open class RelZoneSpacefireOpen: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_TrafficNetwork_2'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_TrafficNetwork_2'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentControlRelationOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ControlRelation_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ControlRelation_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -42,7 +42,7 @@ open class RelEquipmentEq2SpControlEquipNetwork : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ControlEquipNetwork'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ControlEquipNetwork'")
     var objectInfo: ArrayList<RelEquipmentEq2SpControlEquipNetwork>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentSensorNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_SensorNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_SensorNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentSs2Eq : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_SensorRelationship_ss2eq'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_SensorRelationship_ss2eq'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentVv2Eq : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ValveRelationship_vv2eq'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ValveRelationship_vv2eq'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentDHWNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_DHWNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_DHWNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentDHWNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_DHWNetwork_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_DHWNetwork_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentDrainingWaterNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_DrainingWaterNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_DrainingWaterNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -46,7 +46,7 @@ open class RelEquipmentDrainingWaterNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_DrainingWaterNetwork_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_DrainingWaterNetwork_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -46,7 +46,7 @@ open class RelEquipmentDrinkingWaterNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_DrinkingWaterNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_DrinkingWaterNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentDrinkingWaterNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_DrinkingWaterNetwork_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_DrinkingWaterNetwork_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentFireVentNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_FireVentNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_FireVentNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentFireWaterNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_FireWaterNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_FireWaterNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentFireWaterNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_FireWaterNetwork_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_FireWaterNetwork_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentGasNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_GasNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_GasNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentGasNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_GasNetwork_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_GasNetwork_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentRecycleWaterNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_RecycleWaterNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_RecycleWaterNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentRecycleWaterNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_RecycleWaterNetwork_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_RecycleWaterNetwork_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentSupplyWaterNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_SupplyWaterNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_SupplyWaterNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentSupplyWaterNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_SupplyWaterNetwork_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_SupplyWaterNetwork_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentHubOrdinary : EquipmentBase(){
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_HUDistribution_1'")
+    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_HUDistribution_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentHubPrepare : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_HUDistribution_2'")
+    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_HUDistribution_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentLubOrdinary : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_LUDistribution_1'")
+    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_LUDistribution_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentLubPrepare : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_LUDistribution_2'")
+    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_LUDistribution_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentRoutinePower : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_EquipPower_1'")
+    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_EquipPower_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentSparePower : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_EquipPower_2'")
+    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_EquipPower_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentSyRoutinePower : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_EquipPower_3'")
+    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_EquipPower_3'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentSySparePower : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_EquipPower_4'")
+    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_EquipPower_4'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -28,8 +28,6 @@ package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
 
 import RelBuilding
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelFloor
-import com.persagy.server.datacenter.models.entities.graphtype.rel.RelShaft
-import com.persagy.server.datacenter.models.entities.graphtype.rel.RelZoneSpace
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table
@@ -45,7 +43,7 @@ open class RelFloorForBd : RelFloor() {
 
     /** 级联-空间 */
     @Schema(description = "级联-建筑")
-    @SCascade(table="relationship.r_fl2bd", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'fl2bd_ArchForArch'" )
+    @SCascade(table="relationship.r_fl2bd", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'fl2bd_ArchForArch'" )
     var objectInfo: ArrayList<RelBuilding>? = null
 
 }

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

@@ -44,7 +44,7 @@ open class RelFloorForFl : RelFloor() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_fl2fl", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'fl2fl_ArchForArch'" )
+    @SCascade(table="relationship.r_fl2fl", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'fl2fl_ArchForArch'" )
     var objectInfo: ArrayList<RelFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelFloorForSp : RelFloor() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_fl2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'fl2sp_ArchForArch'" )
+    @SCascade(table="relationship.r_fl2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'fl2sp_ArchForArch'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

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

@@ -27,12 +27,8 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
 
 import RelBuilding
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import com.persagy.server.datacenter.models.entities.graphtype.rel.RelZoneSpace
 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
 
 /**
@@ -46,7 +42,7 @@ class RelShaftForBd : RelShaftFor() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sh2bd", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sh2bd_ArchForArch'" )
+    @SCascade(table="relationship.r_sh2bd", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sh2bd_ArchForArch'" )
     var objectInfo: ArrayList<RelBuilding>? = null
 
 }

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

@@ -47,7 +47,7 @@ class RelShaftForFl : RelShaftFor() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sh2fl", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sh2fl_ArchForArch'" )
+    @SCascade(table="relationship.r_sh2fl", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sh2fl_ArchForArch'" )
     var objectInfo: ArrayList<RelFloor>? = null
 
 }

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

@@ -42,7 +42,7 @@ class RelShaftForSh : RelShaftFor() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sh2sh", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sh2sh_ArchForArch'" )
+    @SCascade(table="relationship.r_sh2sh", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sh2sh_ArchForArch'" )
     var objectInfo: ArrayList<RelShaft>? = null
 
 }

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

@@ -42,7 +42,7 @@ class RelShaftForSp : RelShaftFor() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sh2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sh2sp_ArchForArch'" )
+    @SCascade(table="relationship.r_sh2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sh2sp_ArchForArch'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelZoneSpaceFor: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_ArchForArch'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_ArchForArch'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

+ 3 - 3
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelZoneSpaceForBd.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import RelBuilding
 import com.persagy.server.datacenter.models.entities.graphtype.rel.SpaceBaseZone
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
@@ -43,7 +43,7 @@ open class RelZoneSpaceForBd: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2bd", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2bd_ArchForArch'" )
-    var objectInfo: ArrayList<RelZoneSpace>? = null
+    @SCascade(table="relationship.r_sp2bd", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2bd_ArchForArch'" )
+    var objectInfo: ArrayList<RelBuilding>? = null
 
 }

+ 3 - 3
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelZoneSpaceForFl.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelFloor
 import com.persagy.server.datacenter.models.entities.graphtype.rel.SpaceBaseZone
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
@@ -43,7 +43,7 @@ open class RelZoneSpaceForFl: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2fl", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2fl_ArchForArch'" )
-    var objectInfo: ArrayList<RelZoneSpace>? = null
+    @SCascade(table="relationship.r_sp2fl", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2fl_ArchForArch'" )
+    var objectInfo: ArrayList<RelFloor>? = null
 
 }

+ 3 - 3
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelZoneSpaceForSh.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelShaft
 import com.persagy.server.datacenter.models.entities.graphtype.rel.SpaceBaseZone
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
@@ -43,7 +43,7 @@ open class RelZoneSpaceForSh: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sh", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sh_ArchForArch'" )
-    var objectInfo: ArrayList<RelZoneSpace>? = null
+    @SCascade(table="relationship.r_sp2sh", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sh_ArchForArch'" )
+    var objectInfo: ArrayList<RelShaft>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentAcAirNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ACAirNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ACAirNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentAcAirNetworkThree  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ACAirNetwork_3'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ACAirNetwork_3'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentAcAirNetworkTwo  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ACAirNetwork_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ACAirNetwork_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentChillWaterLoopFour  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ChillWaterLoop_4'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ChillWaterLoop_4'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentChillWaterLoopOne  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ChillWaterLoop_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ChillWaterLoop_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentChillWaterLoopThree  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ChillWaterLoop_3'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ChillWaterLoop_3'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentChillWaterLoopTwo  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ChillWaterLoop_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ChillWaterLoop_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentCondWaterNetwork  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_CondWaterNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_CondWaterNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -44,7 +44,7 @@ open class RelEquipmentCoolingWaterLoopFour  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_CoolingWaterLoop_4'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_CoolingWaterLoop_4'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 } // Class RelEquipmentCoolingWaterLoopFour

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

@@ -26,7 +26,6 @@
 
 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.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
@@ -44,7 +43,7 @@ open class RelEquipmentCoolingWaterLoopOne  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_cwl1_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_cwl1_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 } // Class RelEquipmentCoolingWaterLoopOne

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

@@ -43,7 +43,7 @@ open class RelEquipmentCoolingWaterLoopThree  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_CoolingWaterLoop_3'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_CoolingWaterLoop_3'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 } // Class RelEquipmentCoolingWaterLoopThree

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

@@ -43,7 +43,7 @@ open class RelEquipmentCoolingWaterLoopTwo  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_CoolingWaterLoop_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_CoolingWaterLoop_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentFreshAirNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eqFreshAirNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eqFreshAirNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -47,7 +47,7 @@ open class RelEquipmentHeatWaterLoopFour  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_HeatWaterLoop_4'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_HeatWaterLoop_4'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 } // Class RelEquipmentHeatWaterLoopFour

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

@@ -43,7 +43,7 @@ open class RelEquipmentHeatWaterLoopOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_HeatWaterLoop_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_HeatWaterLoop_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 } // Class RelEquipmentHeatWaterLoopOne

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

@@ -44,7 +44,7 @@ open class RelEquipmentHeatWaterLoopThree : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_HeatWaterLoop_3'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_HeatWaterLoop_3'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 } // Class RelEquipmentHeatWaterLoopThree

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

@@ -42,7 +42,7 @@ import javax.persistence.Table
 open class RelEquipmentHeatWaterLoopTwo : EquipmentBase() {
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_HeatWaterLoop_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_HeatWaterLoop_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -44,7 +44,7 @@ open class RelEquipmentVentNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_VentNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_VentNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

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

@@ -43,7 +43,7 @@ open class RelEquipmentVentNetworkThree : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_VentNetwork_3'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_VentNetwork_3'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 } // Class RelEquipmentVentNetworkThree

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

@@ -44,7 +44,7 @@ open class RelEquipmentVentNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_VentNetwork_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_VentNetwork_2'")
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 

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

@@ -44,7 +44,7 @@ open class RelEquipmentVrfNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_VRFNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_VRFNetwork_1'")
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 

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

@@ -103,6 +103,11 @@ open class Equipment : BaseInfo() {
     @Column(name = "bim_location")
     var bimLocation: String? = null
 
+    /** 现场发现人 */
+    @Schema(description = "现场发现人")
+    @Column(name = "find_people")
+    var findPeople: String? = null
+
     /** BIM模型中坐标 */
     @Schema(description = "BIM模型中坐标json")
     var locationJson: BIMLocation? = null

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

@@ -136,7 +136,7 @@ open class Floor : BaseInfo() {
 
     /** 贯通关系   self = true  同样的对象查询时 id可以互相调换查询   */
     @Schema(description = "级联-贯通关系")
-    @SCascade(table="r_fl_through_fl", idColumn="floor_id", childIdColumn="floor_other_id", self = true)
+    @SCascade(table="r_fl_through_fl", idColumn="floor_id", childIdColumn="floor_other_id", self = false)
     var floorThroughList: ArrayList<Floor>? = null
 
     /** 模型文件id */

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

@@ -67,7 +67,6 @@ class RBd2Bd : RBaseInfo() {
 
     /** 图类型 */
     @Schema(description = "图类型 " )
-    @Id
     @Column(name = "graph_code")
     var graphCode: String? = null
 

+ 4 - 2
datacenter/src/main/kotlin/com/persagy/server/jms/TopicReceiver.kt

@@ -32,6 +32,8 @@ import com.persagy.server.datacenter.models.jms.SynchronousMessage
 import com.persagy.server.datacenter.models.jms.SynchronousMessageRel
 import com.persagy.service.SObjectService
 import com.persagy.service.utils.SJsonUtil
+import org.springframework.amqp.rabbit.annotation.RabbitHandler
+import org.springframework.amqp.rabbit.annotation.RabbitListener
 import org.springframework.stereotype.Component
 import org.springframework.stereotype.Service
 import java.util.*
@@ -61,8 +63,8 @@ class TopicReceiver {
      *
      * @param
      */
-//    @RabbitListener(queues = ["queue-center-adm"])
-//    @RabbitHandler
+    @RabbitListener(queues = ["queue-center-adm"])
+    @RabbitHandler
     fun receiveMessage(message: String) {
         try {
             println("接收数据中心消息 , $message")

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

@@ -26,7 +26,10 @@
 
 package com.persagy.server.mappers
 
-import org.apache.ibatis.annotations.*
+import org.apache.ibatis.annotations.Mapper
+import org.apache.ibatis.annotations.Param
+import org.apache.ibatis.annotations.SelectProvider
+import org.apache.ibatis.annotations.Update
 import org.springframework.stereotype.Repository
 
 /**
@@ -46,6 +49,10 @@ interface IRelationCountMapper {
     @SelectProvider(type = IRelationCountProvider::class , method = "getSql")
     fun relationCount(@Param("tableName") tableName: String, @Param("projectId") projectId: String): Int
 
+    @SelectProvider(type = IRelationCountProvider::class , method = "getSql")
+    fun relationCountRelType(@Param("tableName") tableName: String, @Param("projectId") projectId: String,@Param("type") type: String): Int
+
+
     /**
      * 更新计算状态
      */

+ 20 - 0
datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationCountProvider.kt

@@ -46,10 +46,30 @@ open class IRelationCountProvider {
             sql.WHERE("project_id = '" + map["projectId"] + "'")
         }
 
+        println("----------------$sql")
+        return sql.toString()
+    }
+
+
+
+    fun getSqlRelType(map: Map<String,String>): String{
+        val sql = SQL()
+        sql.SELECT("count(*)")
+        if(map["tableName"] != null&& map["tableName"] !=""){
+            sql.FROM(map["tableName"])
+        }
+
+        if(map["projectId"] != null&& map["projectId"] !=""){
+            sql.WHERE("project_id = '" + map["projectId"] + "'"+"and"+"type = '"+map["type"]+"'")
+        }
+
+
 
 
         println("----------------$sql")
         return sql.toString()
     }
 
+
+
 } // IRelationCountProvider

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

@@ -227,7 +227,7 @@ interface IRelationExcelExportMapper {
             "       r.id2 AS _id, fl2.name AS _name, fl2.local_id AS _local_id, fl2.local_name AS _local_name, '楼层' AS _object_type\n" +
             "FROM relationship.r_sp2sp r JOIN floor AS fl1 ON r.id1 = fl1.id JOIN floor AS fl2 ON r.id2 = fl2.id\n" +
             "WHERE r.project_id = #{projectId} AND r.type = #{type}")
-    fun fl2fl(projectId: String, type: String): List<HashMap<String, Any?>>
+    fun fl2flthrough(projectId: String, type: String): List<HashMap<String, Any?>>
 
     /**
      * 建筑下的资产
@@ -492,4 +492,95 @@ interface IRelationExcelExportMapper {
     @Select("SELECT id,local_name,local_id,category FROM equipment WHERE project_id = #{projectId} AND building_Id = #{buildingId} and floor_id = #{floorId} AND category = #{category}")
     fun equipPoint(projectId: String,buildingId: String,floorId: String,category: String):List<HashMap<String, Any?>>
 
+    /** 建筑和建筑 */
+    @Select("SELECT r.id1 AS id, b1.name, b1.local_id, b1.local_name, '建筑' AS object_type,r.id2 AS _id, b2.name AS _name, b2.local_id AS _local_id, b2.local_name AS _local_name, '建筑' AS _object_type " +
+            "FROM relationship.r_bd2bd r JOIN building AS b1 ON r.id1 = b1.id JOIN building AS b2 ON r.id2 = b2.id WHERE r.project_id = #{projectId} AND r.type = #{type}")
+    fun bd2bd(projectId: String, type: String): List<HashMap<String, Any?>>
+
+    /** 建筑和楼层 */
+    @Select("SELECT r.id1 AS id, b1.name, b1.local_id, b1.local_name, '建筑' AS object_type,r.id2 AS _id, b2.name AS _name, " +
+            "b2.local_id AS _local_id, b2.local_name AS _local_name, '楼层' AS _object_type,(SELECT local_name FROM building" +
+            " WHERE id = b2.building_id ) AS _building_name FROM relationship.r_bd2fl r JOIN building AS b1 ON r.id1 = b1.id JOIN floor AS b2 " +
+            "ON r.id2 = b2.id WHERE r.project_id = #{projectId} AND r.type = #{type}")
+    fun bd2fl(projectId: String, type: String): List<HashMap<String, Any?>>
+
+    /** 建筑和竖井 */
+    @Select("SELECT r.id1 AS id, b1.name, b1.local_id, b1.local_name, '建筑' AS object_type,r.id2 AS _id, b2.name AS _name, b2.local_id AS _local_id, " +
+            "b2.local_name AS _local_name, '竖井' AS _object_type FROM relationship.r_bd2sh r JOIN building AS b1 ON r.id1 = b1.id JOIN shaft AS b2 ON r.id2 = b2.id WHERE r.project_id = #{projectId} AND r.type = #{type}")
+    fun bd2sh(projectId: String, type: String): List<HashMap<String, Any?>>
+
+
+    /** 建筑和空间 */
+    @Select("SELECT r.id1 AS id, b1.name, b1.local_id, b1.local_name, '建筑' AS object_type,r.id2 AS _id, b2.name AS _name," +
+            " b2.local_id AS _local_id, b2.local_name AS _local_name, '空间' AS _object_type,(SELECT local_name FROM building WHERE id = b2.building_id ) AS _building_name," +
+            "(SELECT local_name FROM floor WHERE id = b2.floor_id) AS _floor_name FROM relationship.r_bd2sp r JOIN building AS b1 ON r.id1 = b1.id JOIN zone_space_base AS b2 ON r.id2 = b2.id WHERE r.project_id = #{projectId} AND r.type = #{type}")
+    fun bd2sp(projectId: String, type: String): List<HashMap<String, Any?>>
+
+
+    /** 楼层和楼层 */
+    @Select("SELECT r.id1 AS id, b1.name, b1.local_id, b1.local_name, '楼层' AS object_type,(SELECT local_name FROM building WHERE id = b1.building_id ) AS building_name," +
+            "r.id2 AS _id, b2.name AS _name, b2.local_id AS _local_id, b2.local_name AS _local_name, '楼层' AS _object_type,(SELECT local_name FROM building WHERE id = b2.building_id ) AS _building_name" +
+            " FROM relationship.r_fl2fl r JOIN floor AS b1 ON r.id1 = b1.id JOIN floor AS b2 ON r.id2 = b2.id WHERE r.project_id = #{projectId} AND r.type = #{type}")
+    fun fl2fl(projectId: String, type: String): List<HashMap<String, Any?>>
+
+    /** 楼层和建筑 */
+    @Select("SELECT r.id1 AS id, b1.name, b1.local_id, b1.local_name, '楼层' AS object_type,(SELECT local_name FROM building WHERE id = b1.building_id ) AS building_name," +
+            "r.id2 AS _id, b2.name AS _name, b2.local_id AS _local_id, b2.local_name AS _local_name, '建筑' AS _object_type FROM relationship.r_fl2bd r JOIN floor AS b1 ON r.id1 = b1.id " +
+            "JOIN building AS b2 ON r.id2 = b2.id WHERE r.project_id = #{projectId} AND r.type = #{type}")
+    fun fl2bd(projectId: String, type: String): List<HashMap<String, Any?>>
+
+    /** 楼层和竖井 */
+    @Select("SELECT r.id1 AS id, b1.name, b1.local_id, b1.local_name, '楼层' AS object_type,(SELECT local_name FROM building WHERE id = b1.building_id ) AS building_name," +
+            "r.id2 AS _id, b2.name AS _name, b2.local_id AS _local_id, b2.local_name AS _local_name, '建筑' AS _object_type FROM relationship.r_fl2sh r JOIN floor AS b1 ON r.id1 = b1.id " +
+            "JOIN shaft AS b2 ON r.id2 = b2.id WHERE r.project_id = #{projectId} AND r.type = #{type}")
+    fun fl2sh(projectId: String, type: String): List<HashMap<String, Any?>>
+
+    /** 楼层和空间 */
+    @Select("SELECT r.id1 AS id, b1.name, b1.local_id, b1.local_name, '楼层' AS object_type,(SELECT local_name FROM building WHERE id = b1.building_id ) AS building_name,r.id2 AS _id, " +
+            "b2.name AS _name, b2.local_id AS _local_id, b2.local_name AS _local_name, '空间' AS _object_type,(SELECT local_name FROM building WHERE id = b2.building_id ) AS _building_name," +
+            "(SELECT local_name FROM floor WHERE id = b2.floor_id) AS _floor_name FROM relationship.r_fl2sp r JOIN floor AS b1 ON r.id1 = b1.id JOIN zone_space_base AS b2 ON r.id2 = b2.id WHERE r.project_id = #{projectId} AND r.type = #{type}")
+    fun fl2sp(projectId: String, type: String): List<HashMap<String, Any?>>
+
+    /** 竖井和建筑 */
+    @Select("SELECT r.id1 AS id, b1.name, b1.local_id, b1.local_name, '竖井' AS object_type,r.id2 AS _id, b2.name AS _name, b2.local_id AS _local_id, b2.local_name AS _local_name, '建筑' AS _object_type " +
+            "FROM relationship.r_sh2bd r JOIN shaft AS b1 ON r.id1 = b1.id JOIN building AS b2 ON r.id2 = b2.id WHERE r.project_id =  #{projectId} AND r.type = #{type}")
+    fun sh2bdArchForArch(projectId: String, type: String): List<HashMap<String, Any?>>
+
+    /** 竖井和楼层 */
+    @Select("SELECT r.id1 AS id, b1.name, b1.local_id, b1.local_name, '竖井' AS object_type,r.id2 AS _id, b2.name AS _name, b2.local_id AS _local_id, b2.local_name AS _local_name, '楼层'" +
+            " AS _object_type,(SELECT local_name FROM building WHERE id = b2.building_id ) AS _building_name FROM relationship.r_sh2fl r JOIN shaft AS b1 ON r.id1 = b1.id JOIN floor AS b2 ON r.id2 = b2.id " +
+            "WHERE r.project_id = #{projectId} AND r.type = #{type}")
+    fun sh2flArchForArch(projectId: String, type: String): List<HashMap<String, Any?>>
+
+    /** 竖井和竖井 */
+    @Select("SELECT r.id1 AS id, b1.name, b1.local_id, b1.local_name, '竖井' AS object_type,r.id2 AS _id, b2.name AS _name, b2.local_id AS _local_id, b2.local_name AS _local_name, '竖井' AS _object_type " +
+            "FROM relationship.r_sh2sh r JOIN shaft AS b1 ON r.id1 = b1.id JOIN shaft AS b2 ON r.id2 = b2.id WHERE r.project_id =  #{projectId} AND r.type = #{type}")
+    fun sh2shArchForArch(projectId: String, type: String): List<HashMap<String, Any?>>
+
+    /** 竖井和空间 */
+    @Select("SELECT r.id1 AS id, b1.name, b1.local_id, b1.local_name, '竖井' AS object_type,r.id2 AS _id, b2.name AS _name, b2.local_id AS _local_id, b2.local_name AS _local_name, '空间' AS _object_type" +
+            ",(SELECT local_name FROM building WHERE id = b2.building_id ) AS _building_name,(SELECT local_name FROM floor WHERE id = b2.floor_id) AS _floor_name FROM relationship.r_sh2sp r JOIN shaft AS b1 ON r.id1 = b1.id" +
+            " JOIN zone_space_base AS b2 ON r.id2 = b2.id WHERE r.project_id = #{projectId} AND r.type = #{type}")
+    fun sh2spArchForArch(projectId: String, type: String): List<HashMap<String, Any?>>
+
+    /** 空间和建筑 */
+    @Select("SELECT r.id1 AS id, b1.name, b1.local_id, b1.local_name, '空间' AS object_type,(SELECT local_name FROM building WHERE id = b1.building_id ) AS building_name ," +
+            "(SELECT local_name FROM floor WHERE id = b1.floor_id) AS floor_name,r.id2 AS _id, b2.name AS _name, b2.local_id AS _local_id, b2.local_name AS _local_name, '空间' AS _object_type " +
+            "FROM relationship.r_sp2bd r JOIN zone_space_base AS b1 ON r.id1 = b1.id JOIN building AS b2 ON r.id2 = b2.id WHERE r.project_id = #{projectId} AND r.type = #{type}")
+    fun sp2bdArchForArch(projectId: String, type: String): List<HashMap<String, Any?>>
+
+    /** 空间和楼层 */
+    @Select("SELECT r.id1 AS id, b1.name, b1.local_id, b1.local_name, '空间' AS object_type,(SELECT local_name FROM building WHERE id = b1.building_id ) AS building_name ," +
+            "(SELECT local_name FROM floor WHERE id = b1.floor_id) AS floor_name,r.id2 AS _id, b2.name AS _name, b2.local_id AS _local_id, b2.local_name AS _local_name, '楼层' AS _object_type," +
+            "(SELECT local_name FROM building WHERE id = b2.building_id ) AS _building_name FROM relationship.r_sp2fl r JOIN zone_space_base AS b1 ON r.id1 = b1.id JOIN floor AS b2 ON r.id2 = b2.id WHERE" +
+            " r.project_id = #{projectId} AND r.type = #{type}")
+    fun sp2flArchForArch(projectId: String, type: String): List<HashMap<String, Any?>>
+
+    /** 空间和竖井 */
+    @Select("SELECT r.id1 AS id, b1.name, b1.local_id, b1.local_name, '空间' AS object_type,(SELECT local_name FROM building WHERE id = b1.building_id ) AS building_name ," +
+            "(SELECT local_name FROM floor WHERE id = b1.floor_id) AS floor_name,r.id2 AS _id, b2.name AS _name, b2.local_id AS _local_id, b2.local_name AS _local_name, '竖井' AS _object_type " +
+            "FROM relationship.r_sp2sh r JOIN zone_space_base AS b1 ON r.id1 = b1.id JOIN shaft AS b2 ON r.id2 = b2.id WHERE r.project_id = #{projectId} AND r.type = #{type}")
+    fun sp2sh(projectId: String, type: String): List<HashMap<String, Any?>>
+
+
 } // Interface IRelationExcelExportMapper

+ 3 - 3
datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationExcelImportMapper.kt

@@ -112,7 +112,7 @@ interface IRelationExcelImportMapper {
      * @param   id2             竖井ID
      * @return  excel需要的记录
      */
-    @Insert("INSERT INTO relationship.r_eq2sh(project_id, eq_id, sh_id, type, sign) VALUES(#{projectId}, #{id1}, #{id2}, #{type}, 1)")
+    @Insert("INSERT INTO r_eq_for_sh(project_id, equip_id, shaft_id, type, sign) VALUES(#{projectId}, #{id1}, #{id2}, #{type}, 1)")
     fun eq2sh(projectId: String, type: String, id1: String, id2: String)
 
     /**
@@ -424,7 +424,7 @@ interface IRelationExcelImportMapper {
      * @param   id2             空间ID
      * @return  excel需要的记录
      */
-    @Insert("INSERT INTO relationship.r_fl2bd(project_id, id1, id2, type, sign, zone_type) VALUES(#{projectId}, #{id1}, #{id2}, #{type}, 1,#{zoneType})")
+    @Insert("INSERT INTO relationship.r_fl2bd(project_id, id1, id2, type, sign) VALUES(#{projectId}, #{id1}, #{id2}, #{type}, 1)")
     fun fl2bd(projectId: String, type: String, id1: String, id2: String)
 
     /**
@@ -436,7 +436,7 @@ interface IRelationExcelImportMapper {
      * @param   id2             空间ID
      * @return  excel需要的记录
      */
-    @Insert("INSERT INTO relationship.r_fl2sh(project_id, id1, id2, type, sign, zone_type) VALUES(#{projectId}, #{id1}, #{id2}, #{type}, 1,#{zoneType})")
+    @Insert("INSERT INTO relationship.r_fl2sh(project_id, id1, id2, type, sign) VALUES(#{projectId}, #{id1}, #{id2}, #{type}, 1)")
     fun fl2sh(projectId: String, type: String, id1: String, id2: String)
 
     /**

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

@@ -201,6 +201,11 @@ open class GraphicTypeMapperService {
                                 execEquip.tableName = "v_equipment"
                                 val exec = execEquip.exec()
                                 count += exec.size
+                            }else if (!n.isNullOrEmpty()){
+                                if (!relationTypeProject.relationType.isNullOrEmpty()) {
+                                    count += mapper.relationCountRelType(n, projectId,relationTypeProject.relationType!!)
+                                }
+
                             }
                         }
 //                        for(n in names){

+ 20 - 2
datacenter/src/main/kotlin/com/persagy/server/services/graphtype/RelationTypeProjectService.kt

@@ -227,10 +227,28 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
                 logger.debug("type= **************************************************************************************")
                 val exportMethod = excelExport.javaClass.getDeclaredMethod("${relType}", String::class.java)
                 exportMethod!!.invoke(excelExport, projectId) as List<HashMap<String, Any?>>
-            } else {
+            } else
+//                if (cmd == "bd2bd"){
+//                val exportMethod = excelExport.javaClass.getDeclaredMethod(cmd, String::class.java, String::class.java)
+//                exportMethod!!.invoke(excelExport, projectId, type) as List<HashMap<String, Any?>>
+//            }else
+            {
                 if (relType == "eq2sp_SensorRelationship_ss2sp"){
                     cmd = "eq2spIn"
+                }else if (relType == "sh2bd_ArchForArch") {
+                    cmd = "sh2bdArchForArch"
+                }else if (relType == "sh2fl_ArchForArch"){
+                    cmd = "sh2flArchForArch"
+                }else if (relType == "sh2sh_ArchForArch"){
+                    cmd = "sh2shArchForArch"
+                }else if (relType == "sh2sp_ArchForArch"){
+                    cmd = "sh2spArchForArch"
+                }else if (relType == "sp2bd_ArchForArch"){
+                    cmd = "sp2bdArchForArch"
+                }else if (relType == "sp2fl_ArchForArch"){
+                    cmd = "sp2flArchForArch"
                 }
+
                 if(zoneType.isNullOrEmpty()) {
                     val exportMethod = excelExport.javaClass.getDeclaredMethod(cmd, String::class.java, String::class.java)
                     exportMethod!!.invoke(excelExport, projectId, type) as List<HashMap<String, Any?>>
@@ -470,7 +488,7 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
                 if (id1.isEmpty() || id2.isEmpty()) {
                     return
                 }
-                    if (cmd == "sp2sp"||cmd == "bd2sp"){
+                    if (cmd == "sp2sp"||cmd == "bd2sp"||cmd == "fl2sp"||cmd == "sh2sp"){
                         val space = spaceService.select(SFilter.eq("id", id2)).entity()
                         zoneType =  space!!.classCode
                     }else if (cmd == "sp2bd"||cmd == "sp2fl"||cmd == "sp2sh") {

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

@@ -117,6 +117,9 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                 equip.name = ShaftNameUtil.shaftName("设备-")
             }
         }
+        if (!Opt.account.isNullOrEmpty()){
+            equip.findPeople = Opt.account
+        }
         equip.codeType = 1
         return true
     } // Function onCreateBefore()

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

@@ -156,6 +156,8 @@ open class CalcSpecialService {
                         return SBaseResponse(SResponseType.success)
                     }
                 }
+                entity.computingTime = IdUtils.time()
+                relationTypeProjectservice.update(entity)
             }
             upDate(projectId,relationType)
             return SBaseResponse(SResponseType.success)

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

@@ -199,7 +199,7 @@ class ManualRelationAddService {
             val relationTypeProjectService = SObjectService(SMybatisDao(RelationTypeProject::class.java))
             val relationType = relationTypeProjectService.select(
                 SFilter.eq("projectId", projectId!!),
-                SFilter.eq("RelationType", relationAddRequest.relType!!)).entity()
+                SFilter.eq("relationType", relationAddRequest.relType!!)).entity()
             if (relationType!=null){
                 relationType.computingTime = time()
                 relationTypeProjectService.update(relationType)
@@ -2474,6 +2474,7 @@ class ManualRelationAddService {
                         rSh2Sp.zoneType = spaceTo.classCode
                         rSh2SpService.replace(rSh2Sp)
                     }
+
                 }
             }else if(relationAddRequest.relType == "sp2bd_ArchForArch" ||relationAddRequest.relType == "sp2fl_ArchForArch"
                     ||relationAddRequest.relType == "sp2sh_ArchForArch"||relationAddRequest.relType == "sp2sp_ArchForArch") {
@@ -2569,7 +2570,7 @@ class ManualRelationAddService {
                         rSp2Bd.zoneType = zoneSpaceList[0].classCode
                         rSp2BdService.replace(rSp2Bd)
                     }
-                }else if (relationAddRequest.relType == "sp2fl_ArchForArchSp2Fl") {
+                }else if (relationAddRequest.relType == "sp2fl_ArchForArch") {
                     for (fromContent in relationAddRequest.fromContent!!){
                         /** 去除主对象空间id */
                         val floorToList = FloorService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent)).exec()

+ 117 - 110
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationCalcService.kt

@@ -3809,13 +3809,15 @@ open class ManualRelationCalcService {
 
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         if (rSp2SpList.size>0) {
+            val listSF = ArrayList<SFilter>()
             if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
             }
             if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
             }
-            val rSp2SpTwoList = CommonServices.rSp2SpTwoService.select(list).exec()
+            listSF.add(SFilter.eq("projectId", projectId))
+            val rSp2SpTwoList = CommonServices.rSp2SpTwoService.select(listSF).exec()
             if (rSp2SpTwoList.size>0) {
 
                 val listId1 = ArrayList<String>()
@@ -3825,11 +3827,9 @@ open class ManualRelationCalcService {
                     listId2.add(rSp2SpTwo.id2!!)
                 }
                 val sCascadeQuery = sQueryRequest.cascade!!.get(0)
-                val listSF = ArrayList<SFilter>()
                 sCascadeQuery.filters = "id in ${listId2.toJson()}"
-                listSF.add(SFilter.inList("id",listId1.toList()))
-                listSF.add(SFilter.eq("projectId", projectId))
-                val pageQuery = CommonServices.relZoneSpaceForService.pageQuery(sQueryRequest, listSF)
+                list.add(SFilter.inList("id",listId1.toList()))
+                val pageQuery = CommonServices.relZoneSpaceForService.pageQuery(sQueryRequest, list)
                 manualRelationCalcResponse.direction = "Left"
                 manualRelationCalcResponse.content = pageQuery.content
                 manualRelationCalcResponse.message = pageQuery.message
@@ -3856,13 +3856,15 @@ open class ManualRelationCalcService {
         val rSp2SpList = CommonServices.rSp2ShService.select(SFilter.eq("projectId", projectId), SFilter.eq("type", manualRelationCalcRequest.relType!!)).exec()
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         if (rSp2SpList.size>0) {
+            val listSF = ArrayList<SFilter>()
             if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
             }
             if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
             }
-            val rSp2SpTwoList = CommonServices.rSp2ShTwoService.select(list).exec()
+            listSF.add(SFilter.eq("projectId", projectId))
+            val rSp2SpTwoList = CommonServices.rSp2ShTwoService.select(listSF).exec()
             if (rSp2SpTwoList.size>0) {
 
                 val listId1 = ArrayList<String>()
@@ -3874,9 +3876,9 @@ open class ManualRelationCalcService {
                 val sCascadeQuery = sQueryRequest.cascade!!.get(0)
                 val listSF = ArrayList<SFilter>()
                 sCascadeQuery.filters = "id in ${listId2.toJson()}"
-                listSF.add(SFilter.inList("id",listId1.toList()))
-                listSF.add(SFilter.eq("projectId", projectId))
-                val pageQuery = CommonServices.relZoneSpaceForShService.pageQuery(sQueryRequest, listSF)
+                list.add(SFilter.inList("id",listId1.toList()))
+//                listSF.add(SFilter.eq("projectId", projectId))
+                val pageQuery = CommonServices.relZoneSpaceForShService.pageQuery(sQueryRequest, list)
                 manualRelationCalcResponse.direction = "Left"
                 manualRelationCalcResponse.content = pageQuery.content
                 manualRelationCalcResponse.message = pageQuery.message
@@ -3903,13 +3905,15 @@ open class ManualRelationCalcService {
         val rSp2SpList = CommonServices.rSp2FlService.select(SFilter.eq("projectId", projectId), SFilter.eq("type", manualRelationCalcRequest.relType!!)).exec()
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         if (rSp2SpList.size>0) {
+            val listSF = ArrayList<SFilter>()
             if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
             }
             if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
             }
-            val rSp2SpTwoList = CommonServices.rSp2FlTwoService.select(list).exec()
+            listSF.add(SFilter.eq("projectId", projectId))
+            val rSp2SpTwoList = CommonServices.rSp2FlTwoService.select(listSF).exec()
             if (rSp2SpTwoList.size>0) {
 
                 val listId1 = ArrayList<String>()
@@ -3919,11 +3923,10 @@ open class ManualRelationCalcService {
                     listId2.add(rSp2SpTwo.id2!!)
                 }
                 val sCascadeQuery = sQueryRequest.cascade!!.get(0)
-                val listSF = ArrayList<SFilter>()
                 sCascadeQuery.filters = "id in ${listId2.toJson()}"
-                listSF.add(SFilter.inList("id",listId1.toList()))
-                listSF.add(SFilter.eq("projectId", projectId))
-                val pageQuery = CommonServices.relZoneSpaceForFlService.pageQuery(sQueryRequest, listSF)
+                list.add(SFilter.inList("id",listId1.toList()))
+
+                val pageQuery = CommonServices.relZoneSpaceForFlService.pageQuery(sQueryRequest, list)
                 manualRelationCalcResponse.direction = "Left"
                 manualRelationCalcResponse.content = pageQuery.content
                 manualRelationCalcResponse.message = pageQuery.message
@@ -3950,13 +3953,15 @@ open class ManualRelationCalcService {
         val rSp2SpList = CommonServices.rSp2BdService.select(SFilter.eq("projectId", projectId), SFilter.eq("type", manualRelationCalcRequest.relType!!)).exec()
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         if (rSp2SpList.size>0) {
+            val listSF = ArrayList<SFilter>()
             if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
             }
             if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
             }
-            val rSp2SpTwoList = CommonServices.rSp2BdTwoService.select(list).exec()
+            listSF.add(SFilter.eq("projectId", projectId))
+            val rSp2SpTwoList = CommonServices.rSp2BdTwoService.select(listSF).exec()
             if (rSp2SpTwoList.size>0) {
 
                 val listId1 = ArrayList<String>()
@@ -3966,11 +3971,10 @@ open class ManualRelationCalcService {
                     listId2.add(rSp2SpTwo.id2!!)
                 }
                 val sCascadeQuery = sQueryRequest.cascade!!.get(0)
-                val listSF = ArrayList<SFilter>()
+
                 sCascadeQuery.filters = "id in ${listId2.toJson()}"
-                listSF.add(SFilter.inList("id",listId1.toList()))
-                listSF.add(SFilter.eq("projectId", projectId))
-                val pageQuery = CommonServices.relZoneSpaceForBdService.pageQuery(sQueryRequest, listSF)
+                list.add(SFilter.inList("id",listId1.toList()))
+                val pageQuery = CommonServices.relZoneSpaceForBdService.pageQuery(sQueryRequest, list)
                 manualRelationCalcResponse.direction = "Left"
                 manualRelationCalcResponse.content = pageQuery.content
                 manualRelationCalcResponse.message = pageQuery.message
@@ -3998,13 +4002,15 @@ open class ManualRelationCalcService {
 
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         if (rSh2SpList.size>0) {
+            val listSF = ArrayList<SFilter>()
             if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
             }
             if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
             }
-            val rSp2SpTwoList = CommonServices.rSh2SpTwoService.select(list).exec()
+            listSF.add(SFilter.eq("projectId", projectId))
+            val rSp2SpTwoList = CommonServices.rSh2SpTwoService.select(listSF).exec()
             if (rSp2SpTwoList.size>0) {
 
                 val listId1 = ArrayList<String>()
@@ -4014,11 +4020,9 @@ open class ManualRelationCalcService {
                     listId2.add(rSp2SpTwo.id2!!)
                 }
                 val sCascadeQuery = sQueryRequest.cascade!!.get(0)
-                val listSF = ArrayList<SFilter>()
                 sCascadeQuery.filters = "id in ${listId2.toJson()}"
-                listSF.add(SFilter.inList("id",listId1.toList()))
-                listSF.add(SFilter.eq("projectId", projectId))
-                val pageQuery = CommonServices.relShaftForSpService.pageQuery(sQueryRequest, listSF)
+                list.add(SFilter.inList("id",listId1.toList()))
+                val pageQuery = CommonServices.relShaftForSpService.pageQuery(sQueryRequest, list)
                 manualRelationCalcResponse.direction = "Left"
                 manualRelationCalcResponse.content = pageQuery.content
                 manualRelationCalcResponse.message = pageQuery.message
@@ -4046,13 +4050,15 @@ open class ManualRelationCalcService {
 
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         if (rSh2ShList.size>0) {
+            val listSF = ArrayList<SFilter>()
             if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
             }
             if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
             }
-            val rSp2SpTwoList = CommonServices.rSh2ShTwoService.select(list).exec()
+            listSF.add(SFilter.eq("projectId", projectId))
+            val rSp2SpTwoList = CommonServices.rSh2ShTwoService.select(listSF).exec()
             if (rSp2SpTwoList.size>0) {
 
                 val listId1 = ArrayList<String>()
@@ -4062,11 +4068,10 @@ open class ManualRelationCalcService {
                     listId2.add(rSp2SpTwo.id2!!)
                 }
                 val sCascadeQuery = sQueryRequest.cascade!!.get(0)
-                val listSF = ArrayList<SFilter>()
+
                 sCascadeQuery.filters = "id in ${listId2.toJson()}"
-                listSF.add(SFilter.inList("id",listId1.toList()))
-                listSF.add(SFilter.eq("projectId", projectId))
-                val pageQuery = CommonServices.relShaftForShService.pageQuery(sQueryRequest, listSF)
+                list.add(SFilter.inList("id",listId1.toList()))
+                val pageQuery = CommonServices.relShaftForShService.pageQuery(sQueryRequest, list)
                 manualRelationCalcResponse.direction = "Left"
                 manualRelationCalcResponse.content = pageQuery.content
                 manualRelationCalcResponse.message = pageQuery.message
@@ -4094,13 +4099,15 @@ open class ManualRelationCalcService {
 
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         if (rSh2FlList.size>0) {
+            val listSF = ArrayList<SFilter>()
             if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
             }
             if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
             }
-            val rSp2SpTwoList = CommonServices.rSh2FlTwoService.select(list).exec()
+            listSF.add(SFilter.eq("projectId", projectId))
+            val rSp2SpTwoList = CommonServices.rSh2FlTwoService.select(listSF).exec()
             if (rSp2SpTwoList.size>0) {
 
                 val listId1 = ArrayList<String>()
@@ -4110,11 +4117,9 @@ open class ManualRelationCalcService {
                     listId2.add(rSp2SpTwo.id2!!)
                 }
                 val sCascadeQuery = sQueryRequest.cascade!!.get(0)
-                val listSF = ArrayList<SFilter>()
                 sCascadeQuery.filters = "id in ${listId2.toJson()}"
-                listSF.add(SFilter.inList("id",listId1.toList()))
-                listSF.add(SFilter.eq("projectId", projectId))
-                val pageQuery = CommonServices.relShaftForFlService.pageQuery(sQueryRequest, listSF)
+                list.add(SFilter.inList("id",listId1.toList()))
+                val pageQuery = CommonServices.relShaftForFlService.pageQuery(sQueryRequest, list)
                 manualRelationCalcResponse.direction = "Left"
                 manualRelationCalcResponse.content = pageQuery.content
                 manualRelationCalcResponse.message = pageQuery.message
@@ -4142,13 +4147,15 @@ open class ManualRelationCalcService {
 
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         if (rSh2BdList.size>0) {
+            val listSF = ArrayList<SFilter>()
             if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
             }
             if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
             }
-            val rSp2SpTwoList = CommonServices.rSh2BdTwoService.select(list).exec()
+            listSF.add(SFilter.eq("projectId", projectId))
+            val rSp2SpTwoList = CommonServices.rSh2BdTwoService.select(listSF).exec()
             if (rSp2SpTwoList.size>0) {
 
                 val listId1 = ArrayList<String>()
@@ -4158,11 +4165,9 @@ open class ManualRelationCalcService {
                     listId2.add(rSp2SpTwo.id2!!)
                 }
                 val sCascadeQuery = sQueryRequest.cascade!!.get(0)
-                val listSF = ArrayList<SFilter>()
                 sCascadeQuery.filters = "id in ${listId2.toJson()}"
-                listSF.add(SFilter.inList("id",listId1.toList()))
-                listSF.add(SFilter.eq("projectId", projectId))
-                val pageQuery = CommonServices.relShaftForBdService.pageQuery(sQueryRequest, listSF)
+                list.add(SFilter.inList("id",listId1.toList()))
+                val pageQuery = CommonServices.relShaftForBdService.pageQuery(sQueryRequest, list)
                 manualRelationCalcResponse.direction = "Left"
                 manualRelationCalcResponse.content = pageQuery.content
                 manualRelationCalcResponse.message = pageQuery.message
@@ -4190,12 +4195,14 @@ open class ManualRelationCalcService {
 
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         if (rFl2SpList.size>0) {
+            val listSF = ArrayList<SFilter>()
             if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
             }
             if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
             }
+            listSF.add(SFilter.eq("projectId", projectId))
             val rSp2SpTwoList = CommonServices.rFl2SpTwoService.select(list).exec()
             if (rSp2SpTwoList.size>0) {
 
@@ -4206,11 +4213,10 @@ open class ManualRelationCalcService {
                     listId2.add(rSp2SpTwo.id2!!)
                 }
                 val sCascadeQuery = sQueryRequest.cascade!!.get(0)
-                val listSF = ArrayList<SFilter>()
+
                 sCascadeQuery.filters = "id in ${listId2.toJson()}"
-                listSF.add(SFilter.inList("id",listId1.toList()))
-                listSF.add(SFilter.eq("projectId", projectId))
-                val pageQuery = CommonServices.relFloorForSpService.pageQuery(sQueryRequest, listSF)
+                list.add(SFilter.inList("id",listId1.toList()))
+                val pageQuery = CommonServices.relFloorForSpService.pageQuery(sQueryRequest, list)
                 manualRelationCalcResponse.direction = "Left"
                 manualRelationCalcResponse.content = pageQuery.content
                 manualRelationCalcResponse.message = pageQuery.message
@@ -4238,13 +4244,15 @@ open class ManualRelationCalcService {
 
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         if (rFl2ShList.size>0) {
+            val listSF = ArrayList<SFilter>()
             if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
             }
             if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
             }
-            val rSp2SpTwoList = CommonServices.rFl2ShTwoService.select(list).exec()
+            listSF.add(SFilter.eq("projectId", projectId))
+            val rSp2SpTwoList = CommonServices.rFl2ShTwoService.select(listSF).exec()
             if (rSp2SpTwoList.size>0) {
 
                 val listId1 = ArrayList<String>()
@@ -4254,11 +4262,9 @@ open class ManualRelationCalcService {
                     listId2.add(rSp2SpTwo.id2!!)
                 }
                 val sCascadeQuery = sQueryRequest.cascade!!.get(0)
-                val listSF = ArrayList<SFilter>()
                 sCascadeQuery.filters = "id in ${listId2.toJson()}"
-                listSF.add(SFilter.inList("id",listId1.toList()))
-                listSF.add(SFilter.eq("projectId", projectId))
-                val pageQuery = CommonServices.relFloorForShService.pageQuery(sQueryRequest, listSF)
+                list.add(SFilter.inList("id",listId1.toList()))
+                val pageQuery = CommonServices.relFloorForShService.pageQuery(sQueryRequest, list)
                 manualRelationCalcResponse.direction = "Left"
                 manualRelationCalcResponse.content = pageQuery.content
                 manualRelationCalcResponse.message = pageQuery.message
@@ -4286,13 +4292,15 @@ open class ManualRelationCalcService {
 
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         if (rFl2ShList.size>0) {
+            val listSF = ArrayList<SFilter>()
             if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
             }
             if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
             }
-            val rSp2SpTwoList = CommonServices.rFl2FlTwoService.select(list).exec()
+            listSF.add(SFilter.eq("projectId", projectId))
+            val rSp2SpTwoList = CommonServices.rFl2FlTwoService.select(listSF).exec()
             if (rSp2SpTwoList.size>0) {
 
                 val listId1 = ArrayList<String>()
@@ -4304,9 +4312,8 @@ open class ManualRelationCalcService {
                 val sCascadeQuery = sQueryRequest.cascade!!.get(0)
                 val listSF = ArrayList<SFilter>()
                 sCascadeQuery.filters = "id in ${listId2.toJson()}"
-                listSF.add(SFilter.inList("id",listId1.toList()))
-                listSF.add(SFilter.eq("projectId", projectId))
-                val pageQuery = CommonServices.relFloorForFlService.pageQuery(sQueryRequest, listSF)
+                list.add(SFilter.inList("id",listId1.toList()))
+                val pageQuery = CommonServices.relFloorForFlService.pageQuery(sQueryRequest, list)
                 manualRelationCalcResponse.direction = "Left"
                 manualRelationCalcResponse.content = pageQuery.content
                 manualRelationCalcResponse.message = pageQuery.message
@@ -4334,13 +4341,15 @@ open class ManualRelationCalcService {
 
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         if (rFl2ShList.size>0) {
+            val listSF = ArrayList<SFilter>()
             if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
             }
             if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
             }
-            val rSp2SpTwoList = CommonServices.rFl2BdTwoService.select(list).exec()
+            listSF.add(SFilter.eq("projectId", projectId))
+            val rSp2SpTwoList = CommonServices.rFl2BdTwoService.select(listSF).exec()
             if (rSp2SpTwoList.size>0) {
 
                 val listId1 = ArrayList<String>()
@@ -4350,11 +4359,10 @@ open class ManualRelationCalcService {
                     listId2.add(rSp2SpTwo.id2!!)
                 }
                 val sCascadeQuery = sQueryRequest.cascade!!.get(0)
-                val listSF = ArrayList<SFilter>()
+
                 sCascadeQuery.filters = "id in ${listId2.toJson()}"
-                listSF.add(SFilter.inList("id",listId1.toList()))
-                listSF.add(SFilter.eq("projectId", projectId))
-                val pageQuery = CommonServices.relFloorForBdService.pageQuery(sQueryRequest, listSF)
+                list.add(SFilter.inList("id",listId1.toList()))
+                val pageQuery = CommonServices.relFloorForBdService.pageQuery(sQueryRequest, list)
                 manualRelationCalcResponse.direction = "Left"
                 manualRelationCalcResponse.content = pageQuery.content
                 manualRelationCalcResponse.message = pageQuery.message
@@ -4382,15 +4390,16 @@ open class ManualRelationCalcService {
 
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         if (rBd2SpList.size>0) {
+            val listSF = ArrayList<SFilter>()
             if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
             }
             if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
             }
-            val rSp2SpTwoList = CommonServices.rBd2SpTwoService.select(list).exec()
+            listSF.add(SFilter.eq("projectId", projectId))
+            val rSp2SpTwoList = CommonServices.rBd2SpTwoService.select(listSF).exec()
             if (rSp2SpTwoList.size>0) {
-
                 val listId1 = ArrayList<String>()
                 val listId2 = ArrayList<String>()
                 for (rSp2SpTwo in rSp2SpTwoList){
@@ -4398,11 +4407,9 @@ open class ManualRelationCalcService {
                     listId2.add(rSp2SpTwo.id2!!)
                 }
                 val sCascadeQuery = sQueryRequest.cascade!!.get(0)
-                val listSF = ArrayList<SFilter>()
                 sCascadeQuery.filters = "id in ${listId2.toJson()}"
-                listSF.add(SFilter.inList("id",listId1.toList()))
-                listSF.add(SFilter.eq("projectId", projectId))
-                val pageQuery = CommonServices.relBuildingForSpService.pageQuery(sQueryRequest, listSF)
+                list.add(SFilter.inList("id",listId1.toList()))
+                val pageQuery = CommonServices.relBuildingForSpService.pageQuery(sQueryRequest, list)
                 manualRelationCalcResponse.direction = "Left"
                 manualRelationCalcResponse.content = pageQuery.content
                 manualRelationCalcResponse.message = pageQuery.message
@@ -4430,13 +4437,15 @@ open class ManualRelationCalcService {
 
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         if (rBd2ShList.size>0) {
+            val listSF = ArrayList<SFilter>()
             if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
             }
             if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
             }
-            val rSp2SpTwoList = CommonServices.rBd2ShTwoService.select(list).exec()
+            listSF.add(SFilter.eq("projectId", projectId))
+            val rSp2SpTwoList = CommonServices.rBd2ShTwoService.select(listSF).exec()
             if (rSp2SpTwoList.size>0) {
 
                 val listId1 = ArrayList<String>()
@@ -4446,11 +4455,9 @@ open class ManualRelationCalcService {
                     listId2.add(rSp2SpTwo.id2!!)
                 }
                 val sCascadeQuery = sQueryRequest.cascade!!.get(0)
-                val listSF = ArrayList<SFilter>()
                 sCascadeQuery.filters = "id in ${listId2.toJson()}"
-                listSF.add(SFilter.inList("id",listId1.toList()))
-                listSF.add(SFilter.eq("projectId", projectId))
-                val pageQuery = CommonServices.relBuildingForShService.pageQuery(sQueryRequest, listSF)
+                list.add(SFilter.inList("id",listId1.toList()))
+                val pageQuery = CommonServices.relBuildingForShService.pageQuery(sQueryRequest, list)
                 manualRelationCalcResponse.direction = "Left"
                 manualRelationCalcResponse.content = pageQuery.content
                 manualRelationCalcResponse.message = pageQuery.message
@@ -4478,13 +4485,15 @@ open class ManualRelationCalcService {
 
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         if (rBd2FlList.size>0) {
+            val listSF = ArrayList<SFilter>()
             if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
             }
             if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
             }
-            val rSp2SpTwoList = CommonServices.rBd2FlTwoService.select(list).exec()
+            listSF.add(SFilter.eq("projectId", projectId))
+            val rSp2SpTwoList = CommonServices.rBd2FlTwoService.select(listSF).exec()
             if (rSp2SpTwoList.size>0) {
 
                 val listId1 = ArrayList<String>()
@@ -4494,11 +4503,9 @@ open class ManualRelationCalcService {
                     listId2.add(rSp2SpTwo.id2!!)
                 }
                 val sCascadeQuery = sQueryRequest.cascade!!.get(0)
-                val listSF = ArrayList<SFilter>()
                 sCascadeQuery.filters = "id in ${listId2.toJson()}"
-                listSF.add(SFilter.inList("id",listId1.toList()))
-                listSF.add(SFilter.eq("projectId", projectId))
-                val pageQuery = CommonServices.relBuildingForFlService.pageQuery(sQueryRequest, listSF)
+                list.add(SFilter.inList("id",listId1.toList()))
+                val pageQuery = CommonServices.relBuildingForFlService.pageQuery(sQueryRequest, list)
                 manualRelationCalcResponse.direction = "Left"
                 manualRelationCalcResponse.content = pageQuery.content
                 manualRelationCalcResponse.message = pageQuery.message
@@ -4526,13 +4533,15 @@ open class ManualRelationCalcService {
 
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         if (rBd2BdList.size>0) {
+            val listSF = ArrayList<SFilter>()
             if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
             }
             if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
-                list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
+                listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
             }
-            val rSp2SpTwoList = CommonServices.rBd2BdTwoService.select(list).exec()
+            listSF.add(SFilter.eq("projectId", projectId))
+            val rSp2SpTwoList = CommonServices.rBd2BdTwoService.select(listSF).exec()
             if (rSp2SpTwoList.size>0) {
 
                 val listId1 = ArrayList<String>()
@@ -4542,11 +4551,9 @@ open class ManualRelationCalcService {
                     listId2.add(rSp2SpTwo.id2!!)
                 }
                 val sCascadeQuery = sQueryRequest.cascade!!.get(0)
-                val listSF = ArrayList<SFilter>()
                 sCascadeQuery.filters = "id in ${listId2.toJson()}"
-                listSF.add(SFilter.inList("id",listId1.toList()))
-                listSF.add(SFilter.eq("projectId", projectId))
-                val pageQuery = CommonServices.relBuildingForBdService.pageQuery(sQueryRequest, listSF)
+                list.add(SFilter.inList("id",listId1.toList()))
+                val pageQuery = CommonServices.relBuildingForBdService.pageQuery(sQueryRequest, list)
                 manualRelationCalcResponse.direction = "Left"
                 manualRelationCalcResponse.content = pageQuery.content
                 manualRelationCalcResponse.message = pageQuery.message

+ 9 - 9
datacenter/src/main/resources/application-test.yml

@@ -28,18 +28,18 @@ server:
 
 spring:
   datasource:
-    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
-#    url:                                jdbc:postgresql://datacenter:5432/datacenter
+#    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
+    url:                                jdbc:postgresql://datacenter:5432/datacenter
     username:                           postgres
     password:                           cGVyc2FneV8yMDIwcXdlIUAj
 
-#  rabbitmq:
-#    host: 192.168.64.15
-#    port: 9936
-#    username: admin
-#    password: brzj123456
-#    #虚拟host 可以不设置,使用server默认host
-#    virtual-host: /test
+  rabbitmq:
+    host: 192.168.64.15
+    port: 9936
+    username: admin
+    password: brzj123456
+    #虚拟host 可以不设置,使用server默认host
+    virtual-host: /test
 
   servlet:
     multipart:

+ 5 - 5
equip-component/src/main/kotlin/com/persagy/server/Opt.kt

@@ -59,19 +59,19 @@ object Opt {
     /** 生产厂家名称 */
     val MANUFACTURER = "manufacturer"
     /** 设备型号 */
-    val SPECIFICATION = "Specification"
+    val SPECIFICATION = "specification"
     /** 供应商单位名称 */
-    val SUPPLIER = "Supplier"
+    val SUPPLIER = "supplier"
     /** 设备照片 */
     val PIC = "pic"
     /** 竖井类型 */
     val SHAFTFUNCTYPE = "shaftFuncType"
     /** 设备文档 */
-    val ARCHIVE = "Archive"
+    val ARCHIVE = "archive"
     /** 安装质检报告 */
-    val CHECKREPORT = "CheckReport"
+    val CHECKREPORT = "checkReport"
     /** 设备图纸 */
-    val DRAWING = "Drawing"
+    val DRAWING = "drawing"
     /** 安装图纸 */
     val INSTALLDRAWING = "installDrawing"
     /** 安装照片 */

+ 8 - 107
equip-component/src/main/kotlin/com/persagy/server/models/PropertySupplement.kt

@@ -28,14 +28,6 @@ package com.persagy.server.models
 
 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.EquipFamily
-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.objects.Building
-import com.persagy.server.datacenter.models.entities.objects.Equipment
-import com.persagy.server.datacenter.models.entities.objects.Project
-import com.persagy.server.models.objects.FloorCompon
-import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
@@ -120,12 +112,6 @@ open class PropertySupplement : BaseInfo(),Comparator<PropertySupplement> {
     @Column(name = "project_id")
     var projectId: String? = null
 
-    /** 资产类型code */
-    @Schema(description = "资产类型code")
-    @Id
-    @Column(name = "family")
-    var family: String? = null
-
     /** 资产所在建筑id */
     @Schema(description = "资产所在建筑id")
     @Column(name = "building_id")
@@ -136,105 +122,26 @@ open class PropertySupplement : BaseInfo(),Comparator<PropertySupplement> {
     @Column(name = "floor_id")
     var floorId: String? = null
 
-    /** 资产关联设备id */
-    @Schema(description = "关联的设备或部件")
-    @Column(name = "equip_id")
-    var equipId: String? = null
-
-    /** 设备序号 */
-    @Schema(description = "设备序号 ")
-    @Column(name = "equip_serial")
-    var equipSerial: String? = null
-
-    /** 任务状态 待验证1、已验证0、未找到-1  */
-    @Schema(description = "任务状态-待验证1、已验证0、未找到-1")
-    @Column(name = "task_state")
-    var taskState: Int? = null
-
-    /** 设备部件标志位,1设备,2部件 */
-    @Schema(description = "1设备,2部件")
-    @Column(name = "type")
-    var type: String? = null
-
     /** 信息点 */
     @Schema(description = "信息点")
     @Column(name = "infos")
     var infos: HashMap<String,Any?>? = null
 
-    /** 对象类型 */
-    @Schema(description = "对象类型")
-    @Column(name = "object_type")
-    override var objectType: String? = "property"
-
-    /** 位置信息 */
-    @Schema(description = "位置信息")
-    @Column(name = "position")
-    var position: String? = null
-
-    /** 贴码状态 */
-    @Schema(description = "贴码状态")
-    @Column(name = "code_type")
-    var codeType: Int? = null
-
-    /** 选择状态 */
-    @Schema(description = "选择状态")
-    @Column(name = "checked")
-    var checked: Boolean? = null
-
-    /** 空间id */
-    @Schema(description = "空间id")
-    @Column(name = "space_id")
-    var spaceId: String? = null
-
-    /** 备注 */
-    @Schema(description = "备注")
-    @Column(name = "note")
-    var note: Boolean? = null
-
-    /** 点位id */
-    @Schema(description = "点位id")
-    @Column(name = "point_id")
-    var pointId: String? = null
-
-    /** 区分是哪里创建的资产 app  ,web */
-    @Schema(description = "区分是哪里创建的资产 app  ,web")
-    @Column(name = "source")
-    var source: String? = null
 
     /** 模型文件id */
     @Schema(description = "模型文件id")
     @Column(name = "model_id")
     var modelId: String? = null
 
-    /** 设备 */
-    @Schema(description = "级联-设备")
-    @SCascade(table="property", idColumn="id", childIdColumn="equip_id")
-    var equipment: Equipment? = null
-
-    /** 建筑   table  对应关系表   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */
-    @Schema(description = "级联-建筑")
-    @SCascade(table="property", idColumn="id", childIdColumn="building_id")
-    var building: Building? = null
-
-    /** 级联-楼层   table  对应关系表   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */
-    @Schema(description = "级联-楼层")
-    @SCascade(table="property", idColumn="id", childIdColumn="floor_id")
-    var floor: FloorCompon? = null
+    /** 类型 */
+    @Schema(description = "类型")
+    @Column(name = "class_code")
+    var classCode: String? = null
 
-    /** 级联-项目 */
-    @Schema(description = "级联-项目")
-    @SCascade(table="property", idColumn="id", childIdColumn="project_id")
-    var project: Project? = null
-
-    /** 级联-资产设备族 */
-    @Schema(description = "级联-资产设备族")
-    @SCascade(table="property", idColumn="id", childIdColumn="family")
-    var equipFamilyList: ArrayList<EquipFamilyCategory>? = null
-
-    /** 级联-资产设备族名称 */
-    @Schema(description = "级联-资产设备族名称")
-    @SCascade(table="property", idColumn="id", childIdColumn="family")
-    var familyName: Family? = null
+    /** 类型名 */
+    @Schema(description = "类型名")
+    @Column(name = "code_name")
+    var codeName: String? = null
 
 
     /** 距离*/
@@ -265,10 +172,4 @@ open class PropertySupplement : BaseInfo(),Comparator<PropertySupplement> {
     @Column(name = "find_people")
     var findPeople: String? = null
 
-
-    /** 级联设备类型 */
-    @Schema(description = "级联-设备类型")
-    @SCascade(table="property", idColumn="id", childIdColumn="family")
-    var equipFamily: ArrayList<EquipFamily>? = null
-
 }

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

@@ -115,7 +115,7 @@ class TenantCascade : BaseInfo() {
 
     /** 租户租赁的租户业务空间  self = true  同样的对象查询时 id可以互相调换查询   */
     @Schema(description = "级联-租户租赁的租户业务空间")
-    @SCascade(table="relationship.r_tn2sp", idColumn="tn_id", childIdColumn="sp_id", self = true)
+    @SCascade(table="relationship.r_tn2sp", idColumn="tn_id", childIdColumn="sp_id", self = false)
     @JSONField(name = "ZoneTenantList")
     var zoneTenantList: ArrayList<ZoneSpace>? = null
 

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

@@ -118,7 +118,7 @@ open class FloorCompon : BaseInfo() {
 
     /** 贯通关系   self = true  同样的对象查询时 id可以互相调换查询   */
     @Schema(description = "级联-贯通关系")
-    @SCascade(table="r_fl_through_fl", idColumn="floor_id", childIdColumn="floor_other_id", self = true)
+    @SCascade(table="r_fl_through_fl", idColumn="floor_id", childIdColumn="floor_other_id", self = false)
     var floorThroughList: ArrayList<FloorCompon>? = null
 
     /** 模型文件id */

+ 4 - 4
equip-component/src/main/kotlin/com/persagy/server/service/objects/EquipmentService.kt

@@ -896,7 +896,6 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
     fun equipPropertySupplys(equipComDelList: ArrayList<EquipComDel>): SQueryResponse<EquipComDel>{
         return try {
             val projectId = SPageContext.getHeader("projectId")
-            val propertyService = SObjectService(SMybatisDao(Property::class.java))
             if (equipComDelList.isNotEmpty()){
                 for (equipComDel in equipComDelList){
                     var num = 0
@@ -904,9 +903,10 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                     logger.debug("楼层数量=${FloorComponList.size}")
                     if (FloorComponList.size>0){
                         for (floorCompon in FloorComponList){
-                            val count = propertyService.select(SFilter.eq("projectId", projectId!!),SFilter.eq("floorId", floorCompon.id!!),
-                                    SFilter.isNull("bimId"), SFilter.not(SFilter.isNull("bimLocation"))
-                                    ,SFilter.isNull("equipId")).exec()
+                            val count = EquipmentService.select(SFilter.eq("projectId", projectId!!),SFilter.eq("floorId", floorCompon.id!!),
+                                    SFilter.isNull("bimId"), SFilter.not(SFilter.isNull("bimLocation")),
+                                SFilter.isNull("modelId")
+                                    ).exec()
                             logger.debug("查询数量=${count.size}")
                             num += count.size
                         }

+ 2 - 2
equip-component/src/main/resources/application-test.yml

@@ -19,8 +19,8 @@ spring:
 #    url:                                jdbc:postgresql://data-center:5432/datacenter
 #    username:                           postgres
 #    password:                           123qwe!@#
-#    url:                                jdbc:postgresql://datacenter:5432/datacenter
-    url:                                jdbc:postgresql://192.168.64.15:5432/datacenter
+    url:                                jdbc:postgresql://datacenter:5432/datacenter
+#    url:                                jdbc:postgresql://192.168.64.15:5432/datacenter
 #    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
 #    url:                                jdbc:postgresql://datacenter:5432/datacenterlabsl
     username:                           postgres