浏览代码

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

zhangweixin 4 年之前
父节点
当前提交
a0ea951641
共有 37 个文件被更改,包括 1194 次插入242 次删除
  1. 5 53
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/ZoneIspace.kt
  2. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/ZoneSpace.kt
  3. 2 1
      datacenter/src/main/kotlin/com/persagy/server/WebMvcConfg.kt
  4. 5 8
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSpInSiController.kt
  5. 4 7
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RTnInSpController.kt
  6. 1 1
      datacenter/src/main/kotlin/com/persagy/server/controllers/relation_calc/RelationCalcController.kt
  7. 5 1
      datacenter/src/main/kotlin/com/persagy/server/jms/RabbitMqBaseService.kt
  8. 10 3
      datacenter/src/main/kotlin/com/persagy/server/services/base/Service.kt
  9. 2 2
      datacenter/src/main/kotlin/com/persagy/server/services/base/ServiceSpace.kt
  10. 2 1
      datacenter/src/main/kotlin/com/persagy/server/services/graphtype/GraphicTypeMapperService.kt
  11. 4 4
      datacenter/src/main/kotlin/com/persagy/server/services/objects/LocationPointServices.kt
  12. 3 3
      datacenter/src/main/kotlin/com/persagy/server/services/objects/PropertyService.kt
  13. 4 4
      datacenter/src/main/kotlin/com/persagy/server/services/objects/SpaceService.kt
  14. 10 10
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RSpInSiBaseService.kt
  15. 129 5
      datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationCalcService.kt
  16. 61 5
      datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/RelationCalcService.kt
  17. 7 7
      datacenter/src/main/resources/application-dev.yml
  18. 7 7
      datacenter/src/main/resources/application-prod.yml
  19. 786 40
      datasyn/src/main/kotlin/com/persagy/server/syn/jms/DataCenterSync.kt
  20. 10 0
      datasyn/src/main/kotlin/com/persagy/server/syn/jms/MessageProcessing.kt
  21. 1 1
      datasyn/src/main/kotlin/com/persagy/server/syn/jms/MessageReceiver.kt
  22. 2 1
      datasyn/src/main/kotlin/com/persagy/server/syn/models/api/obj/BuildingApi.kt
  23. 15 15
      datasyn/src/main/kotlin/com/persagy/server/syn/services/dict/DClassDefService.kt
  24. 19 8
      datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/DataCenterBuilding.kt
  25. 10 4
      datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/DataCenterComponent.kt
  26. 25 11
      datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/DataCenterEquipment.kt
  27. 10 4
      datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/DataCenterFloor.kt
  28. 8 2
      datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/DataCenterShaft.kt
  29. 9 2
      datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/DataCenterSpace.kt
  30. 9 4
      datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/DataCenterSystem.kt
  31. 4 3
      datasyn/src/main/kotlin/com/persagy/server/syn/task/SchedulerTask.kt
  32. 7 7
      datasyn/src/main/resources/application-dev.yml
  33. 3 3
      equip-component/src/main/kotlin/com/persagy/server/models/objects/ZoneSpace.kt
  34. 4 4
      scanbuilding/src/main/kotlin/com/persagy/server/services/UserService.kt
  35. 6 6
      scanbuilding/src/main/kotlin/com/persagy/server/services/base/Service.kt
  36. 2 2
      scanbuilding/src/main/kotlin/com/persagy/server/services/task/EquipScanTaskService.kt
  37. 2 2
      scanbuilding/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskService.kt

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.objects
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.persagy.server.datacenter.models.entities.assistant.PointPosition
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
@@ -50,161 +49,114 @@ open class ZoneIspace : BaseInfo() {
     @Schema(description = "空间ID")
     @Id
     @Column(name = "id")
-    @JSONField(name = "RoomID")
     var id: String? = null
 
     /** 空间名称 */
     @Schema(description = "空间名称")
     @Column(name = "name")
-    @JSONField(name = "RoomName")
     var name: String? = null
 
     /** 空间本地编码 */
     @Schema(description = "空间本地编码")
     @Column(name = "local_id")
-    @JSONField(name = "RoomLocalID")
     var localId: String? = null
 
     /** 空间本地名称 */
     @Schema(description = "空间本地名称")
     @Column(name = "local_name")
-    @JSONField(name = "RoomLocalName")
     var localName: String? = null
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** 空间二维码图片 */
     @Schema(description = "空间二维码图片")
     @Column(name = "qr_code")
-    @JSONField(name = "RoomQRCode")
     var qrCode: String? = null
 
     /** BIM模型中编码 */
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** BIM模型中坐标 */
     @Schema(description = "BIM模型中坐标")
     @Column(name = "bim_location")
-    @JSONField(name = "BIMLocation")
     var bimLocation: String? = null
 
     /** 空间功能区类型 */
     @Schema(description = "空间功能区类型")
     @Column(name = "func_type")
-    @JSONField(name = "RoomFuncType")
     var funcType: String? = null
 
     /** 进深 */
     @Schema(description = "进深")
     @Column(name = "depth")
-    @JSONField(name = "Depth")
     var depth: Double? = null
 
     /** 面宽 */
     @Schema(description = "面宽")
     @Column(name = "width")
-    @JSONField(name = "Width")
     var width: Double? = null
 
     /** 建筑面积 */
     @Schema(description = "建筑面积")
     @Column(name = "build_area")
-    @JSONField(name = "BuildArea")
     var buildArea: Double? = null
 
     /** 使用面积 */
     @Schema(description = "使用面积")
     @Column(name = "net_area")
-    @JSONField(name = "NetArea")
     var netArea: Double? = null
 
     /** 高度 */
     @Schema(description = "高度")
     @Column(name = "height")
-    @JSONField(name = "Height")
     var height: Double? = null
 
     /** 配电容量 */
     @Schema(description = "配电容量")
     @Column(name = "elec_cap")
-    @JSONField(name = "ElecCap")
     var elecCap: Double? = null
 
     /** 污染等级 */
     @Schema(description = "污染等级")
     @Column(name = "pollution_degree")
-    @JSONField(name = "PollutionDegree")
     var pollutionDegree: String? = null
 
     /** 备注文字 */
     @Schema(description = "备注文字")
     @Column(name = "intro")
-    @JSONField(name = "Intro")
     var intro: String? = null
 
-    /** 租户信息 */
-    @Schema(description = "租户信息")
-    @Column(name = "tenant_info")
-    @JSONField(name = "TenantInfo")
-    var tenantInfo: HashMap<String, Any?>? = null
-
-    /** 环境参数 */
-    @Schema(description = "租户信息")
-    @Column(name = "env_param")
-    @JSONField(name = "EnvParam")
-    var envParam: HashMap<String, Any?>? = null
-
-    /** 人员信息 */
-    @Schema(description = "人员信息")
-    @Column(name = "people_info")
-    @JSONField(name = "PeopleInfo")
-    var peopleInfo: HashMap<String, Any?>? = null
-
-    /** 能耗信息 */
-    @Schema(description = "能耗信息")
-    @Column(name = "consumption_info")
-    @JSONField(name = "ConsumptionInfo")
-    var consumptionInfo: HashMap<String, Any?>? = null
-
-    /** 自定义 */
-    @Schema(description = "自定义")
-    @Column(name = "custom_param")
-    @JSONField(name = "CustomParam")
-    var customParam: HashMap<String,Any?>? = null
+    /** 信息点 */
+    @Schema(description = "信息点")
+    @Column(name = "infos")
+    var infos: HashMap<String, Any?>? = null
 
     @Schema(description = "对象类型")
     @Column(name = "object_type")
-    @JSONField(name = "ObjectType")
     override var objectType: String? = "Ispace"
 
     /** 模型文件id */
     @Schema(description = "模型文件id")
     @Column(name = "model_id")
-    @JSONField(name = "ModelId")
     var modelId: String? = null
 
     @Schema(description = "轮廓线")
     @Column(name = "outline")
-    @JSONField(name = "Outline")
     var outline: ArrayList<ArrayList<PointPosition>>? = null
 
-} // Class ZoneIspace
+}

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

