Ver código fonte

********************WX***********************
同步关系

zhangweixin 4 anos atrás
pai
commit
05daa8ec72
59 arquivos alterados com 577 adições e 764 exclusões
  1. 0 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopFour.kt
  2. 0 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopOne.kt
  3. 0 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopThree.kt
  4. 0 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopFour.kt
  5. 0 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopOne.kt
  6. 0 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopThree.kt
  7. 0 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVentNetworkOne.kt
  8. 0 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVentNetworkThree.kt
  9. 0 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/LocationPoint.kt
  10. 0 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Project.kt
  11. 0 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Property.kt
  12. 2 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSpinBd.kt
  13. 0 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSyEqList.kt
  14. 2 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSyForSpBase.kt
  15. 2 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RTnInSpBase.kt
  16. 0 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/requests/ModelScanSQueryRequest.kt
  17. 1 8
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/requests/RUpDateEquipAndSapceRequest.kt
  18. 0 65
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/response/DistrictBeanX.kt
  19. 0 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/response/EqpeDefferentReqponse.kt
  20. 0 8
      data-core/src/main/kotlin/com/persagy/server/scanbuilding/ExceptionRequest.kt
  21. 0 4
      data-core/src/main/kotlin/com/persagy/server/scanbuilding/ImageNameSort.kt
  22. 3 3
      datacenter/src/main/kotlin/com/persagy/server/WebMvcConfg.kt
  23. 2 12
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/FloorController.kt
  24. 1 1
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RShContainSpBaseController.kt
  25. 1 1
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSpInBdOrFlController.kt
  26. 1 1
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyEqController.kt
  27. 1 1
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyForBdController.kt
  28. 1 1
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyForFlController.kt
  29. 1 1
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyForSpController.kt
  30. 1 1
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyInBdController.kt
  31. 1 1
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyInFlController.kt
  32. 1 1
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyInShController.kt
  33. 1 1
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyInSpController.kt
  34. 1 14
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RTnInSpController.kt
  35. 13 9
      datacenter/src/main/kotlin/com/persagy/server/services/assistant/ObjInfoService.kt
  36. 4 4
      datacenter/src/main/kotlin/com/persagy/server/services/objects/EquipmentService.kt
  37. 24 30
      datacenter/src/main/kotlin/com/persagy/server/services/objects/ZoneSpaceBaseService.kt
  38. 1 2
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RShContainSpBaseService.kt
  39. 10 4
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RSpInBdService.kt
  40. 17 9
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyForBdService.kt
  41. 19 11
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyForFlService.kt
  42. 17 9
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyForShService.kt
  43. 11 2
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyForSpBaseService.kt
  44. 22 14
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyInBdService.kt
  45. 16 5
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyInFlService.kt
  46. 20 83
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyInShService.kt
  47. 12 170
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyInSpBaseService.kt
  48. 22 196
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RTnInSpBaseService.kt
  49. 104 18
      datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationCalcService.kt
  50. 213 1
      datasyn/src/main/kotlin/com/persagy/server/syn/jms/DataCenterSync.kt
  51. 1 1
      datasyn/src/main/kotlin/com/persagy/server/syn/task/SchedulerTask.kt
  52. 3 3
      datasyn/src/main/kotlin/com/persagy/server/syn/task/SchedulerTaskRel.kt
  53. 2 2
      datasyn/src/main/resources/application-dev.yml
  54. 3 7
      equip-component/src/main/kotlin/com/persagy/server/models/PropertyEquip.kt
  55. 0 3
      equip-component/src/main/kotlin/com/persagy/server/models/PropertyFamily.kt
  56. 1 2
      equip-component/src/main/kotlin/com/persagy/server/models/SpaceBdFl.kt
  57. 4 0
      equip-component/src/main/kotlin/com/persagy/server/models/objects/FloorCompon.kt
  58. 5 0
      equip-component/src/main/kotlin/com/persagy/server/models/objects/ZoneSpace.kt
  59. 10 10
      equip-component/src/main/kotlin/com/persagy/server/service/objects/ShaftService.kt

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

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

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

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

+ 0 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopThree.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
@@ -45,7 +44,6 @@ open class RelEquipmentCoolingWaterLoopThree  : EquipmentBase() {
     /** 级联-设备 */
     @Schema(description = "级联-设备")
     @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_CoolingWaterLoop_3'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 } // Class RelEquipmentCoolingWaterLoopThree

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

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

+ 0 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopOne.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
@@ -45,7 +44,6 @@ open class RelEquipmentHeatWaterLoopOne : EquipmentBase() {
     /** 级联-设备 */
     @Schema(description = "级联-设备")
     @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_HeatWaterLoop_1'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 } // Class RelEquipmentHeatWaterLoopOne

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

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

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

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

+ 0 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVentNetworkThree.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
@@ -45,7 +44,6 @@ open class RelEquipmentVentNetworkThree : EquipmentBase() {
     /** 级联-设备 */
     @Schema(description = "级联-设备")
     @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_VentNetwork_3'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 } // Class RelEquipmentVentNetworkThree

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.objects
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.assistant.PointImage
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import com.persagy.service.models.annotations.SCascade
@@ -48,90 +47,75 @@ class LocationPoint : RBaseInfo() {
     @Schema(description = "点位标签ID")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
     var id: String? = null
 
     /** 本地编码 */
     @Schema(description = "本地编码")
     @Column(name = "local_id")
-    @JSONField(name = "LocalId")
     var localId: String? = null
 
     /** 项目ID */
     @Schema(description = "项目ID")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑ID */
     @Schema(description = "建筑ID")
     @Column(name = "build_id")
-    @JSONField(name = "BuildId")
     var buildId: String? = null
 
     /** 楼层ID */
     @Schema(description = "楼层ID")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** BimId编码 */
     @Schema(description = "BimId编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BimId")
     var bimId: String? = null
 
     /**  */
     @Schema(description = "")
     @Column(name = "beacon_id")
-    @JSONField(name = "BeaconId")
     var beaconId: String? = null
 
     /** 名称 */
     @Schema(description = "名称")
     @Column(name = "name")
-    @JSONField(name = "Name")
     var name: String? = null
 
     /** 位置 */
     @Schema(description = "位置")
     @Column(name = "position")
-    @JSONField(name = "Position")
     var position: String? = null
 
     /** 信息类型 */
     @Schema(description = "信息类型")
     @Column(name = "type")
-    @JSONField(name = "Type")
     var type: Int? = null
 
     /** X坐标 */
     @Schema(description = "X坐标")
     @Column(name = "x")
-    @JSONField(name = "X")
     var x: Double? = 0.0
 
     /** Y坐标 */
     @Schema(description = "Y坐标")
     @Column(name = "y")
-    @JSONField(name = "Y")
     var y: Double? = 0.0
 
     /**  */
     @Schema(description = "")
     @Column(name = "space_id")
-    @JSONField(name = "SpaceId")
     var spaceId: String? = null
 
     /** 备注 */
     @Schema(description ="")
     @Column(name = "note")
-    @JSONField(name = "Note")
     var note: String? = null
 
     /** 图片信息 */
     @Schema(description ="图片信息")
-    @JSONField(name = "ImageList")
     @SCascade(table="scanbuilding.image", idColumn="object_id", childIdColumn="id")
     var imageList: ArrayList<PointImage>? = null
 

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

@@ -25,7 +25,6 @@
  */
 
 package com.persagy.server.datacenter.models.entities.objects
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -80,7 +79,6 @@ open class Project : BaseInfo() {
     /** 对象类型 */
     @Schema(description = "对象类型")
     @Column(name = "object_type")
-    @JSONField(name = "ObjectType")
     override var objectType: String? = "Project"
 
     @Schema(description = "信息点")

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

@@ -27,7 +27,6 @@
 package com.persagy.server.datacenter.models.entities.objects
 
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.assistant.BIMLocation
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.server.datacenter.models.entities.dict.EquipFamilyCategory
@@ -266,13 +265,11 @@ open class Property : BaseInfo(),Comparator<Property> {
     /** 级联-资产设备族 */
     @Schema(description = "级联-资产设备族")
     @SCascade(table="property", idColumn="id", childIdColumn="family")
-    @JSONField(name = "EquipFamilyList")
     var equipFamilyList: ArrayList<EquipFamilyCategory>? = null
 
     /** 级联-资产设备族名称 */
     @Schema(description = "级联-资产设备族名称")
     @SCascade(table="property", idColumn="id", childIdColumn="family")
-    @JSONField(name = "FamilyName")
     var familyName: Family? = null
 
     /** 级联-资产所在的空间的 */

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

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-import com.persagy.service.models.SBaseEntity
+import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
@@ -39,7 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "业务空间所在的建筑")
 @Table(name = "r_sp_in_bd")
-class RSpinBd : SBaseEntity() {
+class RSpinBd : RBaseInfo() {
 
     /** 建筑id */
     @Schema(description = "建筑id")

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table
@@ -53,7 +52,6 @@ class RSyEqList : RBaseInfo(){
 
     /** 设备id */
     @Schema(description = "设备id列表", required = true)
-    @JSONField(name = "EquipIdList")
     var equipIdList: ArrayList<String>? = null
 
 } // Class RSyEq

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

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-import com.persagy.service.models.SBaseEntity
+import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
@@ -39,7 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "系统服务于业务空间 基类")
 @Table(name = "r_sy_for_sp_base")
-open class RSyForSpBase : SBaseEntity() {
+open class RSyForSpBase : RBaseInfo() {
 
     /** 系统id */
     @Schema(description = "系统id")

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

@@ -26,7 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-import com.persagy.service.models.SBaseEntity
+import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
@@ -39,7 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "租户所租用的业务空间 基类")
 @Table(name = "r_tn_in_sp_base")
-open class RTnInSpBase : SBaseEntity() {
+open class RTnInSpBase : RBaseInfo() {
 
     /** 租户id */
     @Schema(description = "租户id")

+ 0 - 3
data-core/src/main/kotlin/com/persagy/server/datacenter/models/requests/ModelScanSQueryRequest.kt

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.requests
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.requests.SQueryRequest
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -41,13 +40,11 @@ class ModelScanSQueryRequest : SQueryRequest(){
     var idList: ArrayList<String>? = null
 
     @Schema(description = "模型id")
-    @JSONField(name = "ModelId")
     var modelId : String? = null
 
     /** 设备类型code */
     @Schema(description = "设备类型code")
     @Column(name = "category")
-    @JSONField(name = "Category")
     var category: String? = null
 
 } // Class ModelScanSQueryRequest

+ 1 - 8
data-core/src/main/kotlin/com/persagy/server/datacenter/models/requests/RUpDateEquipAndSapceRequest.kt

@@ -26,34 +26,27 @@
 
 package com.persagy.server.datacenter.models.requests
 
-import com.alibaba.fastjson.annotation.JSONField
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 
 class RUpDateEquipAndSapceRequest : Serializable {
 
     @Schema(description = "旧的Bimid")
-    @JSONField(name = "OldBimId")
     var oldBimId: String? = ""
 
     @Schema(description = "Bimid")
-    @JSONField(name = "BimId")
     var bimId: String? = null
 
     @Schema(description = "楼层id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     @Schema(description = "楼层平面图地址")
-    @JSONField(name = "FloorMap")
     var floorMap: String? = null
 
     @Schema(description = "模型id")
-    @JSONField(name = "ModelId")
     var modelId: String? = null
 
     @Schema(description = "自定义属性")
-    @JSONField(name = "AttributeMap")
     var attributeMap: HashMap<String,Any>? = null
 
-} // Class RUpDateEquipAndSapceRequest
+}

+ 0 - 65
data-core/src/main/kotlin/com/persagy/server/datacenter/models/response/DistrictBeanX.kt

@@ -1,65 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.response
-
-import com.alibaba.fastjson.annotation.JSONField
-import com.fasterxml.jackson.annotation.JsonProperty
-import java.io.Serializable
-
-/**
- *城市列表
- *
- * @author 张维新
- */
-class DistrictBeanX : Serializable {
-                /**
-                 * altitude : 53
-                 * districtCode : 01
-                 * code : 110101
-                 * districtName : 东城区
-                 * cityCode : 01
-                 * latitude : 39.93
-                 * type : 城区
-                 * longitude : 116.42
-                 */
-                @JSONField(name = "Altitude")
-                var altitude: String? = null
-                @JSONField(name = "DistrictCode")
-                var districtCode: String? = null
-                @JSONField(name = "Code")
-                var code: String? = null
-                @JSONField(name = "DistrictName")
-                var districtName: String? = null
-                @JSONField(name = "CityCode")
-                var cityCode: String? = null
-                @JSONField(name = "Latitude")
-                var latitude: String? = null
-                @JSONField(name = "Type")
-                var type: String? = null
-                @JSONField(name = "Longitude")
-                var longitude: String? = null
-} // class DistrictBeanX

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

@@ -43,12 +43,10 @@ class EqpeDefferentReqponse : Serializable {
 
     /** 资产信息点 */
     @Schema(description = "资产信息点")
-    @JSONField(name = "Property")
     var property : TreeMap<String,Any>? = null
 
     /** 岗位信息点 */
     @Schema(description = "岗位信息点")
-    @JSONField(name = "Equipment")
     var equipment : TreeMap<String,Any>? = null
 
 

+ 0 - 8
data-core/src/main/kotlin/com/persagy/server/scanbuilding/ExceptionRequest.kt

@@ -26,7 +26,6 @@
 
 package cn.sagacloud.server.scanbuilding
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema
 import java.util.*
@@ -47,43 +46,36 @@ class ExceptionRequest : SBaseEntity() {
     @Schema(description = "主键ID")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
     var id: Int? = null
 
     /** 类型 */
     @Schema(description = "类型")
     @Column(name = "type")
-    @JSONField(name = "Type")
     var type: String? = null
 
     /** 项目ID */
     @Schema(description = "项目ID")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 请求体 */
     @Schema(description = "请求体")
     @Column(name = "request_body")
-    @JSONField(name = "RequestBody")
     var requestBody: String? = null
 
     /** 状态 */
     @Schema(description = "状态")
     @Column(name = "status")
-    @JSONField(name = "Status")
     var status: Int? = null
 
     /** 添加时间 */
     @Schema(description = "添加时间",example = "2019-07-16 14:24:00")
     @Column(name = "add_time")
-    @JSONField(name = "AddTime")
     var addTime: Date? = null
 
     /** 请求次数 */
     @Schema(description = "请求次数")
     @Column(name = "upload_count")
-    @JSONField(name = "UploadCount")
     var uploadCount: Int? = null
 
 } // Class ExceptionRequest

+ 0 - 4
data-core/src/main/kotlin/com/persagy/server/scanbuilding/ImageNameSort.kt

@@ -26,7 +26,6 @@
 
 package cn.sagacloud.server.scanbuilding
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -46,19 +45,16 @@ class ImageNameSort : SBaseEntity() {
     @Schema(description = "主键ID")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
     var id: Int? = null
 
     /** 名字 */
     @Schema(description = "名字")
     @Column(name = "name")
-    @JSONField(name = "Name")
     var name: String? = null
 
     /** 排序 */
     @Schema(description = "排序")
     @Column(name = "sort")
-    @JSONField(name = "Sort")
     var sort: Int? = null
 
 } // Class ImageNameSort

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

@@ -27,7 +27,6 @@
 package com.persagy.server
 
 import com.alibaba.fastjson.PropertyNamingStrategy
-import com.persagy.service.interceptors.SPageInterceptor
 import com.persagy.service.json.SJsonHttpMessageConverter
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.converter.HttpMessageConverter
@@ -44,9 +43,10 @@ open class WebMvcConfg: WebMvcConfigurer {
      *
      * @param   registry        拦截器注册器
      */
-    override fun addInterceptors(registry : InterceptorRegistry) {
-        registry.addInterceptor(SPageInterceptor()).addPathPatterns("/**")
+    override fun addInterceptors(registry: InterceptorRegistry) {
+//        registry.addInterceptor(SPageInterceptor()).addPathPatterns("/**")
         super.addInterceptors(registry)
+
     } // Function addInterceptors()
 
     /**

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

@@ -145,22 +145,12 @@ open class FloorController {
         list.add("outline")
         list.add("floorSequenceId")
         list.add("modelId")
+        list.add("infos")
+        list.add("properties")
         request.projection = list
         return FloorService.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString())))
     } // Function query()
 
-//    /**
-//     * 查询楼层信息
-//     *
-//     * @param request     查询信息条件
-//     * @return 查询结果
-//     */
-//    @Operation(summary = "查询楼层轮廓线信息", description = "级联 轮廓线 floorOutline")
-//    @PostMapping(value = ["/outline/query"])
-//    fun queryOutline(@RequestBody request: SQueryRequest): SQueryResponse<FloorOutline> {
-//        return FloorService.floorOutlineService.pageQuery(request)
-//    }
-
     /**
      * 查询楼层信息
      *

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

@@ -121,7 +121,7 @@ class RShContainSpBaseController {
      */
     @Operation(summary = "竖井下的业务空间,竖井一对多,此方法会覆盖以前的记录", description = "必填项:SpaceIdList(业务空间id列表)、ShaftID(竖井id),此方法会覆盖以前的记录")
     @PostMapping(value = ["link-shsps-replace"])
-    fun createShSpsReplace(@RequestParam Type: String,BuildingId: String,FloorId: String, @RequestBody rShContainSpBase: RShContainSpBaseList): SCreateResponse<RShContainSpBaseList> {
+    fun createShSpsReplace(@RequestParam Type: String,@RequestParam BuildingId: String,@RequestParam FloorId: String, @RequestBody rShContainSpBase: RShContainSpBaseList): SCreateResponse<RShContainSpBaseList> {
         logger.debug("space =${rShContainSpBase.toJson()}")
         return RShContainSpBaseService.createShSpsReplace(Type,BuildingId,FloorId,rShContainSpBase)
     } // Function createSp()

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

@@ -76,4 +76,4 @@ class RSpInBdOrFlController {
         return RSpInBdService.spInBdUpdates(request)
     } // Function spInBdUpdate()
 
-} // Class RSpInBdOrFlController
+}

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

@@ -130,6 +130,6 @@ class RSyEqController {
     fun deleteRSyEq(@RequestBody idList: ArrayList<RSyEq>): SBaseResponse {
         logger.debug("equip =${idList.toJson()}")
         return RSyEqService.deleteByKeysList(idList)
-    } // Function deleteRSyEq()
+    }
 
 }

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

@@ -106,4 +106,4 @@ class RSyForBdController {
         return RSyForBdService.createsBd(rSyForBd)
     } // Function createSy()
 
-} // Class RSyForBdController
+}

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

@@ -106,4 +106,4 @@ class RSyForFlController {
         return RSyForFlService.createsFl(rSyForFl)
     } // Function createSy()
 
-} // Class RSyForFlController
+}

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

@@ -107,4 +107,4 @@ class RSyForSpController {
         return RSyForSpBaseService.createsSp(rSyForSpBase)
     } // Function createSy()
 
-} // Class RSyForSpController
+}

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

@@ -120,4 +120,4 @@ class RSyInBdController {
         return RSyInBdService.createSy(rSyInBd)
     } // Function createBd()
 
-} // Class RSyInBdController
+}

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

@@ -120,4 +120,4 @@ class RSyInFlController {
         return RSyInFlService.createSyFl(rSyInFl)
     } // Function createFl()
 
-} // Class RSyInFlController
+}

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

@@ -135,4 +135,4 @@ class RSyInShController {
     } // Function createSyShs()
 
 
-} // Class RSyInShController
+}

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

@@ -121,4 +121,4 @@ class RSyInSpController {
         return RSyInSpBaseService.createSySps(type,rSyInSpBase)
     } // Function createSySps()
 
-} // Class RSyInSpBaseController
+}

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

@@ -94,17 +94,4 @@ class RTnInSpController {
         return RTnInSpBaseService.createTn(type,rTnInSpBase)
     } // Function createSp()
 
-    /**
-     * 创建所租用的业务空间的租户关系
-     *
-     * @param    rTnInSpBase    租户和业务空间的关系对象
-     * @return                  创建的结果信息
-     */
-//    @Operation(summary = "所租用的业务空间的租户关系,业务空间一对多", description = "必填项:SpaceId(业务空间id)、TenantIDList(租户id列表),测方法会覆盖以前的记录")
-//    @PostMapping(value = ["/link-tn"])
-//    fun createTn(@RequestBody rTnInSpBase: RSpInTnBaseList): SCreateResponse<RTnInSpBase> {
-//        logger.debug("space =${rTnInSpBase.toJson()}")
-//        return RTnInSpBaseService.createsSp(rTnInSpBase)
-//    } // Function createTn()
-
-} // Class RTnInSpBaseController
+}

+ 13 - 9
datacenter/src/main/kotlin/com/persagy/server/services/assistant/ObjInfoService.kt