@@ -231,7 +231,7 @@ open class ZoneSpace: Serializable, SBaseEntity() {
 
     /** 对象类型 */
     @Schema(description = "对象类型")
-    @Column(name = "class_code")
+    @Column(name = "object_type")
      var classCode: String? = null
 
     /** 级联-设备 */

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

@@ -27,6 +27,7 @@
 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,7 +45,7 @@ open class WebMvcConfg: WebMvcConfigurer {
      * @param   registry        拦截器注册器
      */
     override fun addInterceptors(registry: InterceptorRegistry) {
-//        registry.addInterceptor(SPageInterceptor()).addPathPatterns("/**")
+        registry.addInterceptor(SPageInterceptor()).addPathPatterns("/**")
         super.addInterceptors(registry)
 
     } // Function addInterceptors()

+ 5 - 8
datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSpInSiController.kt

@@ -36,10 +36,7 @@ import com.persagy.service.models.responses.SCreateResponse
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
 import org.slf4j.LoggerFactory
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.bind.annotation.*
 
 
 /**
@@ -65,7 +62,7 @@ class RSpInSiController {
      */
     @Operation(summary = "创建业务空间内的元空间关系, 累计添加不会覆盖", description = "必填项:IspaceId(元空间id)、SpaceId(业务空间id)")
     @PostMapping(value = ["/link-list"])
-    fun create(type: String, @RequestBody rSiInSpBase: SCreateRequest<RSiInSpBase>): SCreateResponse<RSiInSpBase> {
+    fun create(@RequestParam type: String, @RequestBody rSiInSpBase: SCreateRequest<RSiInSpBase>): SCreateResponse<RSiInSpBase> {
         logger.debug("space = ${rSiInSpBase.toJson()}")
         return RSpInSiBaseService.createLists(type,rSiInSpBase)
     } // Function create()
@@ -78,7 +75,7 @@ class RSpInSiController {
      */
     @Operation(summary = "根据对象删除业务空间内的元空间关系", description = "必填项:IspaceId(元空间id)、SpaceId(业务空间id)")
     @PostMapping(value = ["/unlink"])
-    fun delete(type: String, @RequestBody rSiInSpBase: ArrayList<RSiInSpBase>): SBaseResponse {
+    fun delete(@RequestParam type: String, @RequestBody rSiInSpBase: ArrayList<RSiInSpBase>): SBaseResponse {
         return RSpInSiBaseService.deletes(type,rSiInSpBase)
     } // Function delete()
 
@@ -103,7 +100,7 @@ class RSpInSiController {
      */
     @Operation(summary = "业务空间内的元空间,业务空间一对多,此方法会覆盖以前的记录", description = "必填项:IspaceIdList(元空间id列表)、SpaceId(业务空间id),此方法会覆盖以前的记录")
     @PostMapping(value = ["/link-sp"])
-    fun createSp(type:String, @RequestBody rSpInSiBase: RSiInSpBaseList): SCreateResponse<RSiInSpBaseList>{
+    fun createSp(@RequestParam type:String, @RequestBody rSpInSiBase: RSiInSpBaseList): SCreateResponse<RSiInSpBaseList>{
         logger.debug("space = ${rSpInSiBase.toJson()}")
         return RSpInSiBaseService.createsSp(type,rSpInSiBase)
     } // Function createSp()
@@ -116,7 +113,7 @@ class RSpInSiController {
      */
     @Operation(summary = "业务空间内的元空间,业务空间一对多,累计添加不会覆盖以前记录", description = "必填项:IspaceIdList(元空间id列表)、SpaceId(业务空间id)")
     @PostMapping(value = ["/link-si-sp"])
-    fun createSpSi(type:String, @RequestBody rSpInSiBase: RSiInSpBaseList): SCreateResponse<RSiInSpBaseList>{
+    fun createSpSi(@RequestParam type:String, @RequestBody rSpInSiBase: RSiInSpBaseList): SCreateResponse<RSiInSpBaseList>{
         logger.debug("space = ${rSpInSiBase.toJson()}")
         return RSpInSiBaseService.createsSpSi(type, rSpInSiBase)
     } // Function createSp()

+ 4 - 7
datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RTnInSpController.kt

@@ -36,10 +36,7 @@ import com.persagy.service.models.responses.SCreateResponse
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
 import org.slf4j.LoggerFactory
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.bind.annotation.*
 
 /**
  * 租户所租用的业务空间
@@ -64,7 +61,7 @@ class RTnInSpController {
      */
     @Operation(summary = "创建租户所租用的业务空间关系", description = "必填项:TenantID(租户id)、SpaceID(业务空间id)")
     @PostMapping(value = ["/link"])
-    fun create(type: String,@RequestBody rTnInSpBase: SCreateRequest<RTnInSpBase>): SCreateResponse<RTnInSpBase> {
+    fun create(@RequestParam type: String,@RequestBody rTnInSpBase: SCreateRequest<RTnInSpBase>): SCreateResponse<RTnInSpBase> {
         logger.debug("space =${rTnInSpBase.toJson()}")
         return RTnInSpBaseService.create(type,rTnInSpBase)
     } // Functio create()
@@ -77,7 +74,7 @@ class RTnInSpController {
      */
     @Operation(summary = "根据对象删除租户所租用的业务空间关系", description = "必填项:TenantID(租户id)、SpaceID(业务空间id)")
     @PostMapping(value = ["/unlink"])
-    fun delete(type: String,@RequestBody rTnInSpBase: ArrayList<RTnInSpBase>): SBaseResponse {
+    fun delete(@RequestParam type: String,@RequestBody rTnInSpBase: ArrayList<RTnInSpBase>): SBaseResponse {
         return RTnInSpBaseService.deletes(type,rTnInSpBase)
     } // Function delete()
 
@@ -89,7 +86,7 @@ class RTnInSpController {
      */
     @Operation(summary = "租户所租用的业务空间关系,租户一对多", description = "必填项:SpaceIdList(业务空间id列表)、TenantID(租户id),此方法会覆盖以前的记录 ,type 空间类型")
     @PostMapping(value = ["/link-sp"])
-    fun createSp(type: String,@RequestBody rTnInSpBase: RTnInSpBaseList): SCreateResponse<RTnInSpBase> {
+    fun createSp(@RequestParam type: String, @RequestBody rTnInSpBase: RTnInSpBaseList): SCreateResponse<RTnInSpBase> {
         logger.debug("space =${rTnInSpBase.toJson()}")
         return RTnInSpBaseService.createTn(type,rTnInSpBase)
     } // Function createSp()

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

@@ -321,7 +321,7 @@ class RelationCalcController {
      */
     @Operation(summary = "设备服务空间关系", description = "空调风口(ATIO)、通风风口(VTIO)")
     @PostMapping(value = ["/eq2sp_for"])
-    fun eqForSp(objectTypes: String?): SBaseResponse {
+    fun eqForSp(@RequestParam objectTypes: String?): SBaseResponse {
         val projectId = SPageContext.getHeader("projectId").toString()
         logger.debug("calcEq2Sp --------------  $projectId")
         return service.calcEqForSp(objectTypes,projectId)

+ 5 - 1
datacenter/src/main/kotlin/com/persagy/server/jms/RabbitMqBaseService.kt

@@ -89,7 +89,11 @@ open class RabbitMqBaseService {
      * @param   data        消息数据
      */
     fun sendTopic(exchange: String,routingKey: String, data: String) {
-        amqpTemplate!!.convertAndSend(exchange, routingKey, data)
+        try {
+            amqpTemplate!!.convertAndSend(exchange, routingKey, data)
+        } catch (e: Exception) {
+
+        }
     } // Fun sendTopic()
 
     /**

+ 10 - 3
datacenter/src/main/kotlin/com/persagy/server/services/base/Service.kt

@@ -85,7 +85,10 @@ open class Service<ENTITY : BaseInfo>(daoClass: SAbstractDao<ENTITY>) : SObjectS
     override fun onCreateSuccess(entityList: ArrayList<ENTITY>) {
         entityList.forEach {
             try {
-                rabbitMqService.sendObjects(Opt.projectId!!, Opt.CREATE,it.keyValue("id").toString())
+                if (!it.keyValue("id").toString().startsWith("Si")){
+                    rabbitMqService.sendObjects(Opt.projectId!!, Opt.CREATE,it.keyValue("id").toString())
+                }
+
             } catch (e: Exception) {
                 e.printStackTrace()
             }
@@ -119,7 +122,9 @@ open class Service<ENTITY : BaseInfo>(daoClass: SAbstractDao<ENTITY>) : SObjectS
             }
 
             try {
-                rabbitMqService.sendObjects(Opt.projectId!!, Opt.DELETE,it.keyValue("id").toString())
+                if (!it.keyValue("id").toString().startsWith("Si")) {
+                    rabbitMqService.sendObjects(Opt.projectId!!, Opt.DELETE, it.keyValue("id").toString())
+                }
             } catch (e: Exception) {
                 e.printStackTrace()
             }
@@ -154,7 +159,9 @@ open class Service<ENTITY : BaseInfo>(daoClass: SAbstractDao<ENTITY>) : SObjectS
     override fun onUpdateSuccess(entityList: ArrayList<ENTITY>) {
         try {
             for (entity in entityList) {
-                rabbitMqService.sendObjects(Opt.projectId!!, Opt.UPDATE,entity.keyValue("id").toString())
+                if (!entity.keyValue("id").toString().startsWith("Si")) {
+                    rabbitMqService.sendObjects(Opt.projectId!!, Opt.UPDATE, entity.keyValue("id").toString())
+                }
                 try {
                     /** 日志 */
                     DataCenterLogsService.addLogs(Opt.projectId!!,"update-after",entity.objectType!!,

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

@@ -195,8 +195,8 @@ open class ServiceSpace<ENTITY : SBaseEntity>(daoClass: SAbstractDao<ENTITY>) :
 
         try {
             val projectId = SPageContext.getHeader("projectId")
-            val comming = SPageContext.getHeader("Coming")
-            val account = SPageContext.getHeader("Account")
+            val comming = SPageContext.getHeader("coming")
+            val account = SPageContext.getHeader("account")
 
             /** 日志 */
             val dataCenterLogs = DataCenterLogs()

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

@@ -36,6 +36,7 @@ import com.persagy.server.services.base.RService
 import com.persagy.server.services.objects.EquipmentService
 import com.persagy.server.services.objects.FloorService
 import com.persagy.server.services.objects.PropertyService
+import com.persagy.server.services.rel.RSyEqService
 import com.persagy.server.services.rel.RSyInBdService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
@@ -149,7 +150,7 @@ open class GraphicTypeMapperService {
                                     e.printStackTrace()
                                 }
                             }else if (n =="r_eq2sy"){
-                                val exec = rEq2SyService.select(SFilter.eq("projectId", projectId), SFilter.eq("type", relationTypeProject.relationType!!)).exec()
+                                val exec = RSyEqService.select(SFilter.eq("projectId", projectId), SFilter.eq("type", relationTypeProject.relationType!!)).exec()
                                 count += exec.size
                             }else  if (n =="r_pe2sp"){
                                 val exec = rPe2SpService.select(SFilter.eq("ProjectId", projectId), SFilter.eq("Type", relationTypeProject.relationType!!)).exec()

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

@@ -88,8 +88,8 @@ object LocationPointServices : RService<LocationPoint>(SMybatisDao(LocationPoint
 
         try {
             val projectId = SPageContext.getHeader("projectId")
-            val comming = SPageContext.getHeader("Coming")
-            val account = SPageContext.getHeader("Account")
+            val comming = SPageContext.getHeader("coming")
+            val account = SPageContext.getHeader("account")
             for (entity in entityList){
                 try {
                     if (!comming.isNullOrEmpty()){
@@ -142,8 +142,8 @@ object LocationPointServices : RService<LocationPoint>(SMybatisDao(LocationPoint
         super.onUpdateSuccess(entityList)
         try {
             val projectId = SPageContext.getHeader("projectId")
-            val comming = SPageContext.getHeader("Coming")
-            val account = SPageContext.getHeader("Account")
+            val comming = SPageContext.getHeader("coming")
+            val account = SPageContext.getHeader("account")
             for (entity in entityList){
                 try {
                     if (!comming.isNullOrEmpty()){

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

@@ -59,7 +59,7 @@ object PropertyService : Service<Property>(SMybatisDao(Property::class.java)) {
      */
     override fun onCreateBefore(property: Property): Boolean  {
         val projectId = SPageContext.getHeader("projectId")
-        val coming = SPageContext.getHeader("Coming")
+        val coming = SPageContext.getHeader("coming")
         if (!property.id.isNullOrEmpty()) {
             val isStartsWith = property.id.toString().startsWith("Pe")
             if (!isStartsWith) {
@@ -99,8 +99,8 @@ object PropertyService : Service<Property>(SMybatisDao(Property::class.java)) {
         super.onCreateSuccess(entityList)
         try {
             val projectId = SPageContext.getHeader("projectId")
-            val comming = SPageContext.getHeader("Coming")
-            val account = SPageContext.getHeader("Account")
+            val comming = SPageContext.getHeader("coming")
+            val account = SPageContext.getHeader("account")
             for (entity in entityList){
                 try {
                     if (!comming.isNullOrEmpty()){

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

@@ -26,14 +26,14 @@
 
 package com.persagy.server.services.objects
 
-import com.persagy.server.utils.IdUtils
-import com.persagy.server.utils.ShaftNameUtil
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.logs.DataCenterLogs
 import com.persagy.server.datacenter.models.entities.objects.ZoneIspace
 import com.persagy.server.datacenter.models.requests.DCSQueryRequest
 import com.persagy.server.services.base.Service
+import com.persagy.server.utils.IdUtils
+import com.persagy.server.utils.ShaftNameUtil
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SQueryResponse
@@ -75,8 +75,8 @@ object SpaceService : Service<ZoneIspace>(SMybatisDao(ZoneIspace::class.java)) {
             val zoneIspace = this.select(SFilter.eq("id", entity.id!!)).entity()
 
             val projectId = SPageContext.getHeader("projectId")
-            val coming = SPageContext.getHeader("Coming")
-            val account = SPageContext.getHeader("Account")
+            val coming = SPageContext.getHeader("coming")
+            val account = SPageContext.getHeader("account")
             /** 日志 */
             val dataCenterLogs = DataCenterLogs()
             dataCenterLogs.id = IdUtils.uuidCreate()

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

@@ -26,14 +26,14 @@
 
 package com.persagy.server.services.rel
 
-import com.persagy.server.synchronize.MessageHandler
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.rel.RSiInSpBase
 import com.persagy.server.datacenter.models.entities.rel.RSiInSpBaseList
 import com.persagy.server.datacenter.models.entities.rel.RSp2Si
 import com.persagy.server.datacenter.models.entities.rel.RSpInSiBaseList
-import com.persagy.base.extensions.toJson
-import com.persagy.database.SFilter
-import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.synchronize.MessageHandler
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
@@ -83,7 +83,7 @@ object RSpInSiBaseService: SObjectService<RSiInSpBase>(SMybatisDao(RSiInSpBase::
                     jsonObject.put("linkId",rSpInSiBase.ispaceId)
 
                     /** 发送消息 */
-                    messageHandler.sendMessage(jsonObject.toString())
+//                    messageHandler.sendMessage(jsonObject.toString())
 
 //                    kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "ElementSptoSpace", "11", IdUtils.uuidCreate(),  rSpInSiZoneHeating.spaceId!!, rSpInSiZoneHeating.ispaceId!!),false)
 
@@ -161,7 +161,7 @@ object RSpInSiBaseService: SObjectService<RSiInSpBase>(SMybatisDao(RSiInSpBase::
                     jsonObject.put("linkId",rSpInSiBase.ispaceId)
 
                     /** 发送消息 */
-                    messageHandler.sendMessage(jsonObject.toString())
+//                    messageHandler.sendMessage(jsonObject.toString())
 //                    kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "ElementSptoSpace", "12", IdUtils.uuidCreate(),  rSpInSiZoneHeating.spaceId!!, rSpInSiZoneHeating.ispaceId),false)
                 } else {
 
@@ -243,7 +243,7 @@ object RSpInSiBaseService: SObjectService<RSiInSpBase>(SMybatisDao(RSiInSpBase::
                     jsonObject.put("linkId",successList.toJson())
 
                     /** 发送消息 */
-                    messageHandler.sendMessage(jsonObject.toString())
+//                    messageHandler.sendMessage(jsonObject.toString())
 
                     val sCreateResponse = SCreateResponse<RSiInSpBase>(SResponseType.success)
                     if (failureList.size > 0) {
@@ -302,7 +302,7 @@ object RSpInSiBaseService: SObjectService<RSiInSpBase>(SMybatisDao(RSiInSpBase::
                     jsonObject.put("linkId",successList.toJson())
 
                     /** 发送消息 */
-                    messageHandler.sendMessage(jsonObject.toString())
+//                    messageHandler.sendMessage(jsonObject.toString())
                     if (failureList.size > 0) {
                         val sCreateResponse = SCreateResponse<RSiInSpBase>(SResponseType.success)
                         sCreateResponse.message = "失败对象:" + failureList.toJson()
@@ -360,7 +360,7 @@ object RSpInSiBaseService: SObjectService<RSiInSpBase>(SMybatisDao(RSiInSpBase::
                     jsonObject.put("linkId",successList.toJson())
 
                     /** 发送消息 */
-                    messageHandler.sendMessage(jsonObject.toString())
+//                    messageHandler.sendMessage(jsonObject.toString())
 //                    kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "ElementSptoSpace", "14", IdUtils.uuidCreate(),  rSiInSpZoneHeatingList.spaceId!!, null),false)
                     if (failureList.size > 0) {
                         val sCreateResponse = SCreateResponse<RSiInSpBaseList>(SResponseType.success)
@@ -452,7 +452,7 @@ object RSpInSiBaseService: SObjectService<RSiInSpBase>(SMybatisDao(RSiInSpBase::
                     jsonObject.put("linkId",successList.toJson())
 
                     /** 发送消息 */
-                    messageHandler.sendMessage(jsonObject.toString())
+//                    messageHandler.sendMessage(jsonObject.toString())
 //                    kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "ElementSptoSpace", "13", IdUtils.uuidCreate(),  rSiInSpZoneHeatingList.spaceId!!, null),false)
                     if (failureList.size > 0) {
                         val sCreateResponse = SCreateResponse<RSiInSpBaseList>(SResponseType.success)

+ 129 - 5
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationCalcService.kt

@@ -253,7 +253,7 @@ open class ManualRelationCalcService {
      */
     fun addRel(relationAddRequest: RelationAddRequest): ManualRelationCalcSCreateResponse{
         /** 项目id */
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
 
         val sCreateResponse = ManualRelationCalcSCreateResponse()
 
@@ -1246,7 +1246,11 @@ open class ManualRelationCalcService {
                     rEq2Eq.sign = 1
                     rEq2Eq.type = "eq2eq_HUDistribution_1"
                     rEq2Eq.id2 = equipmentTo.id
-                    rEq2EqService.replace(rEq2Eq)
+                    val replace = rEq2EqService.replace(rEq2Eq)
+                    if (replace) {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_HUDistribution_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
+                    }
                 }
             }else if (relationAddRequest.relType == "eq2eq_HUDistribution_2"){/** 高压变配电互备连接 */
                 for (equipmentTo in equipmentToList) {
@@ -1256,7 +1260,11 @@ open class ManualRelationCalcService {
                     rEq2Eq.sign = 1
                     rEq2Eq.type = "eq2eq_HUDistribution_2"
                     rEq2Eq.id2 = equipmentTo.id
-                    rEq2EqService.replace(rEq2Eq)
+                    val replace = rEq2EqService.replace(rEq2Eq)
+                    if (replace) {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_HUDistribution_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
+                    }
                 }
             }else if (relationAddRequest.relType == "eq2eq_LUDistribution_1"){/** 低压配电普通连接 */
                 for (equipmentTo in equipmentToList) {
@@ -1266,7 +1274,12 @@ open class ManualRelationCalcService {
                     rEq2Eq.sign = 1
                     rEq2Eq.type = "eq2eq_LUDistribution_1"
                     rEq2Eq.id2 = equipmentTo.id
-                    rEq2EqService.replace(rEq2Eq)
+                    val replace = rEq2EqService.replace(rEq2Eq)
+                    if (replace) {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_LUDistribution_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
+                    }
+
                 }
             }else if (relationAddRequest.relType == "eq2eq_LUDistribution_2"){/** 低压配电互备连接 */
                 for (equipmentTo in equipmentToList) {
@@ -1277,6 +1290,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.type = "eq2eq_LUDistribution_2"
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_LUDistribution_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_EquipPower_1"){/** 设备常规电源 */
                 for (equipmentTo in equipmentToList) {
@@ -1287,6 +1302,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.type = "eq2eq_EquipPower_1"
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_EquipPower_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_EquipPower_2"){/** 设备备用电源 */
                 for (equipmentTo in equipmentToList) {
@@ -1297,6 +1314,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.type = "eq2eq_EquipPower_2"
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_EquipPower_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_EquipPower_3"){/** 系统常规电源 */
                 for (equipmentTo in equipmentToList) {
@@ -1307,6 +1326,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.type = "eq2eq_EquipPower_3"
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_EquipPower_3","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_EquipPower_4"){/** 系统备用电源 */
                 for (equipmentTo in equipmentToList) {
@@ -1317,6 +1338,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.type = "eq2eq_EquipPower_4"
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_EquipPower_4","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }
             sCreateResponse.result = SResponseType.success
@@ -1382,6 +1405,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_ACAirNetwork_1"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ACAirNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_ACAirNetwork_3"){/** 空调排风 */
                 for (equipmentTo in equipmentToList) {
@@ -1392,6 +1417,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_ACAirNetwork_3"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ACAirNetwork_3","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_ACAirNetwork_2"){/** 空调回风 */
                 for (equipmentTo in equipmentToList) {
@@ -1402,6 +1429,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_ACAirNetwork_2"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ACAirNetwork_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_ChillWaterLoop_4"){/** 空调冷冻水补水 */
                 for (equipmentTo in equipmentToList) {
@@ -1412,6 +1441,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_ChillWaterLoop_4"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ChillWaterLoop_4","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_ChillWaterLoop_1"){/** 空调冷冻水供水 */
                 for (equipmentTo in equipmentToList) {
@@ -1422,6 +1453,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_ChillWaterLoop_1"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ChillWaterLoop_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_ChillWaterLoop_3"){/** 空调冷冻水旁通 */
                 for (equipmentTo in equipmentToList) {
@@ -1432,6 +1465,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_ChillWaterLoop_3"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ChillWaterLoop_3","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_ChillWaterLoop_2"){/**  空调冷冻水回水*/
                 for (equipmentTo in equipmentToList) {
@@ -1442,6 +1477,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_ChillWaterLoop_2"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ChillWaterLoop_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_CondWaterNetwork_1"){/** 空调冷凝水网络 */
                 for (equipmentTo in equipmentToList) {
@@ -1452,6 +1489,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_CondWaterNetwork_1"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_CondWaterNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_CoolingWaterLoop_4"){/** 空调冷却水补水 */
                 for (equipmentTo in equipmentToList) {
@@ -1462,6 +1501,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_CoolingWaterLoop_4"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_CoolingWaterLoop_4","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_CoolingWaterLoop_1"){/** 空调冷却水供水 */
                 for (equipmentTo in equipmentToList) {
@@ -1472,6 +1513,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_CoolingWaterLoop_1"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_CoolingWaterLoop_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_CoolingWaterLoop_3"){/** 空调冷却水旁通 */
                 for (equipmentTo in equipmentToList) {
@@ -1482,6 +1525,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_CoolingWaterLoop_2"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_CoolingWaterLoop_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_CoolingWaterLoop_2"){/** 空调冷却水回水 */
                 for (equipmentTo in equipmentToList) {
@@ -1492,6 +1537,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_CoolingWaterLoop_2"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_CoolingWaterLoop_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eqFreshAirNetwork_1"){/** 新风管网 */
                 for (equipmentTo in equipmentToList) {
@@ -1502,6 +1549,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eqFreshAirNetwork_1"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eqFreshAirNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_HeatWaterLoop_4"){/** 采暖水回水 */
                 for (equipmentTo in equipmentToList) {
@@ -1512,6 +1561,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_HeatWaterLoop_4"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_HeatWaterLoop_4","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_HeatWaterLoop_1"){/** 采暖水供水 */
                 for (equipmentTo in equipmentToList) {
@@ -1522,6 +1573,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_HeatWaterLoop_1"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_HeatWaterLoop_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_HeatWaterLoop_3"){/** 采暖水旁通 */
                 for (equipmentTo in equipmentToList) {
@@ -1532,6 +1585,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_HeatWaterLoop_3"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_HeatWaterLoop_3","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_HeatWaterLoop_2"){/** 采暖水回水 */
                 for (equipmentTo in equipmentToList) {
@@ -1542,6 +1597,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_HeatWaterLoop_2"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_HeatWaterLoop_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_VentNetwork_1"){/** 通风送风 */
                 for (equipmentTo in equipmentToList) {
@@ -1552,6 +1609,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_VentNetwork_1"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_VentNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_VentNetwork_3"){/** 通风不确定 */
                 for (equipmentTo in equipmentToList) {
@@ -1562,6 +1621,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_VentNetwork_3"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_VentNetwork_3","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_VentNetwork_2"){/** 通风排风 */
                 for (equipmentTo in equipmentToList) {
@@ -1572,6 +1633,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_VentNetwork_2"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_VentNetwork_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_VRFNetwork_1"){/** 多联机供回制冷剂 */
                 for (equipmentTo in equipmentToList) {
@@ -1582,6 +1645,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_VRFNetwork_1"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_VRFNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }
 
@@ -1647,6 +1712,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_SupplyWaterNetwork_1"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_SupplyWaterNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_SupplyWaterNetwork_2"){/** 生活给水旁通 */
                 for (equipmentTo in equipmentToList) {
@@ -1657,6 +1724,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_SupplyWaterNetwork_2"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_SupplyWaterNetwork_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_DrainingWaterNetwork_1"){/** 污水排水 */
                 for (equipmentTo in equipmentToList) {
@@ -1667,6 +1736,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_DrainingWaterNetwork_1"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_DrainingWaterNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_DrainingWaterNetwork_2"){/** 污水旁通 */
                 for (equipmentTo in equipmentToList) {
@@ -1677,6 +1748,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_DrainingWaterNetwork_2"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_DrainingWaterNetwork_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_DrinkingWaterNetwork_1"){/** 直饮水供水 */
                 for (equipmentTo in equipmentToList) {
@@ -1687,6 +1760,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_DrinkingWaterNetwork_1"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_DrinkingWaterNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_DrinkingWaterNetwork_2"){/** 直饮水旁通 */
                 for (equipmentTo in equipmentToList) {
@@ -1697,6 +1772,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_DrinkingWaterNetwork_2"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_DrinkingWaterNetwork_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_DHWNetwork_1"){/** 生活热水供水 */
                 for (equipmentTo in equipmentToList) {
@@ -1707,6 +1784,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_DHWNetwork_1"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_DHWNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_DHWNetwork_2"){/** 生活热水旁通 */
                 for (equipmentTo in equipmentToList) {
@@ -1717,6 +1796,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_DHWNetwork_2"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_DHWNetwork_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_GasNetwork_1"){/** 燃气供气 */
                 for (equipmentTo in equipmentToList) {
@@ -1727,6 +1808,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_GasNetwork_1"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_GasNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_GasNetwork_2"){/** 燃气旁通 */
                 for (equipmentTo in equipmentToList) {
@@ -1737,6 +1820,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_GasNetwork_2"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_GasNetwork_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_FireWaterNetwork_1"){/** 消防供水网络 */
                 for (equipmentTo in equipmentToList) {
@@ -1747,6 +1832,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_FireWaterNetwork_1"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_FireWaterNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_FireWaterNetwork_2"){/** 消防给水旁通 */
                 for (equipmentTo in equipmentToList) {
@@ -1757,6 +1844,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_FireWaterNetwork_2"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_FireWaterNetwork_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_FireVentNetwork_1"){/** 消防排烟 */
                 for (equipmentTo in equipmentToList) {
@@ -1767,6 +1856,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_FireVentNetwork_1"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_FireVentNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_RecycleWaterNetwork_1"){/** 中水供水 */
                 for (equipmentTo in equipmentToList) {
@@ -1777,6 +1868,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_RecycleWaterNetwork_1"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_RecycleWaterNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_RecycleWaterNetwork_2"){/** 中水旁通 */
                 for (equipmentTo in equipmentToList) {
@@ -1787,6 +1880,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_RecycleWaterNetwork_2"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_RecycleWaterNetwork_2","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }
 
@@ -1851,6 +1946,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_ControlEquipNetwork"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ControlEquipNetwork","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_SensorNetwork_1"){ /** 通信连接 */
                 for (equipmentTo in equipmentToList) {
@@ -1861,6 +1958,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_SensorNetwork_1"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_SensorNetwork_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_ControlRelation_1"){/** 设备控制关系 */
                 for (equipmentTo in equipmentToList) {
@@ -1871,6 +1970,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_ControlRelation_1"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ControlRelation_1","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_SensorRelationship_ss2eq"){/** 传感器测量设备关系 */
                 for (equipmentTo in equipmentToList) {
@@ -1881,6 +1982,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_SensorRelationship_ss2eq"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_SensorRelationship_ss2eq","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2eq_ValveRelationship_vv2eq"){/** 阀门限制设备关系 */
                 for (equipmentTo in equipmentToList) {
@@ -1891,6 +1994,8 @@ open class ManualRelationCalcService {
                     rEq2Eq.id2 = equipmentTo.id
                     rEq2Eq.type = "eq2eq_ValveRelationship_vv2eq"
                     rEq2EqService.replace(rEq2Eq)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ValveRelationship_vv2eq","11", rEq2Eq.id1!!,rEq2Eq.id2!!)
                 }
             }
             sCreateResponse.result = SResponseType.success
@@ -1957,6 +2062,8 @@ open class ManualRelationCalcService {
                     rEq2Sy.id2 = equipmentTo.id
                     rEq2Sy.type = "eq2eq_ControlRelation_2"
                     rEq2SyService.replace(rEq2Sy)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ControlRelation_2","11", rEq2Sy.id1!!,rEq2Sy.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2sy_SensorRelationship_ss2sy"){ /** 传感器测量系统关系 */
                 for (equipmentTo in equipmentToList) {
@@ -1967,6 +2074,8 @@ open class ManualRelationCalcService {
                     rEq2Sy.id2 = equipmentTo.id
                     rEq2Sy.type = "eq2sy_SensorRelationship_ss2sy"
                     rEq2SyService.replace(rEq2Sy)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2sy_SensorRelationship_ss2sy","11", rEq2Sy.id1!!,rEq2Sy.id2!!)
                 }
             }else if (relationAddRequest.relType == "eq2sy_ValveRelationship_vv2sy"){ /** 阀门限制系统关系 */
                 for (equipmentTo in equipmentToList) {
@@ -1977,6 +2086,8 @@ open class ManualRelationCalcService {
                     rEq2Sy.id2 = equipmentTo.id
                     rEq2Sy.type = "eq2sy_ValveRelationship_vv2sy"
                     rEq2SyService.replace(rEq2Sy)
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2sy_ValveRelationship_vv2sy","11", rEq2Sy.id1!!,rEq2Sy.id2!!)
                 }
             }
 
@@ -2045,6 +2156,8 @@ open class ManualRelationCalcService {
                 rEq2Sp.zoneType = equipmentTo.classCode
                 rEq2Sp.type = "eq2sp_SensorRelationship_ss2sp"
                 rEq2SpService.replace(rEq2Sp)
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "eq2sp_SensorRelationship_ss2sp","11", rEq2Sp.id1!!,rEq2Sp.id2!!)
             }
             sCreateResponse.result = SResponseType.success
             sCreateResponse.message = "添加成功"
@@ -2111,6 +2224,8 @@ open class ManualRelationCalcService {
                 rEq2Sp.zoneType = equipmentTo.classCode
                 rEq2Sp.type = "eq2sp_x"
                 rEq2SpService.replace(rEq2Sp)
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "eq2sp_x","11", rEq2Sp.id1!!,rEq2Sp.id2!!)
             }
             sCreateResponse.result = SResponseType.success
             sCreateResponse.message = "添加成功"
@@ -2128,7 +2243,7 @@ open class ManualRelationCalcService {
      */
     fun delRel(manualRelationCalcDel: ManualRelationCalcDel):SBaseResponse{
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if (!manualRelationCalcDel.fromId.isNullOrEmpty()&&!manualRelationCalcDel.toId.isNullOrEmpty()){
 
                 try {
@@ -2143,6 +2258,7 @@ open class ManualRelationCalcService {
                 }
 
 
+
                 var delete: Boolean = false
                 if (manualRelationCalcDel.relType == "pe2sp"){ /** 资产所在的业务空间 */
                     delete = rPeInSpBaseService.delete(SFilter.eq("projectId", projectId!!),
@@ -2395,6 +2511,10 @@ open class ManualRelationCalcService {
                 }
 
                 if (delete){
+                    if (manualRelationCalcDel.relType != "pe2sp"&&manualRelationCalcDel.relType != "pe2sh"){
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, manualRelationCalcDel.relType!!,"12",manualRelationCalcDel.fromId!!,manualRelationCalcDel.toId!!)
+                    }
                     return SBaseResponse(SResponseType.success)
                 }else{
                     return  SBaseResponse(SResponseType.failure)
@@ -2661,6 +2781,10 @@ open class ManualRelationCalcService {
                         SFilter.eq("id1", manualRelationCalcDel.fromId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
                 }
                 if (delete){
+                    if (manualRelationCalcDel.relType != "pe2sp"&&manualRelationCalcDel.relType != "pe2sh"){
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, manualRelationCalcDel.relType!!,"15",manualRelationCalcDel.fromId!!,"123456")
+                    }
                     return SBaseResponse(SResponseType.success)
                 }else{
                     return  SBaseResponse(SResponseType.failure)

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

@@ -28,7 +28,9 @@ package com.persagy.server.services.relation_calc
 
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
+import com.persagy.server.jms.RabbitMqService
 import com.persagy.server.mappers.IRelationCalcMapper
 import com.persagy.server.services.assistant.RUpDateEquipAndSapceService
 import com.persagy.server.services.objects.EquipmentService
@@ -37,6 +39,7 @@ import com.persagy.server.utils.IdUtils
 import com.persagy.service.SBaseService
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.utils.SSpringContextUtil
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
@@ -51,6 +54,10 @@ open class RelationCalcService {
     /** 实例化 mapper 对象 */
     @Autowired
     lateinit var mapper: IRelationCalcMapper
+    /** RabbitMQ消息对象 */
+    val rabbitMqService by lazy {
+        SSpringContextUtil.getBean(RabbitMqService::class.java) as RabbitMqService
+    }
 
     /** 关系总览服务 */
     val relationTypeProjectservice = SBaseService(SMybatisDao(RelationTypeProject::class.java))
@@ -136,6 +143,8 @@ open class RelationCalcService {
             if(result != null && result == 0){
                 upDate(projectId,"bd2sp")
 //                upDate(projectId,"fl2sp")
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "Bd2Sp","20","123","456")
                 return SBaseResponse(SResponseType.success)
             }else{
                 upDateBiaoji(projectId,"bd2sp",5)
@@ -155,6 +164,8 @@ open class RelationCalcService {
         try {
             val result = mapper.calcEq2Bd(projectId)
             if(result != null && result == 0){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "Eq2Bd_in","20","123","456")
                 return SBaseResponse(SResponseType.success)
             }
             return SBaseResponse(SResponseType.failure)
@@ -174,6 +185,8 @@ open class RelationCalcService {
             val result = mapper.calcEq2Fl(projectId)
             if(result != null && result == 0 ){
                 upDate(projectId,"eq2fl")
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "Eq2Bd_in","20","123","456")
                 return SBaseResponse(SResponseType.success)
             }else{
                 upDateBiaoji(projectId,"eq2fl",5)
@@ -201,6 +214,8 @@ open class RelationCalcService {
             }
             val result = mapper.calcEq2Sh(projectId)
             if(result != null && result == 0 ){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "Eq2Sh_in","20","123","456")
                 upDate(projectId,"eq2sh")
                 upDate(projectId,"eq2sp_in")
                 upDate(projectId,"fl2sp")
@@ -343,6 +358,8 @@ open class RelationCalcService {
             val result = mapper.calcEq2Sp(projectId)
             if(result!=null && result == 0){
                 try {
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "Eq2Sh_in","20","123","456")
                     upDate(projectId,"fl2sp")
                     upDate(projectId,"eq2fl")
                     val entity = relationTypeProjectservice.select(SFilter.eq("projectId", projectId), SFilter.eq("relationType", "eq2sp_in"), SFilter.eq("zoneType",tables!!)).entity()
@@ -383,6 +400,8 @@ open class RelationCalcService {
             val result = mapper.calcFl2Fl(projectId,2,2)
             if(result!=null && result == 0){
                 try {
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "Fl2Fl_Through","20","123","456")
                     val entity = RUpDateEquipAndSapceService.relationTypeProjectservice.select(SFilter.eq("projectId", projectId), SFilter.eq("relationTypeCode", "Fl2Fl")).entity()
                     if (entity!=null){
                         entity.computationalState = 1
@@ -477,6 +496,8 @@ open class RelationCalcService {
             upDateBiaoji(projectId,"fl2sp",3)
             val result = mapper.calcFl2Sp(tablesName,projectId)
             if(result != null && result == 0 ){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "Fl2Sp_in","20","123","456")
                 upDate(projectId,"fl2sp")
                 return SBaseResponse(SResponseType.success)
             }else{
@@ -617,6 +638,8 @@ open class RelationCalcService {
             upDateBiaoji(projectId,"sh2bd",3)
             val result = mapper.calcSh2Bd(projectId)
             if(result != null && result == 0){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "Bd2Sh_in","20","123","456")
                 upDate(projectId,"sh2bd")
                 return SBaseResponse(SResponseType.success)
             }else{
@@ -639,6 +662,8 @@ open class RelationCalcService {
             upDateBiaoji(projectId,"sh2sh",3)
             val result = mapper.calcSh2Sh(projectId)
             if(result != null && result == 0){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "Sh2Sh_Through","20","123","456")
                 upDate(projectId,"sh2sh")
                 return SBaseResponse(SResponseType.success)
             }else{
@@ -666,6 +691,8 @@ open class RelationCalcService {
             logger.debug("设备= ${ resultEq}")
             logger.debug("系统= ${ resultSy}")
             if(resultEq != null && resultSy!=null && resultEq == 0 && resultSy == 0 ){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "syeq2bd","20","123","456")
                 upDate(projectId,"syeq2bd")
                 upDate(projectId,"eq2fl")
                 return SBaseResponse(SResponseType.success)
@@ -690,6 +717,8 @@ open class RelationCalcService {
             val result = mapper.calcSy2Bd(projectId)
             if(result != null && result == 0){
 //                upDate(projectId,"sh2sh")
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "syeq2bd","20","123","456")
                 return SBaseResponse(SResponseType.success)
             }
             return SBaseResponse(SResponseType.failure)
@@ -710,6 +739,8 @@ open class RelationCalcService {
             upDateBiaoji(projectId,"eq2fl",3)
             val result = mapper.calcSy2Fl(projectId)
             if(result != null && result == 0){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "Sy2Fl_in","20","123","456")
                 upDate(projectId,"sy2fl")
                 upDate(projectId,"eq2fl")
                 return SBaseResponse(SResponseType.success)
@@ -738,6 +769,8 @@ open class RelationCalcService {
             upDateBiaoji(projectId,"eq2sp_in",3)
             val result = mapper.calcSy2Sh(projectId)
             if(result != null && result == 0){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sh_in","20","123","456")
                 upDate(projectId,"sy2sh")
                 upDate(projectId,"eq2sh")
                 upDate(projectId,"eq2fl")
@@ -771,6 +804,8 @@ open class RelationCalcService {
             upDateBiaoji(projectId,"eq2sp_in",3)
             val result = mapper.calcSy2Sp(projectId)
             if(result != null && result == 0){
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sp_in","20","123","456")
                 upDate(projectId,"sy2sp")
                 upDate(projectId,"fl2sp")
                 upDate(projectId,"sy2sp")
@@ -790,12 +825,16 @@ open class RelationCalcService {
     } // Function calcSy2Sp()
 
 
+    /**
+     * 普通交通
+     */
     fun sp2spTransport(projectId : String): SBaseResponse{
         try {
             upDateBiaoji(projectId,"sp2sp_TrafficNetwork_1",3)
         val result = mapper.calcsp2spTransport(projectId)
             if(result != null && result == 0){
-
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_TrafficNetwork_1","20","123","456")
                 upDate(projectId,"sp2sp_TrafficNetwork_1")
                 return SBaseResponse(SResponseType.success)
             }else{
@@ -808,12 +847,16 @@ open class RelationCalcService {
         }
     } // Fun
 
+    /**
+     * 光照连通
+     */
     fun sp2spLight(projectId : String): SBaseResponse{
         try {
             upDateBiaoji(projectId,"sp2sp_RadiationNetwork_1",3)
             val result = mapper.calcsp2spLight(projectId)
             if(result != null && result == 0){
-
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_RadiationNetwork_1","20","123","456")
                 upDate(projectId,"sp2sp_RadiationNetwork_1")
                 return SBaseResponse(SResponseType.success)
             }else{
@@ -826,12 +869,16 @@ open class RelationCalcService {
         }
     } // Fun
 
+    /**
+     * 空气自然对流
+     */
     fun sp2spConvection(projectId: String): SBaseResponse{
         try {
         upDateBiaoji(projectId,"sp2sp_ConvectionNetwork_1",3)
         val result = mapper.calcsp2spConvection(projectId)
         if(result != null && result == 0){
-
+            /** 发送消息 */
+            rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_ConvectionNetwork_1","20","123","456")
             upDate(projectId,"sp2sp_ConvectionNetwork_1")
             return SBaseResponse(SResponseType.success)
         }else{
@@ -844,12 +891,16 @@ open class RelationCalcService {
     }
     }
 
+    /**
+     * 空间连通
+     */
     fun sp2spV2(projectId: String): SBaseResponse{
         try {
             upDateBiaoji(projectId,"sp2sp_SpaceNeighborhood_5",3)
             val result = mapper.calcsp2spV2(projectId)
             if(result != null && result == 0){
-
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_SpaceNeighborhood_5","20","123","456")
                 upDate(projectId,"sp2sp_SpaceNeighborhood_5")
                 return SBaseResponse(SResponseType.success)
             }else{
@@ -946,7 +997,7 @@ open class RelationCalcService {
 
 
     /**
-     * 设备所在业务空间  温度传感器(SETP)、湿度传感器(SERH)、浓度传感器(SECT)
+     * 设备所在业务空间  温度传感器(SETP)、湿度传感器(SERH)、浓度传感器(SECT)  传感器测量设备关系
      *
      *  @param  tables      参与计算的业务空间(为空表示所有业务空间类型),以英文逗号隔开 HeatingZone,CleanZone,DomesticWaterSupplyZone,NetworkZone,TenantZone,AirConditioningZone FunctionZone,FireZone,SecurityZone,GeneralZone,PowerSupplyZone,LightingZone
      *  @param  projectId   项目id
@@ -971,6 +1022,8 @@ open class RelationCalcService {
             val result = mapper.calcEq2Sp(projectId!!)
             if(result!=null && result == 0){
                 try {
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_SensorRelationship_ss2eq","20","123","456")
                     upDate(projectId,"fl2sp")
                     upDate(projectId,"eq2fl")
                     val entity = relationTypeProjectservice.select(SFilter.eq("projectId", projectId), SFilter.eq("relationType", "eq2sp_SensorRelationship_ss2sp")).entity()
@@ -1049,8 +1102,11 @@ open class RelationCalcService {
             }
             /** 启动计算 */
             val result = mapper.calcEq2Sp(projectId)
+            logger.debug("计算结果= ${result}")
             if(result!=null && result == 0){
                 try {
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "fengkou_for","20","123","456")
                     upDate(projectId,"fl2sp")
                     upDate(projectId,"eq2fl")
                     val entity = relationTypeProjectservice.select(SFilter.eq("projectId", projectId), SFilter.eq("relationType", "eq2sp_for"), SFilter.eq("zoneType",tables!!)).entity()

+ 7 - 7
datacenter/src/main/resources/application-dev.yml

@@ -45,13 +45,13 @@ spring:
       max-file-size:                   500MB        # 限制单个文件的最大值
 
     #配置rabbitMq 服务器
-  rabbitmq:
-    host: 39.102.43.179
-    port: 9936
-    username: admin
-    password: brzj123456
-    #虚拟host 可以不设置,使用server默认host
-    virtual-host: /test
+#  rabbitmq:
+#    host: 39.102.43.179
+#    port: 9936
+#    username: admin
+#    password: brzj123456
+#    #虚拟host 可以不设置,使用server默认host
+#    virtual-host: /test
 
 mqtopid: # 消息
   exchange:                           exchange-dmp

+ 7 - 7
datacenter/src/main/resources/application-prod.yml

@@ -38,13 +38,13 @@ spring:
 #    password:                           persagy_2020qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj
 
-  rabbitmq:
-    host: 39.102.43.179
-    port: 9936
-    username: admin
-    password: brzj123456
-    #虚拟host 可以不设置,使用server默认host
-    virtual-host: /test
+#  rabbitmq:
+#    host: 39.102.43.179
+#    port: 9936
+#    username: admin
+#    password: brzj123456
+#    #虚拟host 可以不设置,使用server默认host
+#    virtual-host: /test
 
   servlet:
     multipart:

文件差异内容过多而无法显示
+ 786 - 40
datasyn/src/main/kotlin/com/persagy/server/syn/jms/DataCenterSync.kt


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

@@ -31,7 +31,9 @@ import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.jms.SynchronousMessage
 import com.persagy.server.datacenter.models.jms.SynchronousMessageRel
 import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
+import com.persagy.server.syn.task.SchedulerTask
 import com.persagy.service.SObjectService
+import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 
@@ -43,6 +45,11 @@ import org.springframework.stereotype.Service
 @Service
 class MessageProcessing {
 
+    companion object {
+        // 日志
+        private val logger = LoggerFactory.getLogger(SchedulerTask::class.java)
+    } // Companion object
+
     /** 缓存对象数据服务 - 数据中心到数据中台  */
     var synchronousMessageObjService = SObjectService(SMybatisDao(SynchronousMessage::class.java))
     var synchronousMessageRelService = SObjectService(SMybatisDao(SynchronousMessageRel::class.java))
@@ -103,8 +110,10 @@ class MessageProcessing {
 //            }
 //        }
         try {
+            logger.debug("标记状态= ${messageTypeDataCerten}              *********************************************************")
             /** 不等于 0 时候执行同步 */
             if (messageTypeDataCerten!=0){
+                logger.debug("执行任务*********************************************************")
                 /** 设置为 0  防止重复执行 */
                 messageTypeDataCerten =0
                 /** 查询待处理的消息 */
@@ -118,6 +127,7 @@ class MessageProcessing {
                     /** 查询是否有待处理的消息 */
                     syncDataCenter()
                 } else {
+                    logger.debug("释放状态*********************************************************")
                     /** 开启下次执行 */
                     messageTypeDataCerten = 1
                 }

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

@@ -112,7 +112,7 @@ class MessageReceiver {
     @RabbitHandler
     fun receiveMessage(message: String) {
         try {
-            println("我是监听queue-adm的,仅满足queue-adm的过来 , $message")
+            println("接收数据中心消息 , $message")
             val messageNotice = SJsonUtil.fromJson(message, MessageNotice::class.java)
             if (messageNotice != null) {
                 when(messageNotice.objOrRel) {

+ 2 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/models/api/obj/BuildingApi.kt

@@ -31,7 +31,6 @@ import com.persagy.base.extensions.toJson
 import com.persagy.base.utils.SHttpUtil
 import com.persagy.server.datacenter.models.entities.objects.Building
 import com.persagy.server.syn.Opts
-import com.persagy.server.syn.controllers.obj.ObjectToFromController
 import com.persagy.server.syn.models.obj.MiddleGroundDataRespose
 import com.persagy.server.syn.models.tools.BuildingUtil
 import com.persagy.service.utils.SSpringContextUtil
@@ -105,6 +104,8 @@ object BuildingApi {
     fun  updateObj(groupCode: String,projectId: String, building:Building): Boolean {
         val url = "${opts.dataPlatform}/rwd/instance/object/update?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
         val buildingTools = BuildingUtil.buildingTools(projectId, building)
+        logger.debug("url = ${url}")
+        logger.debug("boby = ${ buildingTools.toJson()}")
         val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, buildingTools)
         if (postObject.result == "success") {
             return true

+ 15 - 15
datasyn/src/main/kotlin/com/persagy/server/syn/services/dict/DClassDefService.kt

@@ -662,17 +662,17 @@ object DClassDefService : SObjectService<DefClass>(SMybatisDao(DefClass::class.j
 
                                 if (!defFuncId.name.isNullOrEmpty()){
                                     /** 排序 */
-                                    if (defFuncId.name!! == "设备本地编码"||defFuncId.name!! == "楼层本地编码"){
+                                    if (defFuncId.name!! == "设备本地编码"||defFuncId.name!! == "楼层本地编码"||defFuncId.name!! == "本地编码"){
                                         defFuncId.sort = 1
-                                    }else if (defFuncId.name!! == "设备本地名称"|| defFuncId.name!! == "楼层本地名称"){
+                                    }else if (defFuncId.name!! == "设备本地名称"|| defFuncId.name!! == "楼层本地名称"||defFuncId.name!! == "本地名称"){
                                         defFuncId.sort = 2
-                                    }else if (defFuncId.name!! == "设备二维码图片"){
+                                    }else if (defFuncId.name!! == "设备二维码图片"||defFuncId.name!! == "二维码图片"||defFuncId.name!! == "二维码内容"){
                                         defFuncId.sort = 3
                                     }else if (defFuncId.name!! == "设计图纸中编码"){
                                         defFuncId.sort = 4
-                                    }else if (defFuncId.name!! == "设备ID"){
+                                    }else if (defFuncId.name!! == "设备ID"||defFuncId.name!! =="编码"){
                                         defFuncId.sort = 101
-                                    }else if (defFuncId.name!! == "设备名称"){
+                                    }else if (defFuncId.name!! == "设备名称"||defFuncId.name!! =="名称"){
                                         defFuncId.sort = 102
                                     }else if (defFuncId.name!! == "BIM模型中编码"){
                                         defFuncId.sort = 103
@@ -953,17 +953,17 @@ object DClassDefService : SObjectService<DefClass>(SMybatisDao(DefClass::class.j
 
                                 if (!defFuncId.name.isNullOrEmpty()){
                                     /** 排序 */
-                                    if (defFuncId.name!! == "设备本地编码"||defFuncId.name!! == "楼层本地编码"){
+                                    if (defFuncId.name!! == "设备本地编码"||defFuncId.name!! == "楼层本地编码"||defFuncId.name!! == "本地编码"){
                                         defFuncId.sort = 1
-                                    }else if (defFuncId.name!! == "设备本地名称"|| defFuncId.name!! == "楼层本地名称"){
+                                    }else if (defFuncId.name!! == "设备本地名称"|| defFuncId.name!! == "楼层本地名称"||defFuncId.name!! == "本地名称"){
                                         defFuncId.sort = 2
-                                    }else if (defFuncId.name!! == "设备二维码图片"){
+                                    }else if (defFuncId.name!! == "设备二维码图片"||defFuncId.name!! == "二维码图片"||defFuncId.name!! == "二维码内容"){
                                         defFuncId.sort = 3
                                     }else if (defFuncId.name!! == "设计图纸中编码"){
                                         defFuncId.sort = 4
-                                    }else if (defFuncId.name!! == "设备ID"){
+                                    }else if (defFuncId.name!! == "设备ID"||defFuncId.name!! =="编码"){
                                         defFuncId.sort = 101
-                                    }else if (defFuncId.name!! == "设备名称"){
+                                    }else if (defFuncId.name!! == "设备名称"||defFuncId.name!! =="名称"){
                                         defFuncId.sort = 102
                                     }else if (defFuncId.name!! == "BIM模型中编码"){
                                         defFuncId.sort = 103
@@ -1132,17 +1132,17 @@ object DClassDefService : SObjectService<DefClass>(SMybatisDao(DefClass::class.j
 
                 if (!defFuncId.name.isNullOrEmpty()){
                     /** 排序 */
-                    if (defFuncId.name!! == "设备本地编码"||defFuncId.name!! == "楼层本地编码"){
+                    if (defFuncId.name!! == "设备本地编码"||defFuncId.name!! == "楼层本地编码"||defFuncId.name!! == "本地编码"){
                         defFuncId.sort = 1
-                    }else if (defFuncId.name!! == "设备本地名称"|| defFuncId.name!! == "楼层本地名称"){
+                    }else if (defFuncId.name!! == "设备本地名称"|| defFuncId.name!! == "楼层本地名称"||defFuncId.name!! == "本地名称"){
                         defFuncId.sort = 2
-                    }else if (defFuncId.name!! == "设备二维码图片"){
+                    }else if (defFuncId.name!! == "设备二维码图片"||defFuncId.name!! == "二维码图片"||defFuncId.name!! == "二维码内容"){
                         defFuncId.sort = 3
                     }else if (defFuncId.name!! == "设计图纸中编码"){
                         defFuncId.sort = 4
-                    }else if (defFuncId.name!! == "设备ID"){
+                    }else if (defFuncId.name!! == "设备ID"||defFuncId.name!! =="编码"){
                         defFuncId.sort = 101
-                    }else if (defFuncId.name!! == "设备名称"){
+                    }else if (defFuncId.name!! == "设备名称"||defFuncId.name!! =="名称"){
                         defFuncId.sort = 102
                     }else if (defFuncId.name!! == "BIM模型中编码"){
                         defFuncId.sort = 103

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

@@ -33,7 +33,6 @@ import com.persagy.server.datacenter.models.entities.dictnew.DictProject
 import com.persagy.server.datacenter.models.entities.objects.Building
 import com.persagy.server.datacenter.models.jms.SynchronousMessage
 import com.persagy.server.syn.Configure
-import com.persagy.server.syn.controllers.obj.ObjectToFromController
 import com.persagy.server.syn.models.api.obj.BuildingApi
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
@@ -82,9 +81,11 @@ class DataCenterBuilding {
                         /** 失败 */
                         message.sign = 2
                     }
-                    /** 更改标记 */
-                    synchronousMessageObjService.update(message, arrayListOf("sign"))
+                }else {
+                    message.sign = 0
                 }
+                /** 更改标记 */
+                synchronousMessageObjService.update(message, arrayListOf("sign"))
             }
             Configure.UPDATE -> {
                 /** 修改 */
@@ -99,13 +100,23 @@ class DataCenterBuilding {
                     if (sign){
                         /** 成功 */
                         message.sign = 0
-                    }else {
-                        /** 失败 */
-                        message.sign = 2
+                    } else {
+                        val sign = BuildingApi.createObj(dictProject!!.groupCode!!,message.projectId!!, building)
+                        if (sign){
+                            /** 成功 */
+                            message.sign = 0
+                        }else {
+                            /** 失败 */
+                            message.sign = 2
+                        }
                     }
-                    /** 更改标记 */
-                    synchronousMessageObjService.update(message, arrayListOf("sign"))
+
+                } else {
+                    /** 成功 */
+                    message.sign = 0
                 }
+                /** 更改标记 */
+                synchronousMessageObjService.update(message, arrayListOf("sign"))
             }
             Configure.DELETE -> {
                 /** 删除 */

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

@@ -91,9 +91,12 @@ class DataCenterComponent {
                         /** 失败 */
                         message.sign = 2
                     }
-                    /** 更改标记 */
-                    synchronousMessageObjService.update(message, arrayListOf("sign"))
+
+                }else {
+                    message.sign = 0
                 }
+                /** 更改标记 */
+                synchronousMessageObjService.update(message, arrayListOf("sign"))
             }
             Configure.UPDATE -> {
                 /** 修改 */
@@ -113,9 +116,12 @@ class DataCenterComponent {
                         /** 失败 */
                         message.sign = 2
                     }
-                    /** 更改标记 */
-                    synchronousMessageObjService.update(message, arrayListOf("sign"))
+
+                }else {
+                    message.sign = 0
                 }
+                /** 更改标记 */
+                synchronousMessageObjService.update(message, arrayListOf("sign"))
             }
             Configure.DELETE -> {
                 /** 删除 */

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

@@ -77,13 +77,20 @@ class DataCenterEquipment {
 
                         if (dictProject!=null){
                             if (!equip.buildingId.isNullOrEmpty()&&!equip.floorId.isNullOrEmpty()){
-                                val toJsonObjArray =
-                                        Configure.toJsonObjArray("MechInArch", "Eq2Bd", equip.id!!, equip.buildingId!!)
-                                val toJsonObjArray2 =
-                                        Configure.toJsonObjArray("MechInArch", "Eq2Fl", equip.id!!, equip.floorId!!)
-                                toJsonObjArray.plus(toJsonObjArray2[0])
-                                val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
-                                if (!createRel){
+                                try {
+                                    val toJsonObjArray =
+                                            Configure.toJsonObjArray("MechInArch", "Eq2Bd", equip.id!!, equip.buildingId!!)
+                                    val toJsonObjArray2 =
+                                            Configure.toJsonObjArray("MechInArch", "Eq2Fl", equip.id!!, equip.floorId!!)
+                                    if (!toJsonObjArray2.isNullOrEmpty()) {
+                                        toJsonObjArray.plus(toJsonObjArray2[0])
+                                    }
+                                    val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
+                                    if (!createRel){
+                                        message.sign = 2
+                                    }
+                                } catch (e: Exception) {
+                                    e.printStackTrace()
                                     message.sign = 2
                                 }
                             }else if (!equip.buildingId.isNullOrEmpty()) {
@@ -104,9 +111,13 @@ class DataCenterEquipment {
                         /** 失败 */
                         message.sign = 2
                     }
-                    /** 更改标记 */
-                    synchronousMessageObjService.update(message, arrayListOf("sign"))
+
+                } else {
+                    /** 失败 */
+                    message.sign = 0
                 }
+                /** 更改标记 */
+                synchronousMessageObjService.update(message, arrayListOf("sign"))
             }
             Configure.UPDATE -> {
                 /** 修改 */
@@ -126,9 +137,12 @@ class DataCenterEquipment {
                         /** 失败 */
                         message.sign = 2
                     }
-                    /** 更改标记 */
-                    synchronousMessageObjService.update(message, arrayListOf("sign"))
+
+                } else {
+                    message.sign = 0
                 }
+                /** 更改标记 */
+                synchronousMessageObjService.update(message, arrayListOf("sign"))
             }
             Configure.DELETE -> {
                 /** 删除 */

+ 10 - 4
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/DataCenterFloor.kt

@@ -92,9 +92,12 @@ class DataCenterFloor {
                         /** 失败 */
                         message.sign = 2
                     }
-                    /** 更改标记 */
-                    synchronousMessageObjService.update(message, arrayListOf("sign"))
+
+                }else {
+                    message.sign = 0
                 }
+                /** 更改标记 */
+                synchronousMessageObjService.update(message, arrayListOf("sign"))
             }
             Configure.UPDATE -> {
                 /** 修改 */
@@ -113,9 +116,12 @@ class DataCenterFloor {
                         /** 失败 */
                         message.sign = 2
                     }
-                    /** 更改标记 */
-                    synchronousMessageObjService.update(message, arrayListOf("sign"))
+
+                } else {
+                    message.sign = 0
                 }
+                /** 更改标记 */
+                synchronousMessageObjService.update(message, arrayListOf("sign"))
             }
             Configure.DELETE -> {
                 /** 删除 */

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

@@ -81,7 +81,11 @@ class DataCenterShaft {
                     }
                     /** 更改标记 */
                     synchronousMessageObjService.update(message, arrayListOf("sign"))
+                } else {
+                    message.sign = 0
                 }
+                /** 更改标记 */
+                synchronousMessageObjService.update(message, arrayListOf("sign"))
             }
             Configure.UPDATE -> {
                 /** 修改 */
@@ -101,9 +105,11 @@ class DataCenterShaft {
                         /** 失败 */
                         message.sign = 2
                     }
-                    /** 更改标记 */
-                    synchronousMessageObjService.update(message, arrayListOf("sign"))
+                } else {
+                    message.sign = 0
                 }
+                /** 更改标记 */
+                synchronousMessageObjService.update(message, arrayListOf("sign"))
             }
             Configure.DELETE -> {
                 /** 删除 */

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

@@ -125,9 +125,12 @@ class DataCenterSpace {
                         /** 失败 */
                         message.sign = 2
                     }
-                    /** 更改标记 */
-                    synchronousMessageObjService.update(message, arrayListOf("sign"))
+
+                }else {
+                    message.sign = 0
                 }
+                /** 更改标记 */
+                synchronousMessageObjService.update(message, arrayListOf("sign"))
             }
             Configure.UPDATE -> {
                 /** 修改 */
@@ -149,7 +152,11 @@ class DataCenterSpace {
                     }
                     /** 更改标记 */
                     synchronousMessageObjService.update(message, arrayListOf("sign"))
+                }else {
+                    message.sign = 0
                 }
+                /** 更改标记 */
+                synchronousMessageObjService.update(message, arrayListOf("sign"))
             }
             Configure.DELETE -> {
                 /** 删除 */

+ 9 - 4
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/DataCenterSystem.kt

@@ -78,9 +78,12 @@ class DataCenterSystem {
                         /** 失败 */
                         message.sign = 2
                     }
-                    /** 更改标记 */
-                    synchronousMessageObjService.update(message, arrayListOf("sign"))
+
+                } else {
+                    message.sign = 0
                 }
+                /** 更改标记 */
+                synchronousMessageObjService.update(message, arrayListOf("sign"))
             }
             Configure.UPDATE -> {
                 /** 修改 */
@@ -100,9 +103,11 @@ class DataCenterSystem {
                         /** 失败 */
                         message.sign = 2
                     }
-                    /** 更改标记 */
-                    synchronousMessageObjService.update(message, arrayListOf("sign"))
+                }else {
+                    message.sign = 0
                 }
+                /** 更改标记 */
+                synchronousMessageObjService.update(message, arrayListOf("sign"))
             }
             Configure.DELETE -> {
                 /** 删除 */

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

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

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

@@ -12,13 +12,13 @@ spring:
     password:                           cGVyc2FneV8yMDIwcXdlIUAj
 
     #配置rabbitMq 服务器
-#  rabbitmq:
-#    host: 39.102.43.179
-#    port: 9936
-#    username: admin
-#    password: brzj123456
-#    #虚拟host 可以不设置,使用server默认host
-#    virtual-host: /test
+  rabbitmq:
+    host: 39.102.43.179
+    port: 9936
+    username: admin
+    password: brzj123456
+    #虚拟host 可以不设置,使用server默认host
+    virtual-host: /test
 
 saga:
   dataPlatform:                        http://39.102.40.239:9970

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

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

+ 4 - 4
scanbuilding/src/main/kotlin/com/persagy/server/services/UserService.kt

@@ -70,7 +70,7 @@ object UserService : SObjectService<User>(SMybatisDao(User::class.java)) {
         super.onCreateSuccess(entityList)
         try {
             val projectId = SPageContext.getHeader("projectId")
-            val coming = SPageContext.getHeader("Coming")
+            val coming = SPageContext.getHeader("coming")
             for (entity in entityList){
                 val userLog = UserLog()
                 userLog.comming = coming!!
@@ -92,7 +92,7 @@ object UserService : SObjectService<User>(SMybatisDao(User::class.java)) {
 
         try {
             val projectId = SPageContext.getHeader("projectId")
-            val coming = SPageContext.getHeader("Coming")
+            val coming = SPageContext.getHeader("coming")
             val userLog = UserLog()
             userLog.comming = coming!!
             userLog.action = "删除用户"
@@ -112,7 +112,7 @@ object UserService : SObjectService<User>(SMybatisDao(User::class.java)) {
     override fun onUpdateBefore(entity: User): Boolean {
         try {
             val projectId = SPageContext.getHeader("projectId")
-            val coming = SPageContext.getHeader("Coming")
+            val coming = SPageContext.getHeader("coming")
             val userLog = UserLog()
             userLog.comming = coming
             userLog.action = "更新用户信息"
@@ -152,7 +152,7 @@ object UserService : SObjectService<User>(SMybatisDao(User::class.java)) {
             if (userList.size>0){
                 try {
                     var projectId = SPageContext.getHeader("projectId")
-                    val coming = SPageContext.getHeader("Coming")
+                    val coming = SPageContext.getHeader("coming")
                     logger.debug("ProjectId====$projectId")
                     if (projectId.isNullOrEmpty()){
                         projectId = userList[0].projectId

+ 6 - 6
scanbuilding/src/main/kotlin/com/persagy/server/services/base/Service.kt

@@ -79,8 +79,8 @@ open class Service<ENTITY : BaseInfo>(daoClass: SAbstractDao<ENTITY>) : SObjectS
 
         entityList.forEach {
             val projectId = SPageContext.getHeader("projectId")
-            val comming = SPageContext.getHeader("Coming")
-            val account = SPageContext.getHeader("Account")
+            val comming = SPageContext.getHeader("coming")
+            val account = SPageContext.getHeader("account")
 
             try {
                 val jsonObject = JSONObject()
@@ -156,8 +156,8 @@ open class Service<ENTITY : BaseInfo>(daoClass: SAbstractDao<ENTITY>) : SObjectS
 
         try {
             val projectId = SPageContext.getHeader("projectId")
-            val comming = SPageContext.getHeader("Coming")
-            val account = SPageContext.getHeader("Account")
+            val comming = SPageContext.getHeader("coming")
+            val account = SPageContext.getHeader("account")
             /** 日志 */
             val dataCenterLogs = DataCenterLogs()
             dataCenterLogs.id = IdUtils.uuidCreate()
@@ -187,8 +187,8 @@ open class Service<ENTITY : BaseInfo>(daoClass: SAbstractDao<ENTITY>) : SObjectS
     override fun onUpdateSuccess(entityList: ArrayList<ENTITY>) {
         try {
             val projectId = SPageContext.getHeader("projectId")
-            val comming = SPageContext.getHeader("Coming")
-            val account = SPageContext.getHeader("Account")
+            val comming = SPageContext.getHeader("coming")
+            val account = SPageContext.getHeader("account")
             val jsonObject = JSONObject()
             jsonObject.put("type", "7")
             jsonObject.put("projectId", projectId)

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

@@ -283,8 +283,8 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
      */
     override fun onUpdateSuccess(list: ArrayList<EquipScanTask>) {
         val projectId = SPageContext.getHeader("projectId")
-        val comming = SPageContext.getHeader("Coming")
-        val account = SPageContext.getHeader("Account")
+        val comming = SPageContext.getHeader("coming")
+        val account = SPageContext.getHeader("account")
         for (task in list) {
             val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
             if(task.equipId == null ){

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

@@ -286,8 +286,8 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
     override fun onUpdateSuccess(list: ArrayList<ModelScanTask>) {
 
         val projectId = SPageContext.getHeader("projectId")
-        val comming = SPageContext.getHeader("Coming")
-        val account = SPageContext.getHeader("Account")
+        val comming = SPageContext.getHeader("coming")
+        val account = SPageContext.getHeader("account")
 
         for (task in list) {
             val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))