@@ -47,16 +47,20 @@ object ObjInfoService :  SObjectService<ObjInfos>(SMybatisDao(ObjInfos::class.ja
      * @Param: entity,flag,objType,type
      */
     fun createInfo(entity: Any, flag: Boolean,objType: String,type: String){
-        var request = ObjectBaseRequest()
-        val infos = JSONObject(entity.toJson())
-        val map = entity.toMap()
-        val iterator = infos.keys()
-        while (iterator.hasNext()) {
-            val key = iterator.next()
-            val value = infos.get(key as String)
-            if (value!=null&&value.toString()!="null"){
-                request.addInfo(key, value, false)
+        try {
+            var request = ObjectBaseRequest()
+            val infos = JSONObject(entity.toJson())
+            val map = entity.toMap()
+            val iterator = infos.keys()
+            while (iterator.hasNext()) {
+                val key = iterator.next()
+                val value = infos.get(key as String)
+                if (value!=null&&value.toString()!="null"){
+                    request.addInfo(key, value, false)
+                }
             }
+        } catch (e: Exception) {
+            e.printStackTrace()
         }
 
 //        val pro = PropertyDefProjectService.select(SFilter.eq("projectId",map["projectId"].toString()), SFilter.eq("type",type), SFilter.or(SFilter.eq("inputMode","L"), SFilter.eq("inputMode","M"))).exec()

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

@@ -132,7 +132,7 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
 //                    PropertyService.updateList(sUpdateRequest)
 //                }
             } else {
-                val property = PropertyService.select(SFilter.eq("equipmentId", entity.id!!)).entity()
+                val property = PropertyService.select(SFilter.eq("equipId", entity.id!!)).entity()
                 if (property != null) {
 
                     logger.debug("已经有关联的信息*********************************")
@@ -144,7 +144,7 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                         list.add(property)
                         val sUpdateRequest = SUpdateRequest<Property>()
                         sUpdateRequest.content = list
-                        sUpdateRequest.projection = arrayListOf("EquipmentId", "BIMID")
+                        sUpdateRequest.projection = arrayListOf("equipId", "bimId")
 
                         val updateList = PropertyService.updateList(sUpdateRequest)
                         val pr = PropertyService.select(SFilter.eq("id", entity.propertyId!!)).entity()
@@ -154,7 +154,7 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                         listp.add(pr)
                         val sUpdate = SUpdateRequest<Property>()
                         sUpdate.content = listp
-                        sUpdate.projection = arrayListOf("EquipmentId", "BIMID")
+                        sUpdate.projection = arrayListOf("equipId", "bimId")
                         PropertyService.updateList(sUpdate)
                         logger.debug("现在关联**${sUpdate.toJson()}*******************************")
 
@@ -188,7 +188,7 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                         listp.add(prop)
                         val sUpdate = SUpdateRequest<Property>()
                         sUpdate.content = listp
-                        sUpdate.projection = arrayListOf("EquipmentId")
+                        sUpdate.projection = arrayListOf("equipId")
                         val updateList = PropertyService.updateList(sUpdate)
                         logger.debug("第一次更新信息***${sUpdate.toJson()}******************************")
                         logger.debug("第一次更新***${updateList.toJson()}******************************")

+ 24 - 30
datacenter/src/main/kotlin/com/persagy/server/services/objects/ZoneSpaceBaseService.kt

@@ -57,7 +57,6 @@ import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.requests.SUpdateRequest
 import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SQueryResponse
-import org.json.JSONObject
 import org.slf4j.LoggerFactory
 
 /**
@@ -781,14 +780,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
                     zoneSpace.floorId = null
                     update(zoneSpace, list)
                 }
-                if (type == "AirConditioningZone"||type == "CleanZone"||type == "DomesticWaterSupplyZone"
-                        ||type == "FireZone"||type == "FunctionZone"||type == "GeneralZone"
-                        ||type == "HeatingZone"||type == "LightingZone"||type == "NetworkZone"
-                        ||type == "PowerSupplyZone"||type == "SecurityZone"||type == "TenantZone" ){
-                    /** 发送消息 */
-//                    sendMessages(projectId!!, spaceId!!, id)
-                    /** 修改空间的建筑楼层关系 */
-                }
+                rabbitMqService.sendObjects(Opt.projectId!!, Opt.UPDATE,zoneSpace.id!!)
             }
             return SBaseResponse(SResponseType.success)
         } catch (e: Exception) {
@@ -798,26 +790,26 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
 
     } // Function upDataFloorORBuilding
 
-    /**
-     * 发送消息
-     *
-     * @param   projectId   项目id
-     * @param   spaceId     业务空间id
-     * @param   id          楼层或建筑id
-     */
-    fun sendMessages(projectId: String, spaceId: String,id: String?){
-        try {
-            val jsonObject = JSONObject()
-            jsonObject.put("type", "20")
-            jsonObject.put("projectId", projectId)
-            jsonObject.put("id", spaceId)
-            jsonObject.put("linkId",id)
-            /** 发送消息 */
-            messageHandler.sendMessage(jsonObject.toString())
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
+//    /**
+//     * 发送消息
+//     *
+//     * @param   projectId   项目id
+//     * @param   spaceId     业务空间id
+//     * @param   id          楼层或建筑id
+//     */
+//    fun sendMessages(projectId: String, spaceId: String,id: String?){
+//        try {
+//            val jsonObject = JSONObject()
+//            jsonObject.put("type", "20")
+//            jsonObject.put("projectId", projectId)
+//            jsonObject.put("id", spaceId)
+//            jsonObject.put("linkId",id)
+//            /** 发送消息 */
+//            messageHandler.sendMessage(jsonObject.toString())
+//        } catch (e: Exception) {
+//            e.printStackTrace()
+//        }
+//    }
 
     /**
      * 修改空间轮廓线
@@ -836,6 +828,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
         val zoneSpace = request.content!![0]
         val updateList = ZoneSpaceBaseService.updateList(request)
 
+        rabbitMqService.sendObjects(Opt.projectId!!, Opt.UPDATE,zoneSpace.id!!)
         try {
             /** 处理关系标记 */
             val listtype = ArrayList<String>()
@@ -882,10 +875,11 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
                     DataCenterLogsService.addLogs(
                         Opt.projectId!!,"delete",zoneSpace.classCode!!,
                         zoneSpace.id!!,zoneSpace, Opt.account, Opt.coming)
+                    ObjInfoService.delete(SFilter.eq("projectId",projectId!!), SFilter.eq("objId",zoneSpace.id!!), SFilter.eq("objType","Sp"))
                 } catch (e: Exception) {
                     e.printStackTrace()
                 }
-                ObjInfoService.delete(SFilter.eq("projectId",projectId!!), SFilter.eq("objId",zoneSpace.id!!), SFilter.eq("objType","Sp"))
+
             }
         } catch (e: Exception) {
             e.printStackTrace()

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

@@ -352,7 +352,7 @@ object RShContainSpBaseService: RService<RShContainSpBase>(SMybatisDao(RShContai
                 allSpaceIdList.add(rShContainSpBase.id2!!)
             }
             allSpaceIdFilterList.add(SFilter.eq("projectId",projectId))
-            allSpaceIdFilterList.add(SFilter.eq("objectType",type))
+            allSpaceIdFilterList.add(SFilter.eq("classCode",type))
             allSpaceIdFilterList.add(SFilter.eq("buildingId",buildingId))
             allSpaceIdFilterList.add(SFilter.eq("floorId",floorId))
             if (allSpaceIdList.size>0){
@@ -363,7 +363,6 @@ object RShContainSpBaseService: RService<RShContainSpBase>(SMybatisDao(RShContai
                 spaceIdList.add(zoneSpaceBaseTable.id!!)
             }
 
-
             /** 成功集合 */
             val successList = ArrayList<Any>()
             /** 失败集合 */

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

@@ -26,9 +26,11 @@
 
 package com.persagy.server.services.rel
 
-import com.persagy.server.datacenter.models.entities.rel.RSpinBd
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.Opt
+import com.persagy.server.datacenter.models.entities.rel.RSpinBd
+import com.persagy.server.services.base.RService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
@@ -42,7 +44,7 @@ import com.persagy.service.models.responses.SCreateResponse
  *
  * @author 张维新
  */
-object RSpInBdService: SObjectService<RSpinBd>(SMybatisDao(RSpinBd::class.java)) {
+object RSpInBdService: RService<RSpinBd>(SMybatisDao(RSpinBd::class.java)) {
 
     /**
      * 创建业务空间和建筑的关系
@@ -59,14 +61,14 @@ object RSpInBdService: SObjectService<RSpinBd>(SMybatisDao(RSpinBd::class.java))
                         val insert = insert(rSpinBd)
                         if (insert){
                             /** 关系创建成功 */
-
+                            /** 发送消息 */
+                            rabbitMqService.sendRel(Opt.projectId!!, "Bd2Sp","11",rSpinBd.buildingId!!,rSpinBd.spaceId!!)
                         }
                     }else{
                         val sCreateResponse = SCreateResponse<RSpinBd>(SResponseType.failure)
                         sCreateResponse.message = "空间类型不能为空"
                         return  sCreateResponse
                     }
-
                 }
                 val sCreateResponse = SCreateResponse<RSpinBd>(SResponseType.success)
                 return sCreateResponse
@@ -96,6 +98,8 @@ object RSpInBdService: SObjectService<RSpinBd>(SMybatisDao(RSpinBd::class.java))
                         val delete = delete(rSpinBd)
                         if (delete){
                             /** 删除成功 */
+                            /** 发送消息 */
+                           rabbitMqService.sendRel(Opt.projectId!!, "Bd2Sp","12",rSpinBd.buildingId!!,rSpinBd.spaceId!!)
                         }
                     }else{
                         val sBaseResponse = SBaseResponse(SResponseType.failure)
@@ -140,6 +144,8 @@ object RSpInBdService: SObjectService<RSpinBd>(SMybatisDao(RSpinBd::class.java))
                         val insert = insert(content)
                         if (insert){
                             /** 添加关系 */
+                            /** 发送消息 */
+                            rabbitMqService.sendRel(Opt.projectId!!, "Bd2Sp","13",content.buildingId!!,content.spaceId!!)
                         }
 
                     }else{

+ 17 - 9
datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyForBdService.kt

@@ -26,12 +26,13 @@
 
 package com.persagy.server.services.rel
 
+import com.persagy.base.extensions.toJson
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.rel.RBdForSyList
 import com.persagy.server.datacenter.models.entities.rel.RSyForBd
 import com.persagy.server.datacenter.models.entities.rel.RSyForBdList
 import com.persagy.server.services.base.RService
-import com.persagy.base.extensions.toJson
-import com.persagy.mybatis.SMybatisDao
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SBaseResponse
@@ -55,6 +56,8 @@ object RSyForBdService: RService<RSyForBd>(SMybatisDao(RSyForBd::class.java)){
             rSyForBd.projectId = projectId
             val isInsert = insert(rSyForBd)
             if (isInsert){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2bd_for","11",rSyForBd.sysId!!,rSyForBd.buildingId!!)
                 SCreateResponse(SResponseType.success)
             }else{
                 SCreateResponse(SResponseType.failure)
@@ -76,6 +79,8 @@ object RSyForBdService: RService<RSyForBd>(SMybatisDao(RSyForBd::class.java)){
             val isDelete = delete(rSyForBd)
             /** 删除成功 */
             if (isDelete) {
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2bd_for","12",rSyForBd.sysId!!,rSyForBd.buildingId!!)
                 val sBaseResponse = SBaseResponse(SResponseType.success)
                 sBaseResponse.message = rSyForBd.toJson()
                 sBaseResponse
@@ -99,7 +104,7 @@ object RSyForBdService: RService<RSyForBd>(SMybatisDao(RSyForBd::class.java)){
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            delete("sysID = '${rSyForBdList.sysId}'")
+            delete("sysId= '${rSyForBdList.sysId}'")
             val projectId = SPageContext.getHeader("projectId")
             for (buildingId in rSyForBdList.buildingIdList!!){
                 val rSyForBd = RSyForBd()
@@ -108,12 +113,14 @@ object RSyForBdService: RService<RSyForBd>(SMybatisDao(RSyForBd::class.java)){
                 rSyForBd.projectId = projectId
                 val replace = replace(rSyForBd)
                 if (replace){
-                    successList.add(rSyForBd)
+                    successList.add(buildingId)
                 }else{
                     failureList.add(rSyForBd)
                 }
             }
             if (successList.size>0){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2bd_for","13",rSyForBdList.sysId!!,successList.toJson()!!)
                 val sCreateResponse = SCreateResponse<RSyForBd>(SResponseType.success)
                 if (failureList.size>0){
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
@@ -139,21 +146,22 @@ object RSyForBdService: RService<RSyForBd>(SMybatisDao(RSyForBd::class.java)){
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            delete("buildingID = '${rBdForSyList.buildingId}'")
-            val projectId = SPageContext.getHeader("projectId")
+            delete("buildingId = '${rBdForSyList.buildingId}'")
             for (sysId in rBdForSyList.sysIdList!!){
                 val rSyForBd = RSyForBd()
                 rSyForBd.buildingId = rBdForSyList.buildingId
                 rSyForBd.sysId = sysId
-                rSyForBd.projectId = projectId
+                rSyForBd.projectId = Opt.projectId
                 val replace = replace(rSyForBd)
                 if (replace){
-                    successList.add(rSyForBd)
+                    successList.add(sysId)
                 }else{
                     failureList.add(rSyForBd)
                 }
             }
             if (successList.size>0){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2bd_for","13",rBdForSyList.buildingId!!,successList.toJson()!!)
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<RSyForBd>(SResponseType.success)
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
@@ -171,4 +179,4 @@ object RSyForBdService: RService<RSyForBd>(SMybatisDao(RSyForBd::class.java)){
         }
     } // Function createsBd()
 
-} // Object RSyForBdService
+}

+ 19 - 11
datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyForFlService.kt

@@ -26,12 +26,13 @@
 
 package com.persagy.server.services.rel
 
+import com.persagy.base.extensions.toJson
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.rel.RFlForSyList
 import com.persagy.server.datacenter.models.entities.rel.RSyForFl
 import com.persagy.server.datacenter.models.entities.rel.RSyForFlList
 import com.persagy.server.services.base.RService
-import com.persagy.base.extensions.toJson
-import com.persagy.mybatis.SMybatisDao
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SBaseResponse
@@ -51,10 +52,12 @@ object RSyForFlService: RService<RSyForFl>(SMybatisDao(RSyForFl::class.java)){
      */
     fun create(rSyForFl: RSyForFl):SCreateResponse<RSyForFl> {
         return try {
-            val projectId = SPageContext.getHeader("projectId")
-            rSyForFl.projectId = projectId
+
+            rSyForFl.projectId = Opt.projectId
             val isInsert = insert(rSyForFl)
             if(isInsert){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2fl_for","11",rSyForFl.sysId!!,rSyForFl.floorId!!)
                 SCreateResponse(SResponseType.success)
             }else{
                 SCreateResponse(SResponseType.failure)
@@ -76,6 +79,8 @@ object RSyForFlService: RService<RSyForFl>(SMybatisDao(RSyForFl::class.java)){
             val isDelete = delete(rSyForFl)
             /** 删除成功 */
             if (isDelete){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2fl_for","12",rSyForFl.sysId!!,rSyForFl.floorId!!)
                 val sBaseResponse = SBaseResponse(SResponseType.success)
                 sBaseResponse.message = rSyForFl.toJson()
                 sBaseResponse
@@ -99,7 +104,7 @@ object RSyForFlService: RService<RSyForFl>(SMybatisDao(RSyForFl::class.java)){
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            delete("sysID = '${rSyForFlList.sysId}'")
+            delete("sysId = '${rSyForFlList.sysId}'")
             val projectId = SPageContext.getHeader("projectId")
             for (floorId in rSyForFlList.floorIdList!!){
                 val rSyForFl = RSyForFl()
@@ -108,12 +113,14 @@ object RSyForFlService: RService<RSyForFl>(SMybatisDao(RSyForFl::class.java)){
                 rSyForFl.projectId = projectId
                 val replace = replace(rSyForFl)
                 if (replace){
-                    successList.add(rSyForFl)
+                    successList.add(floorId)
                 }else{
                     failureList.add(rSyForFl)
                 }
             }
             if(successList.size > 0){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2fl_for","13",rSyForFlList.sysId!!,successList.toJson()!!)
                 val sCreateResponse = SCreateResponse<RSyForFl>(SResponseType.success)
                 if (failureList.size > 0){
                     sCreateResponse.message = "失败对象:" + failureList.toJson()
@@ -139,21 +146,22 @@ object RSyForFlService: RService<RSyForFl>(SMybatisDao(RSyForFl::class.java)){
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            delete("floorID = '${rSyForFlList.floorId}'")
-            val projectId = SPageContext.getHeader("projectId")
+            delete("floorId = '${rSyForFlList.floorId}'")
             for (sysId in rSyForFlList.sysIdList!!){
                 val rSyForFl = RSyForFl()
                 rSyForFl.floorId = rSyForFlList.floorId
                 rSyForFl.sysId = sysId
-                rSyForFl.projectId = projectId
+                rSyForFl.projectId = Opt.projectId
                 val replace = replace(rSyForFl)
                 if (replace){
-                    successList.add(rSyForFl)
+                    successList.add(sysId)
                 }else{
                     failureList.add(rSyForFl)
                 }
             }
             if (successList.size > 0 ){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2fl_for","13",rSyForFlList.floorId!!,successList.toJson()!!)
                 if (failureList.size > 0){
                     val sCreateResponse = SCreateResponse<RSyForFl>(SResponseType.success)
                     sCreateResponse.message = "失败对象" + failureList.toJson()
@@ -171,4 +179,4 @@ object RSyForFlService: RService<RSyForFl>(SMybatisDao(RSyForFl::class.java)){
         }
     } // Function createsFl()
 
-} // Object RSyForFlService
+}

+ 17 - 9
datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyForShService.kt

@@ -26,12 +26,13 @@
 
 package com.persagy.server.services.rel
 
+import com.persagy.base.extensions.toJson
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.rel.RShForSyList
 import com.persagy.server.datacenter.models.entities.rel.RSyForSh
 import com.persagy.server.datacenter.models.entities.rel.RSyForShList
 import com.persagy.server.services.base.RService
-import com.persagy.base.extensions.toJson
-import com.persagy.mybatis.SMybatisDao
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SBaseResponse
@@ -54,6 +55,8 @@ object RSyForShService: RService<RSyForSh>(SMybatisDao(RSyForSh::class.java)) {
             rSyForSh.projectId = projectId
             val isInsert = insert(rSyForSh)
             if(isInsert){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2sh_for","11",rSyForSh.sysId!!,rSyForSh.shaftId!!)
                 SCreateResponse(SResponseType.success)
             }else{
                 SCreateResponse(SResponseType.failure)
@@ -75,6 +78,8 @@ object RSyForShService: RService<RSyForSh>(SMybatisDao(RSyForSh::class.java)) {
             val isDelete = delete(rSyForSh)
             /** 删除成功 */
             if (isDelete){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2sh_for","12",rSyForSh.sysId!!,rSyForSh.shaftId!!)
                 val sBaseResponse = SBaseResponse(SResponseType.success)
                 sBaseResponse.message = rSyForSh.toJson()
                 sBaseResponse
@@ -98,7 +103,7 @@ object RSyForShService: RService<RSyForSh>(SMybatisDao(RSyForSh::class.java)) {
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            delete("sysID = '${rSyForShList.sysId}'")
+            delete("sysId = '${rSyForShList.sysId}'")
             val projectId = SPageContext.getHeader("projectId")
             for (shaftId in rSyForShList.shaftIdList!!){
                 val rSyForSh = RSyForSh()
@@ -107,12 +112,14 @@ object RSyForShService: RService<RSyForSh>(SMybatisDao(RSyForSh::class.java)) {
                 rSyForSh.projectId = projectId
                 val replace = replace(rSyForSh)
                 if (replace){
-                    successList.add(rSyForSh)
+                    successList.add(shaftId)
                 }else{
                     failureList.add(rSyForSh)
                 }
             }
             if(successList.size > 0){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2sh_for","13",rSyForShList.sysId!!,successList.toJson())
                 val sCreateResponse = SCreateResponse<RSyForSh>(SResponseType.success)
                 if (failureList.size > 0){
                     sCreateResponse.message = "失败对象:" + failureList.toJson()
@@ -138,21 +145,22 @@ object RSyForShService: RService<RSyForSh>(SMybatisDao(RSyForSh::class.java)) {
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            delete("shaftID = '${rSyForShList.shaftId}'")
-            val projectId = SPageContext.getHeader("projectId")
+            delete("shaftId = '${rSyForShList.shaftId}'")
             for (sysId in rSyForShList.sysIdList!!){
                 val rSyForSh = RSyForSh()
                 rSyForSh.shaftId = rSyForShList.shaftId
                 rSyForSh.sysId = sysId
-                rSyForSh.projectId = projectId
+                rSyForSh.projectId = Opt.projectId
                 val replace = replace(rSyForSh)
                 if (replace){
-                    successList.add(rSyForSh)
+                    successList.add(sysId)
                 }else{
                     failureList.add(rSyForSh)
                 }
             }
             if (successList.size > 0 ){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2sh_for","13",rSyForShList.shaftId!!,successList.toJson())
                 if (failureList.size > 0){
                     val sCreateResponse = SCreateResponse<RSyForSh>(SResponseType.success)
                     sCreateResponse.message = "失败对象" + failureList.toJson()
@@ -170,4 +178,4 @@ object RSyForShService: RService<RSyForSh>(SMybatisDao(RSyForSh::class.java)) {
         }
     } // Function createsFl()
 
-} // Object RSyForShService
+}

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

@@ -29,12 +29,13 @@ package com.persagy.server.services.rel
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.rel.RSpForSyBaseList
 import com.persagy.server.datacenter.models.entities.rel.RSy2Sp
 import com.persagy.server.datacenter.models.entities.rel.RSyForSpBase
 import com.persagy.server.datacenter.models.entities.rel.RSyForSpBaseList
+import com.persagy.server.services.base.RService
 import com.persagy.server.services.objects.ZoneSpaceBaseService
-import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
@@ -46,7 +47,7 @@ import com.persagy.service.models.responses.SCreateResponse
  *
  * @author 付国宝
  */
-object RSyForSpBaseService: SBaseService<RSyForSpBase>(SMybatisDao(RSyForSpBase::class.java)) {
+object RSyForSpBaseService: RService<RSyForSpBase>(SMybatisDao(RSyForSpBase::class.java)) {
 
     var rSy2SpService = SObjectService(SMybatisDao( RSy2Sp::class.java))
     /**
@@ -67,6 +68,8 @@ object RSyForSpBaseService: SBaseService<RSyForSpBase>(SMybatisDao(RSyForSpBase:
             rSy2Sp.type = "sy2sp_for"
             val isInsert = rSy2SpService.insert(rSy2Sp)
             if (isInsert){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2sp_for","11",rSyForSpBase.sysId!!,rSyForSpBase.spaceId!!)
                 SCreateResponse(SResponseType.success)
             }else{
                 SCreateResponse(SResponseType.failure)
@@ -96,6 +99,8 @@ object RSyForSpBaseService: SBaseService<RSyForSpBase>(SMybatisDao(RSyForSpBase:
             val isDelete =rSy2SpService.delete(rSy2Sp)
             /** 删除成功 */
             if (isDelete) {
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2sp_for","12",rSyForSpBase.sysId!!,rSyForSpBase.spaceId!!)
                 val sBaseResponse = SBaseResponse(SResponseType.success)
                 sBaseResponse.message = rSyForSpBase.toJson()
                 sBaseResponse
@@ -138,6 +143,8 @@ object RSyForSpBaseService: SBaseService<RSyForSpBase>(SMybatisDao(RSyForSpBase:
                 }
             }
             if (successList.size>0){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2sp_for","13",rSyForSpBaseList.sysId!!,successList.toJson())
                 val sCreateResponse = SCreateResponse<RSyForSpBase>(SResponseType.success)
                 if (failureList.size>0){
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
@@ -183,6 +190,8 @@ object RSyForSpBaseService: SBaseService<RSyForSpBase>(SMybatisDao(RSyForSpBase:
                 }
             }
             if (successList.size>0){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2sp_for","13",rSyForSpBaseList.spaceId!!,successList.toJson())
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<RSyForSpBase>(SResponseType.success)
                     sCreateResponse.message ="失败对象:"+failureList.toJson()

+ 22 - 14
datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyInBdService.kt

@@ -26,12 +26,13 @@
 
 package com.persagy.server.services.rel
 
-import com.persagy.server.services.base.RService
+import com.persagy.base.extensions.toJson
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.rel.RBdInSyList
 import com.persagy.server.datacenter.models.entities.rel.RSyInBd
 import com.persagy.server.datacenter.models.entities.rel.RSyInBdList
-import com.persagy.base.extensions.toJson
-import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.services.base.RService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SBaseResponse
@@ -51,12 +52,13 @@ object RSyInBdService: RService<RSyInBd>(SMybatisDao(RSyInBd::class.java)) {
      */
     fun create(rSyInBd: RSyInBd): SCreateResponse<RSyInBd> {
         return try {
-            val projectId = SPageContext.getHeader("projectId")
-            rSyInBd.projectId = projectId
+
+            rSyInBd.projectId = Opt.projectId
             val isInsert = insert(rSyInBd)
             if (isInsert){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2bd_in","11",rSyInBd.sysId!!,rSyInBd.buildingId!!)
                 SCreateResponse(SResponseType.success)
-
             }else{
                 SCreateResponse(SResponseType.failure)
             }
@@ -77,6 +79,8 @@ object RSyInBdService: RService<RSyInBd>(SMybatisDao(RSyInBd::class.java)) {
             val isDelete = delete(rSyInBd)
             /** 删除成功 */
             if (isDelete) {
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2bd_in","12",rSyInBd.sysId!!,rSyInBd.buildingId!!)
                 val sBaseResponse = SBaseResponse(SResponseType.success)
                 sBaseResponse.message = rSyInBd.toJson()
                 sBaseResponse
@@ -100,7 +104,7 @@ object RSyInBdService: RService<RSyInBd>(SMybatisDao(RSyInBd::class.java)) {
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            delete("sysID = '${rSyInBdList.sysId}'")
+            delete("sysId = '${rSyInBdList.sysId}'")
             val projectId = SPageContext.getHeader("projectId")
             if (rSyInBdList.buildingIdList!=null&&rSyInBdList.buildingIdList!!.size>0){
                 for (buildingId in rSyInBdList.buildingIdList!!){
@@ -110,12 +114,14 @@ object RSyInBdService: RService<RSyInBd>(SMybatisDao(RSyInBd::class.java)) {
                     rSyInBd.projectId = projectId
                     val replace = replace(rSyInBd)
                     if (replace){
-                        successList.add(rSyInBd)
+                        successList.add(buildingId)
                     }else{
                         failureList.add(rSyInBd)
                     }
                 }
                 if (successList.size>0){
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "sy2bd_in","13",rSyInBdList.sysId!!,successList.toJson())
                     val sCreateResponse = SCreateResponse<RSyInBd>(SResponseType.success)
                     if (failureList.size>0){
                         sCreateResponse.message ="失败对象:"+failureList.toJson()
@@ -145,21 +151,21 @@ object RSyInBdService: RService<RSyInBd>(SMybatisDao(RSyInBd::class.java)) {
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-//            delete("sysID = '${rSyInBdList.sysId}'")
-            val projectId = SPageContext.getHeader("projectId")
             for (buildingId in rSyInBdList.buildingIdList!!){
                 val rSyInBd = RSyInBd()
                 rSyInBd.sysId = rSyInBdList.sysId
                 rSyInBd.buildingId = buildingId
-                rSyInBd.projectId = projectId
+                rSyInBd.projectId = Opt.projectId
                 val replace = replace(rSyInBd)
                 if (replace){
-                    successList.add(rSyInBd)
+                    successList.add(buildingId)
                 }else{
                     failureList.add(rSyInBd)
                 }
             }
             if (successList.size>0){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2bd_in","14",rSyInBdList.sysId!!,successList.toJson()!!)
                 val sCreateResponse = SCreateResponse<RSyInBd>(SResponseType.success)
                 if (failureList.size>0){
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
@@ -185,7 +191,7 @@ object RSyInBdService: RService<RSyInBd>(SMybatisDao(RSyInBd::class.java)) {
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            delete("buildingID = '${rBdInSyList.buildingId}'")
+            delete("buildingId = '${rBdInSyList.buildingId}'")
             val projectId = SPageContext.getHeader("projectId")
             for (sysId in rBdInSyList.sysIdList!!){
                 val rSyInBd = RSyInBd()
@@ -194,12 +200,14 @@ object RSyInBdService: RService<RSyInBd>(SMybatisDao(RSyInBd::class.java)) {
                 rSyInBd.projectId = projectId
                 val replace = replace(rSyInBd)
                 if (replace){
-                    successList.add(rSyInBd)
+                    successList.add(sysId)
                 }else{
                     failureList.add(rSyInBd)
                 }
             }
             if (successList.size>0){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2bd_in","13",rBdInSyList.buildingId!!,successList.toJson()!!)
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<RSyInBd>(SResponseType.success)
                     sCreateResponse.message ="失败对象:"+failureList.toJson()

+ 16 - 5
datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyInFlService.kt

@@ -29,6 +29,7 @@ package com.persagy.server.services.rel
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.objects.Floor
 import com.persagy.server.datacenter.models.entities.rel.RFlInSyList
 import com.persagy.server.datacenter.models.entities.rel.RSyInFl
@@ -63,6 +64,8 @@ object RSyInFlService: RService<RSyInFl>(SMybatisDao(RSyInFl::class.java)) {
             }
             val isInsert = insert(rSyInFl)
             if (isInsert){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2fl","11",rSyInFl.sysId!!,rSyInFl.floorId!!)
                 SCreateResponse(SResponseType.success)
             }else{
                 SCreateResponse(SResponseType.failure)
@@ -84,6 +87,8 @@ object RSyInFlService: RService<RSyInFl>(SMybatisDao(RSyInFl::class.java)) {
             val isDelete = delete(rSyInFl)
             /** 删除成功 */
             if (isDelete) {
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2fl","12",rSyInFl.sysId!!,rSyInFl.floorId!!)
                 val sBaseResponse = SBaseResponse(SResponseType.success)
                 sBaseResponse.message = rSyInFl.toJson()
                 sBaseResponse
@@ -107,7 +112,7 @@ object RSyInFlService: RService<RSyInFl>(SMybatisDao(RSyInFl::class.java)) {
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            delete("sysID = '${rSyInFlList.sysId}'")
+            delete("sysId = '${rSyInFlList.sysId}'")
             val projectId = SPageContext.getHeader("projectId")
             val floorService = SObjectService(SMybatisDao(Floor::class.java))
             if (!rSyInFlList.floorIdList.isNullOrEmpty()){
@@ -124,12 +129,14 @@ object RSyInFlService: RService<RSyInFl>(SMybatisDao(RSyInFl::class.java)) {
 
                     val replace = replace(rSyInFl)
                     if (replace){
-                        successList.add(rSyInFl)
+                        successList.add(floorId)
                     }else{
                         failureList.add(rSyInFl)
                     }
                 }
                 if (successList.size>0){
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "sy2fl","13",rSyInFlList.sysId!!,successList.toJson())
                     val sCreateResponse = SCreateResponse<RSyInFl>(SResponseType.success)
                     if (failureList.size>0){
                         sCreateResponse.message ="失败对象:"+failureList.toJson()
@@ -176,12 +183,14 @@ object RSyInFlService: RService<RSyInFl>(SMybatisDao(RSyInFl::class.java)) {
 
                 val replace = replace(rSyInFl)
                 if (replace){
-                    successList.add(rSyInFl)
+                    successList.add(floorId)
                 }else{
                     failureList.add(rSyInFl)
                 }
             }
             if (successList.size>0){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2fl","14",rSyInFlList.sysId!!,successList.toJson())
                 val sCreateResponse = SCreateResponse<RSyInFl>(SResponseType.success)
                 if (failureList.size>0){
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
@@ -208,7 +217,7 @@ object RSyInFlService: RService<RSyInFl>(SMybatisDao(RSyInFl::class.java)) {
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            delete("floorID = '${rFlInSyList.floorId}'")
+            delete("floorId = '${rFlInSyList.floorId}'")
             val projectId = SPageContext.getHeader("projectId")
             val floorService = SObjectService(SMybatisDao(Floor::class.java))
             for (sysId in rFlInSyList.sysIdList!!){
@@ -224,12 +233,14 @@ object RSyInFlService: RService<RSyInFl>(SMybatisDao(RSyInFl::class.java)) {
 
                 val replace = replace(rSyInBd)
                 if (replace){
-                    successList.add(rSyInBd)
+                    successList.add(sysId)
                 }else{
                     failureList.add(rSyInBd)
                 }
             }
             if (successList.size>0){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2fl","13",rFlInSyList.floorId!!,successList.toJson())
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<RSyInFl>(SResponseType.success)
                     sCreateResponse.message ="失败对象:"+failureList.toJson()

+ 20 - 83
datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyInShService.kt

@@ -28,6 +28,7 @@ package com.persagy.server.services.rel
 
 import com.persagy.base.extensions.toJson
 import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.rel.RShInSyList
 import com.persagy.server.datacenter.models.entities.rel.RSyInSh
 import com.persagy.server.datacenter.models.entities.rel.RSyInShList
@@ -36,7 +37,6 @@ import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCreateResponse
-import org.json.JSONObject
 
 /**
  * 系统所在竖井关系服务
@@ -52,20 +52,12 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
      */
     fun create(rSyInSh: RSyInSh): SCreateResponse<RSyInSh> {
         return try {
-            val projectId = SPageContext.getHeader("projectId")
-            rSyInSh.projectId = projectId
+
+            rSyInSh.projectId = Opt.projectId
             val isInsert = insert(rSyInSh)
             if (isInsert){
-                val jsonObject = JSONObject()
-                jsonObject.put("type", "11")
-                jsonObject.put("projectId", projectId)
-                jsonObject.put("id", rSyInSh.shaftId)
-                jsonObject.put("obj_type", "Sy2Sh")
-                jsonObject.put("linkId",rSyInSh.sysId)
-
                 /** 发送消息 */
-//                messageHandler.sendMessage(jsonObject.toString())
-//                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Sy2Sh", "11", IdUtils.uuidCreate(),  rSyInSh.sysId!!, rSyInSh.shaftId!!),false)
+                rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sh","11",rSyInSh.sysId!!,rSyInSh.shaftId!!)
                 SCreateResponse(SResponseType.success)
             }else{
                 SCreateResponse(SResponseType.failure)
@@ -84,19 +76,11 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
      */
     fun deletes(rSyInSh: RSyInSh): SBaseResponse {
         return try {
-            val projectId = SPageContext.getHeader("projectId")
             val isDelete = delete(rSyInSh)
             /** 删除成功 */
             if (isDelete) {
-                val jsonObject = JSONObject()
-                jsonObject.put("type", "12")
-                jsonObject.put("projectId", projectId)
-                jsonObject.put("id", rSyInSh.shaftId)
-                jsonObject.put("obj_type", "Sy2Sh")
-                jsonObject.put("linkId",rSyInSh.sysId)
                 /** 发送消息 */
-//                messageHandler.sendMessage(jsonObject.toString())
-//                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Sy2Sh", "12", IdUtils.uuidCreate(),  rSyInSh.sysId!!, rSyInSh.shaftId!!),false)
+                rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sh","12",rSyInSh.sysId!!,rSyInSh.shaftId!!)
                 val sBaseResponse = SBaseResponse(SResponseType.success)
                 sBaseResponse.message = rSyInSh.toJson()
                 sBaseResponse
@@ -120,7 +104,7 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            delete("sysID = '${rSyInShList.sysId}'")
+            delete("sysId = '${rSyInShList.sysId}'")
             val projectId = SPageContext.getHeader("projectId")
             for (shaftId in rSyInShList.shaftIdList!!){
                 val rSyInSh = RSyInSh()
@@ -129,22 +113,14 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
                 rSyInSh.projectId = projectId
                 val replace = replace(rSyInSh)
                 if (replace){
-                    successList.add(rSyInSh)
+                    successList.add(shaftId)
                 }else{
                     failureList.add(rSyInSh)
                 }
             }
             if (successList.size>0){
-                val jsonObject = JSONObject()
-                jsonObject.put("type", "13")
-                jsonObject.put("projectId", projectId)
-                jsonObject.put("id", rSyInShList.sysId)
-                jsonObject.put("obj_type", "Sy2Sh")
-                jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-//                messageHandler.sendMessage(jsonObject.toString())
-//                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Sy2Sh", "13", IdUtils.uuidCreate(),  rSyInShList.sysId!!,
-//                        null),false)
+                rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sh","13",rSyInShList.sysId!!,successList.toJson())
                 val sCreateResponse = SCreateResponse<RSyInSh>(SResponseType.success)
                 if (failureList.size>0){
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
@@ -170,7 +146,7 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            delete("shaftID = '${rShInSyList.shaftId}'")
+            delete("shaftId = '${rShInSyList.shaftId}'")
             val projectId = SPageContext.getHeader("projectId")
             for (sysId in rShInSyList.sysIdList!!){
                 val rSyInSh = RSyInSh()
@@ -179,23 +155,14 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
                 rSyInSh.projectId = projectId
                 val replace = replace(rSyInSh)
                 if (replace){
-                    successList.add(rSyInSh)
+                    successList.add(sysId)
                 }else{
                     failureList.add(rSyInSh)
                 }
             }
             if (successList.size>0){
-                val jsonObject = JSONObject()
-                jsonObject.put("type", "13")
-                jsonObject.put("projectId", projectId)
-                jsonObject.put("id", rShInSyList.shaftId)
-                jsonObject.put("obj_type", "Sy2Sh")
-                jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-//                messageHandler.sendMessage(jsonObject.toString())
-//                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Sy2Sh", "13", IdUtils.uuidCreate(),  rShInSyList.shaftId!!,
-//                        null),false)
-
+                rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sh","13",rShInSyList.shaftId!!,successList.toJson())
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<RSyInSh>(SResponseType.success)
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
@@ -224,7 +191,6 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-//            delete("shaftID = '${rShInSyList.shaftId}'")
             val projectId = SPageContext.getHeader("projectId")
             for (sysId in rShInSyList.sysIdList!!){
                 val rSyInSh = RSyInSh()
@@ -233,22 +199,14 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
                 rSyInSh.projectId = projectId
                 val replace = replace(rSyInSh)
                 if (replace){
-                    successList.add(rSyInSh)
+                    successList.add(sysId)
                 }else{
                     failureList.add(rSyInSh)
                 }
             }
             if (successList.size>0){
-                val jsonObject = JSONObject()
-                jsonObject.put("type", "14")
-                jsonObject.put("projectId", projectId)
-                jsonObject.put("id", rShInSyList.shaftId)
-                jsonObject.put("obj_type", "Sy2Sh")
-                jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-//                messageHandler.sendMessage(jsonObject.toString())
-//                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Sy2Sh", "14", IdUtils.uuidCreate(),  rShInSyList.shaftId!!,
-//                        null),false)
+                rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sh","14",rShInSyList.shaftId!!,successList.toJson())
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<RSyInSh>(SResponseType.success)
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
@@ -277,29 +235,22 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            val projectId = SPageContext.getHeader("projectId")
+
             for (shaftId in rSyInShList.shaftIdList!!){
                 val rSyInSh = RSyInSh()
                 rSyInSh.sysId = rSyInShList.sysId
                 rSyInSh.shaftId = shaftId
-                rSyInSh.projectId = projectId
+                rSyInSh.projectId = Opt.projectId
                 val replace = replace(rSyInSh)
                 if (replace){
-                    successList.add(rSyInSh)
+                    successList.add(shaftId)
                 }else{
                     failureList.add(rSyInSh)
                 }
             }
             if (successList.size>0){
-                val jsonObject = JSONObject()
-                jsonObject.put("type", "14")
-                jsonObject.put("projectId", projectId)
-                jsonObject.put("id", rSyInShList.sysId)
-                jsonObject.put("obj_type", "Sy2Sh")
-                jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-//                messageHandler.sendMessage(jsonObject.toString())
-
+                rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sh","14",rSyInShList.sysId!!,successList.toJson())
                 val sCreateResponse = SCreateResponse<RSyInSh>(SResponseType.success)
                 if (failureList.size>0){
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
@@ -319,17 +270,9 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
      */
     override fun onCreateSuccess(entityList: ArrayList<RSyInSh>) {
         super.onCreateSuccess(entityList)
-        val projectId = SPageContext.getHeader("projectId")
         for (rSyInSh in entityList){
-            val jsonObject = JSONObject()
-            jsonObject.put("type", "11")
-            jsonObject.put("projectId", projectId)
-            jsonObject.put("id", rSyInSh.shaftId)
-            jsonObject.put("obj_type", "Sy2Sh")
-            jsonObject.put("linkId",rSyInSh.sysId)
-
             /** 发送消息 */
-//            messageHandler.sendMessage(jsonObject.toString())
+            rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sh","11",rSyInSh.sysId!!,rSyInSh.shaftId!!)
         }
 
     } // Function onCreateSuccess()
@@ -341,15 +284,9 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
         super.onDeleteSuccess(entityList)
         val projectId = SPageContext.getHeader("projectId")
         for (rSyInSh in entityList){
-            val jsonObject = JSONObject()
-            jsonObject.put("type", "12")
-            jsonObject.put("projectId", projectId)
-            jsonObject.put("id", rSyInSh.shaftId)
-            jsonObject.put("obj_type", "Sy2Sh")
-            jsonObject.put("linkId",rSyInSh.sysId)
             /** 发送消息 */
-//            messageHandler.sendMessage(jsonObject.toString())
+            rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sh","12",rSyInSh.sysId!!,rSyInSh.shaftId!!)
         }
     } // Function onDeleteSuccess()
 
-} // Object RSyInShService
+}

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

@@ -29,6 +29,7 @@ package com.persagy.server.services.rel
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.rel.RSpInSyBaseList
 import com.persagy.server.datacenter.models.entities.rel.RSy2Sp
 import com.persagy.server.datacenter.models.entities.rel.RSyInSpBase
@@ -42,7 +43,6 @@ import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.requests.SCreateRequest
 import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCreateResponse
-import org.json.JSONObject
 
 /**
  * 系统所在业务空间关系服务
@@ -70,44 +70,9 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
                 rSy2Sp.projectId = projectId
                 val isInsert = rSy2SpService.insert(rSy2Sp)
                 if (isInsert){
-                    val jsonObject = JSONObject()
-                    jsonObject.put("type", "11")
-                    jsonObject.put("projectId", projectId)
-                    jsonObject.put("id", rSyInSpBase.spaceId)
-                    jsonObject.put("obj_type", "Sy2Sp")
-                    jsonObject.put("linkId",rSyInSpBase.sysId)
                     /** 发送消息 */
-//                    messageHandler.sendMessage(jsonObject.toString())
+                    rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sp","11",rSyInSpBase.sysId!!,rSyInSpBase.spaceId!!)
                 }
-//                if (rSyInSpBase.objectType == "HeatingZone"){
-//                    RSyInSpZoneHeatingService.create(rSyInSpBase)
-//                }else if (rSyInSpBase.objectType == "CleanZone"){
-//                    RSyInSpZoneCleanService.create(rSyInSpBase)
-//                }else if (rSyInSpBase.objectType == "DomesticWaterSupplyZone"){
-//                    RSyInSpZoneDomesticWaterSupplyService.create(rSyInSpBase)
-//                }else if (rSyInSpBase.objectType == "NetworkZone" ){
-//                    RSyInSpZoneNetworkService.create(rSyInSpBase)
-//                }else if (rSyInSpBase.objectType == "TenantZone"){
-//                    RSyInSpZoneTenantService.create(rSyInSpBase)
-//                }else if (rSyInSpBase.objectType == "AirConditioningZone"){
-//                    RSyInSpZoneAirConditioningService.create(rSyInSpBase)
-//                }else if (rSyInSpBase.objectType == "FunctionZone"){
-//                    RSyInSpZoneFunctionService.create(rSyInSpBase)
-//                }else if (rSyInSpBase.objectType == "FireZone"){
-//                    RSyInSpZoneFireService.create(rSyInSpBase)
-//                }else if (rSyInSpBase.objectType == "SecurityZone"){
-//                    RSyInSpZoneSecurityService.create(rSyInSpBase)
-//                }else if (rSyInSpBase.objectType == "GeneralZone"){
-//                    RSyInSpZoneGeneralService.create(rSyInSpBase)
-//                }else if (rSyInSpBase.objectType == "PowerSupplyZone"){
-//                    RSyInSpZonePowerSupplyService.create(rSyInSpBase)
-//                }else if (rSyInSpBase.objectType == "LightingZone"){
-//                    RSyInSpZoneLightingService.create(rSyInSpBase)
-//                }else{
-//                    val sCreateResponse = SCreateResponse<RSyInSpBase>(SResponseType.failure)
-//                    sCreateResponse.message = "空间分区类型不存在:" + rSyInSpBase.objectType
-//                    sCreateResponse
-//                }
             }
             try {
                 /** 处理关系标记 */
@@ -151,14 +116,8 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
                 rSy2Sp.zoneType = type
                 val isDelete = rSy2SpService.delete(rSy2Sp)
                 if (isDelete) {
-                    val jsonObject = JSONObject()
-                    jsonObject.put("type", "12")
-                    jsonObject.put("projectId", projectId)
-                    jsonObject.put("id", rSyInSpBase.spaceId)
-                    jsonObject.put("obj_type", "Sy2Sp")
-                    jsonObject.put("linkId",rSyInSpBase.sysId)
                     /** 发送消息 */
-//                    messageHandler.sendMessage(jsonObject.toString())
+                    rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sp","12",rSyInSpBase.sysId!!,rSyInSpBase.spaceId!!)
                 }
             }
             try {
@@ -179,35 +138,6 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
 
             val sBaseResponse = SBaseResponse(SResponseType.success)
             sBaseResponse
-//            if (type == "HeatingZone"){
-//                    RSyInSpZoneHeatingService.deletes(rSyInSpBaseList)
-//            }else if (type == "CleanZone"){
-//                RSyInSpZoneCleanService.deletes(rSyInSpBaseList)
-//            }else if (type == "DomesticWaterSupplyZone"){
-//                RSyInSpZoneDomesticWaterSupplyService.deletes(rSyInSpBaseList)
-//            }else if (type == "NetworkZone" ){
-//                RSyInSpZoneNetworkService.deletes(rSyInSpBaseList)
-//            }else if (type == "TenantZone"){
-//                RSyInSpZoneTenantService.deletes(rSyInSpBaseList)
-//            }else if (type == "AirConditioningZone"){
-//                RSyInSpZoneAirConditioningService.deletes(rSyInSpBaseList)
-//            }else if (type == "FunctionZone"){
-//                RSyInSpZoneFunctionService.deletes(rSyInSpBaseList)
-//            }else if (type == "FireZone"){
-//                RSyInSpZoneFireService.deletes(rSyInSpBaseList)
-//            }else if (type == "SecurityZone"){
-//                RSyInSpZoneSecurityService.deletes(rSyInSpBaseList)
-//            }else if (type == "GeneralZone"){
-//                RSyInSpZoneGeneralService.deletes(rSyInSpBaseList)
-//            }else if (type == "PowerSupplyZone"){
-//                RSyInSpZonePowerSupplyService.deletes(rSyInSpBaseList)
-//            }else if (type == "LightingZone"){
-//                RSyInSpZoneLightingService.deletes(rSyInSpBaseList)
-//            }else{
-//                val sCreateResponse = SCreateResponse<RSyInSpBase>(SResponseType.failure)
-//                sCreateResponse.message = "空间分区类型不存在:$type"
-//                sCreateResponse
-//            }
         } catch (e: Exception) {
             e.printStackTrace()
             return SBaseResponse(SResponseType.failure, e.message!!)
@@ -238,21 +168,14 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
                 rSy2Sp.projectId = projectId
                 val replace = rSy2SpService.replace(rSy2Sp)
                 if (replace){
-                    successList.add(rSy2Sp)
+                    successList.add(spaceId)
                 }else{
                     failureList.add(rSy2Sp)
                 }
             }
             if (successList.size>0){
-                val jsonObject = JSONObject()
-                jsonObject.put("type", "13")
-                jsonObject.put("projectId", projectId)
-                jsonObject.put("id", rSyInSpBaseList.sysId)
-                jsonObject.put("obj_type", "Sy2Sp")
-                jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-//                messageHandler.sendMessage(jsonObject.toString())
-
+                rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sp","13",rSyInSpBaseList.sysId!!,successList.toJson())
                 val sCreateResponse = SCreateResponse<RSyInSpBase>(SResponseType.success)
                 if (failureList.size>0){
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
@@ -292,21 +215,14 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
                 rSy2Sp.type = "sy2sp"
                 val replace = rSy2SpService.replace(rSy2Sp)
                 if (replace){
-                    successList.add(rSy2Sp)
+                    successList.add(sysId)
                 }else{
                     failureList.add(rSy2Sp)
                 }
             }
             if (successList.size>0){
-                val jsonObject = JSONObject()
-                jsonObject.put("type", "13")
-                jsonObject.put("projectId", projectId)
-                jsonObject.put("id", rSyInSpBaseList.spaceId)
-                jsonObject.put("obj_type", "Sy2Sp")
-                jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-//                messageHandler.sendMessage(jsonObject.toString())
-
+                rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sp","13",rSyInSpBaseList.spaceId!!,successList.toJson())
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<RSyInSpBase>(SResponseType.success)
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
@@ -348,21 +264,14 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
                 rSy2Sp.type = "sy2sp"
                 val replace = rSy2SpService.replace(rSy2Sp)
                 if (replace){
-                    successList.add(rSy2Sp)
+                    successList.add(sysId)
                 }else{
                     failureList.add(rSy2Sp)
                 }
             }
             if (successList.size>0){
-                val jsonObject = JSONObject()
-                jsonObject.put("type", "14")
-                jsonObject.put("projectId", projectId)
-                jsonObject.put("id", rSyInSpBase.spaceId)
-                jsonObject.put("obj_type", "Sy2Sp")
-                jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-//                messageHandler.sendMessage(jsonObject.toString())
-
+                rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sp","14",rSyInSpBase.spaceId!!,successList.toJson())
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<RSpInSyBaseList>(SResponseType.success)
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
@@ -375,36 +284,6 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
                 SCreateResponse(SResponseType.failure)
             }
 
-
-//            if (type == "HeatingZone"){
-//                 RSyInSpZoneHeatingService.createsSpSys(rSyInSpBase)
-//            }else if (type == "CleanZone"){
-//                 RSyInSpZoneCleanService.createsSpSys(rSyInSpBase)
-//            }else if (type == "DomesticWaterSupplyZone"){
-//                 RSyInSpZoneDomesticWaterSupplyService.createsSpSys(rSyInSpBase)
-//            }else if (type == "NetworkZone" ){
-//                 RSyInSpZoneNetworkService.createsSpSys(rSyInSpBase)
-//            }else if (type == "TenantZone"){
-//                 RSyInSpZoneTenantService.createsSpSys(rSyInSpBase)
-//            }else if (type == "AirConditioningZone"){
-//                 RSyInSpZoneAirConditioningService.createsSpSys(rSyInSpBase)
-//            }else if (type == "FunctionZone"){
-//                 RSyInSpZoneFunctionService.createsSpSys(rSyInSpBase)
-//            }else if (type == "FireZone"){
-//                  RSyInSpZoneFireService.createsSpSys(rSyInSpBase)
-//            }else if (type == "SecurityZone"){
-//                 RSyInSpZoneSecurityService.createsSpSys(rSyInSpBase)
-//            }else if (type == "GeneralZone"){
-//                 RSyInSpZoneGeneralService.createsSpSys(rSyInSpBase)
-//            }else if (type == "PowerSupplyZone"){
-//                 RSyInSpZonePowerSupplyService.createsSpSys(rSyInSpBase)
-//            }else if (type == "LightingZone"){
-//                RSyInSpZoneLightingService.createsSpSys(rSyInSpBase)
-//            }else{
-//                val sCreateResponse = SCreateResponse<RSpInSyBaseList>(SResponseType.failure)
-//                sCreateResponse.message = "空间分区类型不存在:$type"
-//                sCreateResponse
-//            }
         } catch (e:Exception){
             e.printStackTrace()
             SCreateResponse(SResponseType.failure,e.message.toString())
@@ -436,22 +315,14 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
                 rSy2Sp.type = "sy2sp"
                 val replace = rSy2SpService.replace(rSy2Sp)
                 if (replace){
-                    successList.add(rSy2Sp)
+                    successList.add(spaceId)
                 }else{
                     failureList.add(rSy2Sp)
                 }
             }
             if (successList.size>0){
-                val jsonObject = JSONObject()
-                jsonObject.put("type", "14")
-                jsonObject.put("projectId", projectId)
-                jsonObject.put("id", rSyInSpBase.sysId)
-                jsonObject.put("obj_type", "Sy2Sp")
-                jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-//                messageHandler.sendMessage(jsonObject.toString())
-
-
+                rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sp","14",rSyInSpBase.sysId!!,successList.toJson())
                 val sCreateResponse = SCreateResponse<RSyInSpBaseList>(SResponseType.success)
                 if (failureList.size>0){
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
@@ -461,35 +332,6 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
                 SCreateResponse(SResponseType.failure)
             }
 
-//            if (type == "HeatingZone"){
-//                RSyInSpZoneHeatingService.createSySps(rSyInSpBase)
-//            }else if (type == "CleanZone"){
-//                RSyInSpZoneCleanService.createSySps(rSyInSpBase)
-//            }else if (type == "DomesticWaterSupplyZone"){
-//                RSyInSpZoneDomesticWaterSupplyService.createSySps(rSyInSpBase)
-//            }else if (type == "NetworkZone" ){
-//                RSyInSpZoneNetworkService.createSySps(rSyInSpBase)
-//            }else if (type == "TenantZone"){
-//                RSyInSpZoneTenantService.createSySps(rSyInSpBase)
-//            }else if (type == "AirConditioningZone"){
-//                RSyInSpZoneAirConditioningService.createSySps(rSyInSpBase)
-//            }else if (type == "FunctionZone"){
-//                RSyInSpZoneFunctionService.createSySps(rSyInSpBase)
-//            }else if (type == "FireZone"){
-//                RSyInSpZoneFireService.createSySps(rSyInSpBase)
-//            }else if (type == "SecurityZone"){
-//                RSyInSpZoneSecurityService.createSySps(rSyInSpBase)
-//            }else if (type == "GeneralZone"){
-//                RSyInSpZoneGeneralService.createSySps(rSyInSpBase)
-//            }else if (type == "PowerSupplyZone"){
-//                RSyInSpZonePowerSupplyService.createSySps(rSyInSpBase)
-//            }else if (type == "LightingZone"){
-//                RSyInSpZoneLightingService.createSySps(rSyInSpBase)
-//            }else{
-//                val sCreateResponse = SCreateResponse<RSyInSpBaseList>(SResponseType.failure)
-//                sCreateResponse.message = "空间分区类型不存在:$type"
-//                sCreateResponse
-//            }
         } catch (e:Exception){
             e.printStackTrace()
             SCreateResponse(SResponseType.failure,e.message.toString())
@@ -499,4 +341,4 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
 
 
 
-} // Object RSyInSpBaseService
+}

+ 22 - 196
datacenter/src/main/kotlin/com/persagy/server/services/rel/RTnInSpBaseService.kt

@@ -26,14 +26,15 @@
 
 package com.persagy.server.services.rel
 
-import com.persagy.server.synchronize.MessageHandler
+import com.persagy.base.extensions.toJson
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.rel.RSpInTnBaseList
 import com.persagy.server.datacenter.models.entities.rel.RTn2Sp
 import com.persagy.server.datacenter.models.entities.rel.RTnInSpBase
 import com.persagy.server.datacenter.models.entities.rel.RTnInSpBaseList
-import com.persagy.base.extensions.toJson
-import com.persagy.mybatis.SMybatisDao
-import com.persagy.service.SBaseService
+import com.persagy.server.services.base.RService
+import com.persagy.server.synchronize.MessageHandler
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
@@ -41,14 +42,13 @@ import com.persagy.service.models.requests.SCreateRequest
 import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.utils.SSpringContextUtil
-import org.json.JSONObject
 
 /**
  * 租户所租用的业务空间关系服务
  *
  * @author 付国宝
  */
-object RTnInSpBaseService: SBaseService<RTnInSpBase>(SMybatisDao(RTnInSpBase::class.java)) {
+object RTnInSpBaseService: RService<RTnInSpBase>(SMybatisDao(RTnInSpBase::class.java)) {
 
 
     /** 租户和业务空间的关系 */
@@ -66,27 +66,21 @@ object RTnInSpBaseService: SBaseService<RTnInSpBase>(SMybatisDao(RTnInSpBase::cl
      */
     fun create(type: String,rTnInSpBaseList: SCreateRequest<RTnInSpBase>): SCreateResponse<RTnInSpBase> {
         return try {
-            val projectId = SPageContext.getHeader("projectId")
+
             if (!rTnInSpBaseList.content.isNullOrEmpty()){
                 for (rTnInSpBase in rTnInSpBaseList.content){
                     val rTn2Sp = RTn2Sp()
                     rTn2Sp.id2 = rTnInSpBase.spaceId
                     rTn2Sp.id1 = rTnInSpBase.tenantId
-                    rTn2Sp.projectId = projectId
+                    rTn2Sp.projectId = Opt.projectId
                     rTn2Sp.sign = 1
                     rTn2Sp.zoneType = type
                     rTn2Sp.type = "tn2sp"
                     val insert = rTn2SpService.insert(rTn2Sp)
                     if (insert){
                         try {
-                            val jsonObject = JSONObject()
-                            jsonObject.put("type", "10")
-                            jsonObject.put("projectId", projectId)
-                            jsonObject.put("id", rTnInSpBase.tenantId)
-                            jsonObject.put("linkId", rTnInSpBase.spaceId)
-                            jsonObject.put("obj_type", "TenentInArch")
                             /** 发送消息 */
-                            messageHandler.sendMessage(jsonObject.toString())
+                            rabbitMqService.sendRel(Opt.projectId!!, "tn2sp","11", rTnInSpBase.tenantId!!,rTnInSpBase.spaceId!!)
                         } catch (e: Exception) {
                             e.printStackTrace()
                         }
@@ -95,79 +89,6 @@ object RTnInSpBaseService: SBaseService<RTnInSpBase>(SMybatisDao(RTnInSpBase::cl
             }
             SCreateResponse(SResponseType.success)
 
-//            if (type == "HeatingZone"){
-//                val list = ArrayList<RTnInSpZoneHeating>()
-//                if (!rTnInSpBaseList.content.isNullOrEmpty()){
-//                    for (rTnInSpBase in rTnInSpBaseList.content){
-//                        val rTnInSpZoneHeating = RTnInSpZoneHeating()
-//                        rTnInSpZoneHeating.spaceId = rTnInSpBase.spaceId
-//                        rTnInSpZoneHeating.tenantId = rTnInSpBase.tenantId
-//                        list.add(rTnInSpZoneHeating)
-//                    }
-//                }
-//                RTnInSpZoneHeatingService.create(list)
-//            }else if (type == "CleanZone"){
-//                val list = ArrayList<RTnInSpZoneClean>()
-//                if (!rTnInSpBaseList.content.isNullOrEmpty()){
-//                    for (rTnInSpBase in rTnInSpBaseList.content){
-//                        val rTnInSpZoneHeating = RTnInSpZoneClean()
-//                        rTnInSpZoneHeating.spaceId = rTnInSpBase.spaceId
-//                        rTnInSpZoneHeating.tenantId = rTnInSpBase.tenantId
-//                        list.add(rTnInSpZoneHeating)
-//                    }
-//                }
-//                RTnInSpZoneCleanService.create(list)
-//            }
-////            else if (type == "DomesticWaterSupplyZone"){
-////                RTnInSpZoneDomesticWaterSupplyService.createTn(rTnInSpBaseList)
-////            }else if (type == "NetworkZone" ){
-////                RTnInSpZoneNetworkService.createTn(rTnInSpBaseList)
-////            }
-//            else if (type == "TenantZone"){
-//                val list = ArrayList<RTnInSpZoneTenant>()
-//                if (!rTnInSpBaseList.content.isNullOrEmpty()){
-//                    for (rTnInSpBase in rTnInSpBaseList.content){
-//                        val rTnInSpZoneHeating = RTnInSpZoneTenant()
-//                        rTnInSpZoneHeating.spaceId = rTnInSpBase.spaceId
-//                        rTnInSpZoneHeating.tenantId = rTnInSpBase.tenantId
-//                        list.add(rTnInSpZoneHeating)
-//                    }
-//                }
-//
-//                RTnInSpZoneTenantService.create(list)
-//            }
-////            else if (type == "AirConditioningZone"){
-////                RTnInSpZoneAirConditioningService.createTn(rTnInSpBaseList)
-////            }else if (type == "FunctionZone"){
-////                RTnInSpZoneFunctionService.createTn(rTnInSpBaseList)
-////            }else if (type == "FireZone"){
-////                RTnInSpZoneFireService.createTn(rTnInSpBaseList)
-////            }else if (type == "SecurityZone"){
-////                RTnInSpZoneSecurityService.createTn(rTnInSpBaseList)
-////            }
-//            else if (type == "GeneralZone"){
-//                val list = ArrayList<RTnInSpZoneGeneral>()
-//                if (!rTnInSpBaseList.content.isNullOrEmpty()){
-//                    for (rTnInSpBase in rTnInSpBaseList.content){
-//                        val rTnInSpZoneHeating = RTnInSpZoneGeneral()
-//                        rTnInSpZoneHeating.spaceId = rTnInSpBase.spaceId
-//                        rTnInSpZoneHeating.tenantId = rTnInSpBase.tenantId
-//                        list.add(rTnInSpZoneHeating)
-//                    }
-//                }
-//
-//                RTnInSpZoneGeneralService.create(list)
-//            }
-////            else if (type == "PowerSupplyZone"){
-////                RTnInSpZonePowerSupplyService.createTn(rTnInSpBaseList)
-////            }else if (type == "LightingZone"){
-////                RTnInSpZoneLightingService.createTn(rTnInSpBaseList)
-////            }
-//            else{
-//                val sCreateResponse = SCreateResponse<RTnInSpBase>(SResponseType.failure)
-//                sCreateResponse.message = "空间分区类型不存在:$type"
-//                sCreateResponse
-//            }
         } catch (e: Exception) {
             e.printStackTrace()
             SCreateResponse(SResponseType.failure,e.message.toString())
@@ -182,94 +103,26 @@ object RTnInSpBaseService: SBaseService<RTnInSpBase>(SMybatisDao(RTnInSpBase::cl
      */
     fun deletes(type: String,rTnInSpBaseList: ArrayList<RTnInSpBase>): SBaseResponse {
         return try {
-            val projectId = SPageContext.getHeader("projectId")
             for (rTnInSpBase in rTnInSpBaseList) {
                 val rTn2Sp = RTn2Sp()
                 rTn2Sp.id1 = rTnInSpBase.tenantId
                 rTn2Sp.id2 = rTnInSpBase.spaceId
                 rTn2Sp.zoneType = type
-                rTn2Sp.projectId = projectId
+                rTn2Sp.projectId = Opt.projectId
                 rTn2Sp.type = "tn2sp"
                 val delete = rTn2SpService.delete(rTn2Sp)
                 if (delete){
-                    val jsonObject = JSONObject()
-                    jsonObject.put("type", "12")
-                    jsonObject.put("projectId", projectId)
-                    jsonObject.put("id", rTnInSpBase.tenantId)
-                    jsonObject.put("obj_type", "TenentInArch")
-                    jsonObject.put("linkId",rTnInSpBase.spaceId)
-
                     /** 发送消息 */
-                    messageHandler.sendMessage(jsonObject.toString())
+                    rabbitMqService.sendRel(Opt.projectId!!, "tn2sp","12", rTnInSpBase.tenantId!!,rTnInSpBase.spaceId!!)
                 }
             }
             val sBaseResponse = SBaseResponse(SResponseType.success)
             sBaseResponse
-//            val isDelete = delete(rTnInSpBase)
-//            /** 删除成功 */
-//            if (isDelete) {
-//                val sBaseResponse = SBaseResponse(SResponseType.success)
-//                sBaseResponse.message = rTnInSpBase.toJson()
-//                sBaseResponse
-//            } else {
-//                SBaseResponse(SResponseType.failure)
-//            }
-
-//            if (type == "HeatingZone"){
-//                RTnInSpZoneHeatingService.deletes(rTnInSpBaseList)
-//            }else if (type == "CleanZone"){
-//                RTnInSpZoneCleanService.deletes(rTnInSpBaseList)
-//            }else if (type == "DomesticWaterSupplyZone"){
-//                RTnInSpZoneDomesticWaterSupplyService.deletes(rTnInSpBaseList)
-//            }else if (type == "NetworkZone" ){
-//                RTnInSpZoneNetworkService.deletes(rTnInSpBaseList)
-//            }else
-//                if (type == "TenantZone"){
-//                val list = ArrayList<RTnInSpZoneTenant>()
-//               for (rTnInSpBase in rTnInSpBaseList){
-//                   val rTnInSpZoneTenant = RTnInSpZoneTenant()
-//                   rTnInSpZoneTenant.tenantId = rTnInSpBase.tenantId
-//                   rTnInSpZoneTenant.spaceId = rTnInSpBase.spaceId
-//                   list.add(rTnInSpZoneTenant)
-//               }
-//
-//                RTnInSpZoneTenantService.deletes(list)
-//            }
-//                else if (type == "AirConditioningZone"){
-//                RTnInSpZoneAirConditioningService.deletes(rTnInSpBaseList)
-//            }else if (type == "FunctionZone"){
-//                RTnInSpZoneFunctionService.deletes(rTnInSpBaseList)
-//            }else if (type == "FireZone"){
-//                RTnInSpZoneFireService.deletes(rTnInSpBaseList)
-//            }else if (type == "SecurityZone"){
-//                RTnInSpZoneSecurityService.deletes(rTnInSpBaseList)
-//            }
-//                else if (type == "GeneralZone"){
-//                    val list = ArrayList<RTnInSpZoneGeneral>()
-//                    for (rTnInSpBase in rTnInSpBaseList){
-//                        val rTnInSpZoneTenant = RTnInSpZoneGeneral()
-//                        rTnInSpZoneTenant.tenantId = rTnInSpBase.tenantId
-//                        rTnInSpZoneTenant.spaceId = rTnInSpBase.spaceId
-//                        list.add(rTnInSpZoneTenant)
-//                    }
-//
-//                RTnInSpZoneGeneralService.deletes(list)
-//            }
-//                else if (type == "PowerSupplyZone"){
-//                RTnInSpZonePowerSupplyService.deletes(rTnInSpBaseList)
-//            }else if (type == "LightingZone"){
-//                RTnInSpZoneLightingService.deletes(rTnInSpBaseList)
-//            }
-//                else{
-//                val sCreateResponse = SCreateResponse<RTnInSpBase>(SResponseType.failure)
-//                sCreateResponse.message = "空间分区类型不存在:$type"
-//                sCreateResponse
-//            }
         } catch (e: Exception) {
             e.printStackTrace()
             return SBaseResponse(SResponseType.failure, e.message!!)
         }
-    } // Function deletes()
+    }
 
     /**
      * 创建租户所租用的业务空间关系
@@ -283,7 +136,7 @@ object RTnInSpBaseService: SBaseService<RTnInSpBase>(SMybatisDao(RTnInSpBase::cl
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            rTn2SpService.delete("Id1 = '${rTnInSpBaseList.tenantId}'")
+            rTn2SpService.delete("id1 = '${rTnInSpBaseList.tenantId}'")
             val projectId = SPageContext.getHeader("projectId")
             for (spaceId in rTnInSpBaseList.spaceIdList!!){
                 val rTn2Sp = RTn2Sp()
@@ -295,12 +148,14 @@ object RTnInSpBaseService: SBaseService<RTnInSpBase>(SMybatisDao(RTnInSpBase::cl
                 rTn2Sp.type = "tn2sp"
                 val replace = rTn2SpService.replace(rTn2Sp)
                 if (replace){
-                    successList.add(rTn2Sp)
+                    successList.add(spaceId)
                 }else{
                     failureList.add(rTn2Sp)
                 }
             }
             if (successList.size>0){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "tn2sp","13", rTnInSpBaseList.tenantId!!,successList.toJson())
                 val sCreateResponse = SCreateResponse<RTnInSpBase>(SResponseType.success)
                 if (failureList.size>0){
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
@@ -310,37 +165,6 @@ object RTnInSpBaseService: SBaseService<RTnInSpBase>(SMybatisDao(RTnInSpBase::cl
                 SCreateResponse(SResponseType.failure)
             }
 
-
-
-//            if (type == "HeatingZone"){
-//                RTnInSpZoneHeatingService.createTn(rTnInSpBaseList)
-//            }else if (type == "CleanZone"){
-//                RTnInSpZoneCleanService.createTn(rTnInSpBaseList)
-//            }else if (type == "DomesticWaterSupplyZone"){
-//                RTnInSpZoneDomesticWaterSupplyService.createTn(rTnInSpBaseList)
-//            }else if (type == "NetworkZone" ){
-//                RTnInSpZoneNetworkService.createTn(rTnInSpBaseList)
-//            }else if (type == "TenantZone"){
-//                RTnInSpZoneTenantService.createTn(rTnInSpBaseList)
-//            }else if (type == "AirConditioningZone"){
-//                RTnInSpZoneAirConditioningService.createTn(rTnInSpBaseList)
-//            }else if (type == "FunctionZone"){
-//                RTnInSpZoneFunctionService.createTn(rTnInSpBaseList)
-//            }else if (type == "FireZone"){
-//                RTnInSpZoneFireService.createTn(rTnInSpBaseList)
-//            }else if (type == "SecurityZone"){
-//                RTnInSpZoneSecurityService.createTn(rTnInSpBaseList)
-//            }else if (type == "GeneralZone"){
-//                RTnInSpZoneGeneralService.createTn(rTnInSpBaseList)
-//            }else if (type == "PowerSupplyZone"){
-//                RTnInSpZonePowerSupplyService.createTn(rTnInSpBaseList)
-//            }else if (type == "LightingZone"){
-//                RTnInSpZoneLightingService.createTn(rTnInSpBaseList)
-//            }else{
-//                val sCreateResponse = SCreateResponse<RTnInSpBase>(SResponseType.failure)
-//                sCreateResponse.message = "空间分区类型不存在:$type"
-//                sCreateResponse
-//            }
         } catch (e: Exception) {
             e.printStackTrace()
             SCreateResponse(SResponseType.failure,e.message.toString())
@@ -358,7 +182,7 @@ object RTnInSpBaseService: SBaseService<RTnInSpBase>(SMybatisDao(RTnInSpBase::cl
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            rTn2SpService.delete("Id2 = '${rTnInSpBaseList.spaceId}'")
+            rTn2SpService.delete("id2 = '${rTnInSpBaseList.spaceId}'")
             val projectId = SPageContext.getHeader("projectId")
             for (tenantId in rTnInSpBaseList.tenantIdList!!){
                 val rTn2Sp = RTn2Sp()
@@ -370,12 +194,14 @@ object RTnInSpBaseService: SBaseService<RTnInSpBase>(SMybatisDao(RTnInSpBase::cl
                 rTn2Sp.type = "tn2sp"
                 val replace = rTn2SpService.replace(rTn2Sp)
                 if (replace){
-                    successList.add(rTn2Sp)
+                    successList.add(tenantId)
                 }else{
                     failureList.add(rTn2Sp)
                 }
             }
             if (successList.size>0){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "tn2sp","13", rTnInSpBaseList.spaceId!!,successList.toJson())
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<RTnInSpBase>(SResponseType.success)
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
@@ -391,6 +217,6 @@ object RTnInSpBaseService: SBaseService<RTnInSpBase>(SMybatisDao(RTnInSpBase::cl
             e.printStackTrace()
             SCreateResponse(SResponseType.failure,e.message.toString())
         }
-    } // Function createsSp()
+    }
 
-} // Object RTnInSpBaseService
+}

+ 104 - 18
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationCalcService.kt

@@ -29,6 +29,7 @@ package com.persagy.server.services.relation_calc
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.dictnew.DefClass
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
 import com.persagy.server.datacenter.models.entities.graphtype.block.RelationAddRequest
@@ -42,6 +43,7 @@ import com.persagy.server.datacenter.models.requests.ManualRelationCalcDel
 import com.persagy.server.datacenter.models.requests.ManualRelationCalcRequest
 import com.persagy.server.datacenter.models.response.ManualRelationCalcResponse
 import com.persagy.server.datacenter.models.response.ManualRelationCalcSCreateResponse
+import com.persagy.server.jms.RabbitMqService
 import com.persagy.server.services.objects.*
 import com.persagy.server.services.rel.*
 import com.persagy.service.SObjectService
@@ -50,6 +52,7 @@ import com.persagy.service.models.SCascadeQuery
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.requests.SQueryRequest
 import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.utils.SSpringContextUtil
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 import java.text.SimpleDateFormat
@@ -65,6 +68,10 @@ open class ManualRelationCalcService {
     companion object {
         /** 日志 */
         private val logger = LoggerFactory.getLogger(ManualRelationCalcService::class.java)
+        /** RabbitMQ消息对象 */
+        val rabbitMqService by lazy {
+            SSpringContextUtil.getBean(RabbitMqService::class.java) as RabbitMqService
+        }
     } // Companion object
     /** 资产服务 */
     private val relPropertyService = SObjectService(SMybatisDao(RelProperty::class.java))
@@ -490,8 +497,14 @@ open class ManualRelationCalcService {
                 rEq2Sh.projectId = projectId
                 rEq2Sh.equipId = relProperty.id
                 rEq2Sh.sign = 1
-                REqInShService.replace(rEq2Sh)
+                val replace = REqInShService.replace(rEq2Sh)
+                if (replace){
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "Eq2Sh","11",rEq2Sh.equipId!!,rEq2Sh.shaftId!!)
+                }
             }
+
+
             sCreateResponse.result = SResponseType.success
             sCreateResponse.message = "添加成功"
             return sCreateResponse
@@ -557,7 +570,11 @@ open class ManualRelationCalcService {
                 rEq2Fl.equipId = relEquipment.id
 //                rEq2Fl.type = "eq2fl_for"
                 rEq2Fl.sign = 1
-                REqForFlService.replace(rEq2Fl)
+                val replace = REqForFlService.replace(rEq2Fl)
+                if (replace){
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "Eq2Fl","11",rEq2Fl.equipId!!,rEq2Fl.floorId!!)
+                }
             }
             sCreateResponse.result = SResponseType.success
             sCreateResponse.message = "添加成功"
@@ -625,6 +642,8 @@ open class ManualRelationCalcService {
 //                rEq2Bd.type = "eq2bd_for"
                 rEq2Bd.sign = 1
                 REqForBdService.replace(rEq2Bd)
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "Eq2Bd","11",rEq2Bd.equipId!!,rEq2Bd.buildingId!!)
             }
             sCreateResponse.result = SResponseType.success
             sCreateResponse.message = "添加成功"
@@ -690,6 +709,8 @@ open class ManualRelationCalcService {
                 rSy2Sp.type = "sy2sp_for"
                 rSy2Sp.sign = 1
                 rSy2SpService.replace(rSy2Sp)
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sy2sp_for","11", rSy2Sp.id1!!,rSy2Sp.id2!!)
             }
             sCreateResponse.result = SResponseType.success
             sCreateResponse.message = "添加成功"
@@ -753,7 +774,12 @@ open class ManualRelationCalcService {
                 rSy2Sh.sysId = relProperty.id
 //                rSy2Sh.type = "sy2sh_for"
                 rSy2Sh.sign = 1
-                RSyForShService.replace(rSy2Sh)
+                val replace = RSyForShService.replace(rSy2Sh)
+                if (replace) {
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "sy2sp_for","11", rSy2Sh.sysId!!,rSy2Sh.shaftId!!)
+                }
+
             }
             sCreateResponse.result = SResponseType.success
             sCreateResponse.message = "添加成功"
@@ -818,7 +844,11 @@ open class ManualRelationCalcService {
                 rSy2Fl.sysId = relEquipment.id
 //                rSy2Fl.type = "sy2fl_for"
                 rSy2Fl.sign = 1
-                RSyForFlService.replace(rSy2Fl)
+                val replace = RSyForFlService.replace(rSy2Fl)
+                if (replace) {
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "sy2fl_for","11", rSy2Fl.sysId!!,rSy2Fl.floorId!!)
+                }
             }
             sCreateResponse.result = SResponseType.success
             sCreateResponse.message = "添加成功"
@@ -880,7 +910,11 @@ open class ManualRelationCalcService {
                 rSy2Bd.projectId = projectId
                 rSy2Bd.sysId = relEquipment.id
                 rSy2Bd.sign = 1
-                RSyForBdService.replace(rSy2Bd)
+                val replace = RSyForBdService.replace(rSy2Bd)
+                if (replace) {
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "sy2bd_for","11", rSy2Bd.sysId!!,rSy2Bd.buildingId!!)
+                }
             }
             sCreateResponse.result = SResponseType.success
             sCreateResponse.message = "添加成功"
@@ -967,7 +1001,11 @@ open class ManualRelationCalcService {
                     rSp2Sp.id2 = relZoneTo.id
                     rSp2Sp.type = "sp2sp_ConvectionNetwork_1"
                     rSp2Sp.zoneType = relZoneSpace.objectType
-                    rSp2SpService.replace(rSp2Sp)
+                    val replace = rSp2SpService.replace(rSp2Sp)
+                    if (replace) {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_ConvectionNetwork_1","11", rSp2Sp.id1!!,rSp2Sp.id2!!)
+                    }
                 }
             }else if (relationAddRequest.relType == "sp2sp_ConvectionNetwork_2"){
                 for (relZoneTo in relZoneToSpaceList) {
@@ -978,7 +1016,11 @@ open class ManualRelationCalcService {
                     rSp2Sp.id2 = relZoneTo.id
                     rSp2Sp.type = "sp2sp_ConvectionNetwork_2"
                     rSp2Sp.zoneType = relZoneSpace.objectType
-                    rSp2SpService.replace(rSp2Sp)
+                    val replace = rSp2SpService.replace(rSp2Sp)
+                    if (replace) {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_ConvectionNetwork_2","11", rSp2Sp.id1!!,rSp2Sp.id2!!)
+                    }
                 }
             }else if (relationAddRequest.relType == "sp2sp_ConvectionNetwork_3"){
                 for (relZoneTo in relZoneToSpaceList) {
@@ -989,7 +1031,11 @@ open class ManualRelationCalcService {
                     rSp2Sp.id2 = relZoneTo.id
                     rSp2Sp.type = "sp2sp_ConvectionNetwork_3"
                     rSp2Sp.zoneType = relZoneSpace.objectType
-                    rSp2SpService.replace(rSp2Sp)
+                    val replace = rSp2SpService.replace(rSp2Sp)
+                    if (replace) {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_ConvectionNetwork_3","11", rSp2Sp.id1!!,rSp2Sp.id2!!)
+                    }
                 }
             }else if (relationAddRequest.relType == "sp2sp_SpaceNeighborhood_5"){
                 for (relZoneTo in relZoneToSpaceList) {
@@ -1000,7 +1046,11 @@ open class ManualRelationCalcService {
                     rSp2Sp.id2 = relZoneTo.id
                     rSp2Sp.type = "sp2sp_SpaceNeighborhood_5"
                     rSp2Sp.zoneType = relZoneSpace.objectType
-                    rSp2SpService.replace(rSp2Sp)
+                    val replace = rSp2SpService.replace(rSp2Sp)
+                    if (replace) {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_SpaceNeighborhood_5","11", rSp2Sp.id1!!,rSp2Sp.id2!!)
+                    }
                 }
             }else if (relationAddRequest.relType == "sp2sp_SpaceNeighborhood_2"){
                 for (relZoneTo in relZoneToSpaceList) {
@@ -1011,7 +1061,11 @@ open class ManualRelationCalcService {
                     rSp2Sp.id2 = relZoneTo.id
                     rSp2Sp.type = "sp2sp_SpaceNeighborhood_2"
                     rSp2Sp.zoneType = relZoneSpace.objectType
-                    rSp2SpService.replace(rSp2Sp)
+                    val replace = rSp2SpService.replace(rSp2Sp)
+                    if (replace) {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_SpaceNeighborhood_2","11", rSp2Sp.id1!!,rSp2Sp.id2!!)
+                    }
                 }
             }else if (relationAddRequest.relType == "sp2sp_SpaceNeighborhood_4"){
                 for (relZoneTo in relZoneToSpaceList) {
@@ -1022,7 +1076,11 @@ open class ManualRelationCalcService {
                     rSp2Sp.id2 = relZoneTo.id
                     rSp2Sp.type = "sp2sp_SpaceNeighborhood_4"
                     rSp2Sp.zoneType = relZoneSpace.objectType
-                    rSp2SpService.replace(rSp2Sp)
+                    val replace = rSp2SpService.replace(rSp2Sp)
+                    if (replace) {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_SpaceNeighborhood_4","11", rSp2Sp.id1!!,rSp2Sp.id2!!)
+                    }
                 }
             }else if (relationAddRequest.relType == "sp2sp_TrafficNetwork_3"){
                 for (relZoneTo in relZoneToSpaceList) {
@@ -1033,7 +1091,11 @@ open class ManualRelationCalcService {
                     rSp2Sp.id2 = relZoneTo.id
                     rSp2Sp.type = "sp2sp_TrafficNetwork_3"
                     rSp2Sp.zoneType = relZoneSpace.objectType
-                    rSp2SpService.replace(rSp2Sp)
+                    val replace = rSp2SpService.replace(rSp2Sp)
+                    if (replace) {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_TrafficNetwork_3","11", rSp2Sp.id1!!,rSp2Sp.id2!!)
+                    }
                 }
             }else if (relationAddRequest.relType == "sp2sp_TrafficNetwork_2"){
                 for (relZoneTo in relZoneToSpaceList) {
@@ -1044,7 +1106,11 @@ open class ManualRelationCalcService {
                     rSp2Sp.id2 = relZoneTo.id
                     rSp2Sp.type = "sp2sp_TrafficNetwork_2"
                     rSp2Sp.zoneType = relZoneSpace.objectType
-                    rSp2SpService.replace(rSp2Sp)
+                    val replace = rSp2SpService.replace(rSp2Sp)
+                    if (replace) {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_TrafficNetwork_2","11", rSp2Sp.id1!!,rSp2Sp.id2!!)
+                    }
                 }
             }else if (relationAddRequest.relType == "sp2sp_RadiationNetwork_1"){
                 for (relZoneTo in relZoneToSpaceList) {
@@ -1055,7 +1121,11 @@ open class ManualRelationCalcService {
                     rSp2Sp.id2 = relZoneTo.id
                     rSp2Sp.type = "sp2sp_RadiationNetwork_1"
                     rSp2Sp.zoneType = relZoneSpace.objectType
-                    rSp2SpService.replace(rSp2Sp)
+                    val replace = rSp2SpService.replace(rSp2Sp)
+                    if (replace) {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_RadiationNetwork_1","11", rSp2Sp.id1!!,rSp2Sp.id2!!)
+                    }
                 }
             }else if (relationAddRequest.relType == "sp2sp_RadiationNetwork_2"){
                 for (relZoneTo in relZoneToSpaceList) {
@@ -1066,7 +1136,11 @@ open class ManualRelationCalcService {
                     rSp2Sp.id2 = relZoneTo.id
                     rSp2Sp.type = "sp2sp_RadiationNetwork_2"
                     rSp2Sp.zoneType = relZoneSpace.objectType
-                    rSp2SpService.replace(rSp2Sp)
+                    val replace = rSp2SpService.replace(rSp2Sp)
+                    if (replace) {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_RadiationNetwork_2","11", rSp2Sp.id1!!,rSp2Sp.id2!!)
+                    }
                 }
             }else if (relationAddRequest.relType == "sp2sp_SpaceNeighborhood_1"){
                 for (relZoneTo in relZoneToSpaceList) {
@@ -1077,7 +1151,11 @@ open class ManualRelationCalcService {
                     rSp2Sp.id2 = relZoneTo.id
                     rSp2Sp.type = "sp2sp_SpaceNeighborhood_1"
                     rSp2Sp.zoneType = relZoneSpace.objectType
-                    rSp2SpService.replace(rSp2Sp)
+                    val replace = rSp2SpService.replace(rSp2Sp)
+                    if (replace) {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_SpaceNeighborhood_1","11", rSp2Sp.id1!!,rSp2Sp.id2!!)
+                    }
                 }
             }else if (relationAddRequest.relType == "sp2sp_TrafficNetwork_1"){
                 for (relZoneTo in relZoneToSpaceList) {
@@ -1088,7 +1166,11 @@ open class ManualRelationCalcService {
                     rSp2Sp.id2 = relZoneTo.id
                     rSp2Sp.type = "sp2sp_TrafficNetwork_1"
                     rSp2Sp.zoneType = relZoneSpace.objectType
-                    rSp2SpService.replace(rSp2Sp)
+                    val replace = rSp2SpService.replace(rSp2Sp)
+                    if (replace) {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_TrafficNetwork_1","11", rSp2Sp.id1!!,rSp2Sp.id2!!)
+                    }
                 }
             }else if (relationAddRequest.relType == "sp2sp_SpaceNeighborhood_3"){
                 for (relZoneTo in relZoneToSpaceList) {
@@ -1099,7 +1181,11 @@ open class ManualRelationCalcService {
                     rSp2Sp.id2 = relZoneTo.id
                     rSp2Sp.type = "sp2sp_SpaceNeighborhood_3"
                     rSp2Sp.zoneType = relZoneSpace.objectType
-                    rSp2SpService.replace(rSp2Sp)
+                    val replace = rSp2SpService.replace(rSp2Sp)
+                    if (replace) {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_SpaceNeighborhood_3","11", rSp2Sp.id1!!,rSp2Sp.id2!!)
+                    }
                 }
             }
             sCreateResponse.result = SResponseType.success

+ 213 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/jms/DataCenterSync.kt

@@ -28,7 +28,6 @@ package com.persagy.server.syn.jms
 
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.persagy.server.datacenter.models.entities.assistant.PointPosition
 import com.persagy.server.datacenter.models.jms.SynchronousMessage
 import com.persagy.server.datacenter.models.jms.SynchronousMessageRel
 import com.persagy.server.syn.Configure
@@ -189,6 +188,219 @@ class DataCenterSync {
                 "Sh2Sh" -> {
                     /** 竖井贯通关系 */
                 }
+                "sy2sp_for" -> {
+                    /** 系统服务于业务空间 */
+                }
+                "sy2sh_for" -> {
+                    /** 系统服务于竖井 */
+                }
+                "sy2fl_for" ->{
+                    /** 系统服务于楼层 */
+                }
+                "sy2bd_for" -> {
+                    /** 系统服务于建筑体 */
+                }
+                "sp2sp_ConvectionNetwork_1" ->{
+                    /**空间 空气自然对流 */
+                }
+                "sp2sp_ConvectionNetwork_2" ->{
+                    /** 空间空气混合机械通风 */
+                }
+                "sp2sp_ConvectionNetwork_3" -> {
+                    /** 空气单向机械通风 */
+                }
+                "sp2sp_SpaceNeighborhood_5" ->{
+                    /** 空间连通关系 */
+                }
+                "sp2sp_SpaceNeighborhood_2" -> {
+                    /** 空间隔断有门 */
+                }
+                "sp2sp_SpaceNeighborhood_4" -> {
+                    /** 空间隔断有门窗 */
+                }
+                "sp2sp_TrafficNetwork_3" -> {
+                    /** 空间消防常关交通 */
+                }
+                "sp2sp_TrafficNetwork_2" -> {
+                    /** 空间消防常开交通 */
+                }
+                "sp2sp_RadiationNetwork_1" -> {
+                    /** 空间光照连通 */
+                }
+                "sp2sp_RadiationNetwork_2" -> {
+                    /** 空间光照透明隔断 */
+                }
+                "sp2sp_SpaceNeighborhood_1" -> {
+                    /** 空间隔断无门窗 */
+                }
+                "sp2sp_TrafficNetwork_1" -> {
+                    /** 空间普通交通 */
+                }
+                "sp2sp_SpaceNeighborhood_3" -> {
+                    /** 空间隔断有窗 */
+                }
+                "eq2eq_LUDistribution_1" -> {
+                    /** 低压配电普通连接 */
+                }
+                "eq2eq_LUDistribution_2" ->{
+                    /** 低压配电互备连接 */
+                }
+                "eq2eq_HUDistribution_1" ->{
+                    /** 高压变配电普通连接 */
+                }
+                "eq2eq_HUDistribution_2" ->{
+                    /** 高压变配电互备连接 */
+                }
+                "eq2eq_EquipPower_1" ->{
+                    /** 设备常规电源 */
+                }
+                "eq2eq_EquipPower_2" ->{
+                    /** 设备备用电源 */
+                }
+                "eq2eq_EquipPower_3" ->{
+                    /** 系统常规电源 */
+                }
+                "eq2eq_EquipPower_4" ->{
+                    /** 系统备用电源 */
+                }
+                "eq2eq_ACAirNetwork_1" ->{
+                    /** 空调送风 */
+                }
+                "eq2eq_ACAirNetwork_3" ->{
+                    /** 空调排风 */
+                }
+                "eq2eq_ACAirNetwork_2" ->{
+                    /** 空调回风 */
+                }
+                "eq2eq_ChillWaterLoop_4" ->{
+                    /** 空调冷冻水补水 */
+                }
+                "eq2eq_ChillWaterLoop_1" -> {
+                    /** 空调冷冻水供水 */
+                }
+                "eq2eq_ChillWaterLoop_3" ->{
+                    /** 空调冷冻水旁通 */
+                }
+                "eq2eq_ChillWaterLoop_2" -> {
+                    /**  空调冷冻水回水*/
+                }
+                "eq2eq_CondWaterNetwork_1" -> {
+                    /** 空调冷凝水网络 */
+                }
+                "eq2eq_CoolingWaterLoop_4" -> {
+                    /** 空调冷却水补水 */
+                }
+                "eq2eq_CoolingWaterLoop_1" ->{
+                    /** 空调冷却水供水 */
+                }
+                "eq2eq_CoolingWaterLoop_3" -> {
+                    /** 空调冷却水旁通 */
+                }
+                "eq2eq_CoolingWaterLoop_2" -> {
+                    /** 空调冷却水回水 */
+                }
+                "eq2eqFreshAirNetwork_1" -> {
+                    /** 新风管网 */
+                }
+                "eq2eq_HeatWaterLoop_4" -> {
+                    /** 采暖水回水 */
+                }
+                "eq2eq_HeatWaterLoop_1" -> {
+                    /** 采暖水供水 */
+                }
+                "eq2eq_HeatWaterLoop_3" ->{
+                    /** 采暖水旁通 */
+                }
+                "eq2eq_HeatWaterLoop_2" ->{
+                    /** 采暖水回水 */
+                }
+                "eq2eq_VentNetwork_1" -> {
+                    /** 通风送风 */
+                }
+                "eq2eq_VentNetwork_3" ->{
+                    /** 通风不确定 */
+                }
+                "eq2eq_VentNetwork_2" ->{
+                    /** 通风排风 */
+                }
+                "eq2eq_VRFNetwork_1" -> {
+                    /** 多联机供回制冷剂 */
+                }
+                "eq2eq_SupplyWaterNetwork_1" ->{
+                    /** 生活给水供水 */
+                }
+                "eq2eq_SupplyWaterNetwork_2" -> {
+                    /** 生活给水旁通 */
+                }
+                "eq2eq_DrainingWaterNetwork_1" -> {
+                    /** 污水排水 */
+                }
+                "eq2eq_DrainingWaterNetwork_2" -> {
+                    /** 污水旁通 */
+                }
+                "eq2eq_DrinkingWaterNetwork_1" -> {
+                    /** 直饮水供水 */
+                }
+                "eq2eq_DrinkingWaterNetwork_2" -> {
+                    /** 直饮水旁通 */
+                }
+                "eq2eq_DHWNetwork_1" -> {
+                    /** 生活热水供水 */
+                }
+                "eq2eq_DHWNetwork_2" -> {
+                    /** 生活热水旁通 */
+                }
+                "eq2eq_GasNetwork_1" -> {
+                    /** 燃气供气 */
+                }
+                "eq2eq_GasNetwork_2" -> {
+                    /** 燃气旁通 */
+                }
+                "eq2eq_FireWaterNetwork_1" -> {
+                    /** 消防供水网络 */
+                }
+                "eq2eq_FireWaterNetwork_2" -> {
+                    /** 消防给水旁通 */
+                }
+                "eq2eq_FireVentNetwork_1" -> {
+                    /** 消防排烟 */
+                }
+                "eq2eq_RecycleWaterNetwork_1" ->{
+                    /** 中水供水 */
+                }
+                "eq2eq_RecycleWaterNetwork_2" -> {
+                    /** 中水旁通 */
+                }
+                "eq2eq_SensorNetwork_1" -> {
+                    /** 通信连接 */
+                }
+                "eq2eq_ControlRelation_1" -> {
+                    /** 设备控制关系 */
+                }
+                "eq2eq_SensorRelationship_ss2eq" -> {
+                    /** 传感器测量设备关系 */
+                }
+                "eq2eq_ValveRelationship_vv2eq" -> {
+                    /** 阀门限制设备关系 */
+                }
+                "eq2eq_ControlEquipNetwork" -> {
+                    /** 控制网络 */
+                }
+                "eq2eq_ControlRelation_2" -> {
+                    /** 系统控制关系 */
+                }
+                "eq2sy_SensorRelationship_ss2sy" -> {
+                    /** 传感器测量系统关系 */
+                }
+                "eq2sy_ValveRelationship_vv2sy" -> {
+                    /** 阀门限制系统关系 */
+                }
+                "eq2sp_SensorRelationship_ss2sp" -> {
+                    /** 传感器测量空间关系 */
+                }
+                "eq2sp_x" -> {
+                    /** 设备空间其他关系 */
+                }
 
             }
         }

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/task/SchedulerTask.kt

@@ -55,6 +55,6 @@ class SchedulerTask {
 //    @Scheduled(cron="0/5 * *  * * ? ")   //每5秒执行一次
     fun scheduled() {
         logger.info("同步数据中心任务开始至数据中台")
-//        messageProcessing.syncDataCenter()
+        messageProcessing.syncDataCenter()
     }
 }

+ 3 - 3
datasyn/src/main/kotlin/com/persagy/server/syn/task/SchedulerTaskRel.kt

@@ -51,10 +51,10 @@ class SchedulerTaskRel {
     lateinit var messageProcessing: MessageProcessing
 
     //cron表达式:每隔5秒执行一次
-//    @Scheduled(cron = "0 */3 * * * ?")
-    @Scheduled(cron="0/5 * *  * * ? ")   //每5秒执行一次
+    @Scheduled(cron = "0 */3 * * * ?")
+//    @Scheduled(cron="0/5 * *  * * ? ")   //每5秒执行一次
     fun scheduled() {
-        logger.info("同步数据中心任务开始至数据中台")
+        logger.info("同步数据中心任务开始至数据中台-关系数据")
         messageProcessing.syncDataCenter()
     }
 }

+ 2 - 2
datasyn/src/main/resources/application-dev.yml

@@ -3,10 +3,10 @@ server:
 
 spring:
   datasource:
-    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl?serverTimezone=UTC
+#    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl?serverTimezone=UTC
 #    username:                           postgres
 #    password:                           123qwe!@#
-#    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
+    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
     username:                           postgres
 #    password:                           persagy_2020qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.models
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.objects.Property
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -39,18 +38,15 @@ class PropertyEquip : Property() {
     /** 设备名称 */
     @Schema(description = "设备名称")
     @Column(name = "equipment_name")
-    @JSONField(name = "LinkEquipName")
-    var linkeEquipName: String? = null
+    var linkEquipName: String? = null
 
     /** 设备id */
     @Schema(description = "设备id")
     @Column(name = "equipment_id")
-    @JSONField(name = "LinkEquipId")
-    var linkeEquipId: String? = null
+    var linkEquipId: String? = null
 
     /** 设备id */
     @Schema(description = "设备id")
     @Column(name = "equipment_local_name")
-    @JSONField(name = "LinkEquipLocalName")
-    var linkeEquipLocalName: String? = null
+    var linkEquipLocalName: String? = null
 } // Class PropertyEquip

+ 0 - 3
equip-component/src/main/kotlin/com/persagy/server/models/PropertyFamily.kt

@@ -37,18 +37,15 @@ class PropertyFamily : BaseInfo() {
     /** 设备族编码 */
     @Schema(description = "设备族编码")
     @Column(name = "family")
-    @JSONField(name = "Family")
     var family: String? = null
 
     /** 数量 */
     @Schema(description = "数量")
     @Column(name = "count")
-    @JSONField(name = "Count")
     var count: Int? = null
 
     /** 设备族名 */
     @Schema(description = "设备族名")
     @Column(name = "family_name")
-    @JSONField(name = "FamilyName")
     var familyName: String? = null
 } // Class PropertyEquip

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

@@ -37,11 +37,10 @@ import java.io.Serializable
 class SpaceBdFl : Serializable {
 
     /** 空间id */
-    @JSONField(name = "SpaceId")
+    @JSONField(name = "spaceId")
     var space_id: String? = null
 
     /** 数量 */
-    @JSONField(name = "Count")
     var count: Int? = 0
 
 } //  class SpaceBdFl

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

@@ -96,6 +96,10 @@ open class FloorCompon : BaseInfo() {
     @Column(name = "object_type")
     override var objectType: String? = "floor"
 
+    /** 自定义信息点 */
+    @Schema(description = "自定义信息点")
+    @Column(name = "properties")
+    var properties: HashMap<String,Any?>? = null
 
     /** 建筑   table  对应关系表   idColumn 对应 本类的关系id    childIdColumn 级联对象的关系id */
     @Schema(description = "级联-楼层")

+ 5 - 0
equip-component/src/main/kotlin/com/persagy/server/models/objects/ZoneSpace.kt

@@ -78,6 +78,11 @@ open class ZoneSpace:  BaseInfo() {
     @Column(name = "floor_id")
     var floorId: String? = null
 
+    /** 楼层id */
+    @Schema(description = "楼层id")
+    @Column(name = "class_code")
+    var classCode: String? = null
+
     /** 空间二维码图片 */
     @Schema(description = "空间二维码图片")
     @Column(name = "qr_code_pic")

+ 10 - 10
equip-component/src/main/kotlin/com/persagy/server/service/objects/ShaftService.kt

@@ -157,9 +157,9 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
 //           }
 
             /** 获取建筑下的楼层 */
-            val floorList = FloorService.select(SFilter.eq("projectId",projectId!!),SFilter.eq("buildId", buildingId)).order("FloorSequenceID desc").exec()
+            val floorList = FloorService.select(SFilter.eq("projectId",projectId!!),SFilter.eq("buildingId", buildingId)).order("floorSequenceId desc").exec()
             /** 项目下的竖井关联的空间  对应空间类型*/
-            val rShContainSpBaseList = rShContainSpBaseService.select(SFilter.eq("projectId",projectId!!),SFilter.eq("Id1", shaftId),SFilter.eq("ZoneType", objectType), SFilter.eq("type","sh2sp")).exec()
+            val rShContainSpBaseList = rShContainSpBaseService.select(SFilter.eq("projectId",projectId!!),SFilter.eq("id1", shaftId),SFilter.eq("zoneType", objectType), SFilter.eq("type","sh2sp")).exec()
             if (rShContainSpBaseList.isNotEmpty()&&rShContainSpBaseList.size>0){
 
                 /** 获取空间对象实例 */
@@ -214,7 +214,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
                                 val zoneSpaceFloorList = floor.zoneSpaceList
                                 for (zoneSpace in zoneSpaceFloorList!!){
                                     /** 查询空间的垂直交通关系 */
-                                    val rSpVerticalSpList = rSpVerticalSpService.select(SFilter.eq("projectId",projectId!!),SFilter.eq("spaceId", zoneSpace.id!!),SFilter.eq("objectType", zoneSpace.objectType!!)).exec()
+                                    val rSpVerticalSpList = rSpVerticalSpService.select(SFilter.eq("projectId",projectId),SFilter.eq("spaceId", zoneSpace.id!!),SFilter.eq("objectType", zoneSpace.classCode!!)).exec()
                                     if (rSpVerticalSpList.size>0){
                                         val listId = ArrayList<String>()
                                         /** 排除和当前竖井空间没有关系的空间 */
@@ -233,7 +233,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
                                     }
 
                                     /** 查询空间的垂直交通关系 其它 */
-                                    val rSpVerticalSpOtherList = rSpVerticalSpService.select(SFilter.eq("projectId",projectId!!),SFilter.eq("spaceOtherId", zoneSpace.id!!),SFilter.eq("objectType", zoneSpace.objectType!!)).exec()
+                                    val rSpVerticalSpOtherList = rSpVerticalSpService.select(SFilter.eq("projectId",projectId!!),SFilter.eq("spaceOtherId", zoneSpace.id!!),SFilter.eq("objectType", zoneSpace.classCode!!)).exec()
                                     if (rSpVerticalSpOtherList.size>0){
                                         /** 排除和当前竖井空间没有关系的空间 */
                                         val listId = ArrayList<String>()
@@ -274,7 +274,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
                                         listPr.add("localName")
                                         val zoneSpaceLists = ZoneSpaceBaseService.select(SFilter.eq("projectId", projectId),
                                                 SFilter.eq("buildingId", zoneSpace.buildingId!!), SFilter.not(SFilter.isNull("localName"))
-                                                ,SFilter.eq("objectType", zoneSpace.objectType!!), SFilter.not(SFilter.eq("id",zoneSpace.id!!)))
+                                                ,SFilter.eq("classCode", zoneSpace.classCode!!), SFilter.not(SFilter.eq("id",zoneSpace.id!!)))
                                                 .projection(listPr).exec()
                                       if (zoneSpaceLists!=null&&zoneSpaceLists.size>0){
                                           for (zoneSp in zoneSpaceLists){
@@ -303,10 +303,10 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
                                                   var zoneSpaceList:ArrayList<ZoneSpace>
                                                   if (listid.size>0){
                                                       zoneSpaceList = zoneSpaceService.select(SFilter.eq("projectId", projectId), SFilter.inList("localName", setName.toList()),
-                                                              SFilter.eq("objectType", objectType!!),SFilter.not(SFilter.inList("id",listid))).exec()
+                                                              SFilter.eq("classCode", objectType!!),SFilter.not(SFilter.inList("id",listid))).exec()
                                                   }else{
                                                       zoneSpaceList = zoneSpaceService.select(SFilter.eq("projectId", projectId), SFilter.inList("localName", setName.toList()),
-                                                              SFilter.eq("objectType", objectType!!)).exec()
+                                                              SFilter.eq("classCode", objectType!!)).exec()
                                                   }
 
                                                   if (zoneSpaceList.size>0){
@@ -325,7 +325,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
                                         listPr.add("id")
                                         listPr.add("localId")
                                         val zoneSpaceLists = ZoneSpaceBaseService.select(SFilter.eq("projectId", projectId),
-                                                SFilter.eq("buildingId", zoneSpace.buildingId!!),SFilter.eq("objectType", zoneSpace.objectType!!)
+                                                SFilter.eq("buildingId", zoneSpace.buildingId!!),SFilter.eq("classCode", zoneSpace.classCode!!)
                                                 , SFilter.not(SFilter.eq("id",zoneSpace.id!!)), SFilter.not(SFilter.isNull("localId")))
                                                 .projection(listPr).exec()
 
@@ -413,7 +413,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
                                         if (!zoneSpace.isAi){
 
                                             /** 查询空间的垂直交通关系 其它 */
-                                            val rSpVerticalSpOtherList = rSpVerticalSpService.select(SFilter.eq("projectId", projectId),SFilter.eq("spaceOtherId", zoneSpace.id!!),SFilter.eq("objectType", zoneSpace.objectType!!)).exec()
+                                            val rSpVerticalSpOtherList = rSpVerticalSpService.select(SFilter.eq("projectId", projectId),SFilter.eq("spaceOtherId", zoneSpace.id!!),SFilter.eq("objectType", zoneSpace.classCode!!)).exec()
                                             if (rSpVerticalSpOtherList.size>0){
 
                                                 /** 排除已经关联的数据 */
@@ -499,7 +499,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
                                                 }
                                             }
                                             /** 查询空间的垂直交通关系 其它 */
-                                            val rSpVerticalSpOtherListv = rSpVerticalSpService.select(SFilter.eq("projectId", projectId),SFilter.eq("spaceId", zoneSpace.id!!),SFilter.eq("objectType", zoneSpace.objectType!!)).exec()
+                                            val rSpVerticalSpOtherListv = rSpVerticalSpService.select(SFilter.eq("projectId", projectId),SFilter.eq("spaceId", zoneSpace.id!!),SFilter.eq("objectType", zoneSpace.classCode!!)).exec()
                                             if (rSpVerticalSpOtherListv.size>0){
                                                 /** 排除已经关联的数据 */
                                                 if (zoneSpace.spaceIdList.size>0){