********************WX******************

关系查询搜索

datacenter/build.gradle

@@ -32,6 +32,7 @@ apply plugin: "org.jetbrains.dokka"
 apply plugin: "war"
 apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
+apply plugin: 'java'
 
 sourceCompatibility = JVM_TARGET
 
@@ -175,3 +176,18 @@ task buildwanda {
     }
     finalizedBy(build)
 }
+
+
+task buildZip(type: Zip) {
+    from 'build/libs/zip'
+    from compileJava
+    destinationDir file('build/temp2')
+    from processResources
+    into('lib') {
+        from configurations.runtime
+    }
+}
+
+build.dependsOn buildZip
+
+

datacenter/src/main/kotlin/com/persagy/server/services/graphtype/RelationTypeProjectService.kt

@@ -439,6 +439,45 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
                                 failCount += 1
                                 continue
                             }
+                        /***************************************************************************** 限定条件 *********************************************************************************/
+
+//                        if (relType == "sp2sp_RadiationNetwork_2"||relType =="sp2sp_RadiationNetwork_1") {
+//                            if (relZoneToSpaceList[0].classCode != "LightingZone") {
+//                                /** 主对象编码识别到多个实例 */
+//                                sCreateResponse.result = SResponseType.failure
+//                                sCreateResponse.message = relationAddRequest.mainContent+":不是照明分区类型"
+//                                sCreateResponse.errorType = "2"
+//                                return sCreateResponse
+//                            }
+//                        }
+//                        if (relType == "sp2sp_ConvectionNetwork_2"||relType =="sp2sp_ConvectionNetwork_3"||relType =="sp2sp_ConvectionNetwork_1") {
+//                            if (relZoneToSpaceList[0].classCode != "AirConditioningZone") {
+//                                /** 主对象编码识别到多个实例 */
+//                                sCreateResponse.result = SResponseType.failure
+//                                sCreateResponse.message = relationAddRequest.mainContent+":不是空调分区类型"
+//                                sCreateResponse.errorType = "2"
+//                                return sCreateResponse
+//                            }
+//                        }
+//                        if (relType =="sp2sp_TrafficNetwork_3"||relType =="sp2sp_TrafficNetwork_2"||relType =="sp2sp_TrafficNetwork_1") {
+//                            if (relZoneToSpaceList[0].classCode != "GeneralZone") {
+//                                /** 主对象编码识别到多个实例 */
+//                                sCreateResponse.result = SResponseType.failure
+//                                sCreateResponse.message = relationAddRequest.mainContent+":不是物业分区类型"
+//                                sCreateResponse.errorType = "2"
+//                                return sCreateResponse
+//                            }
+//                        }
+
+
+
+
+                        /******************************************************************************************************************************************************/
+
+
+
+
+
                             logger.debug("idCode1Colid=${id1List[0]}")
                             logger.debug("idCode2Colid=${id2List[0]}")
                             row.createCell(id1Col).setCellValue(id1List[0])

datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationAddService.kt

@@ -51,6 +51,7 @@ import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 import java.text.SimpleDateFormat
 import java.util.*
+import kotlin.collections.HashMap
 
 /**
  * 添加
@@ -894,13 +895,45 @@ class ManualRelationAddService {
                 sCreateResponse.errorType = "1"
                 return sCreateResponse
             }
+
+            if (relationAddRequest.relType == "sp2sp_RadiationNetwork_2"||relationAddRequest.relType =="sp2sp_RadiationNetwork_1") {
+                if (relZoneSpaceList[0].classCode != "LightingZone") {
+                    /** 主对象编码识别到多个实例 */
+                    sCreateResponse.result = SResponseType.failure
+                    sCreateResponse.message = relationAddRequest.mainContent+":不是照明分区类型"
+                    sCreateResponse.errorType = "1"
+                    return sCreateResponse
+                }
+            }
+
+            if (relationAddRequest.relType == "sp2sp_ConvectionNetwork_2"||relationAddRequest.relType =="sp2sp_ConvectionNetwork_3"||relationAddRequest.relType =="sp2sp_ConvectionNetwork_1") {
+                if (relZoneSpaceList[0].classCode != "AirConditioningZone") {
+                    /** 主对象编码识别到多个实例 */
+                    sCreateResponse.result = SResponseType.failure
+                    sCreateResponse.message = relationAddRequest.mainContent+":不是空调分区类型"
+                    sCreateResponse.errorType = "1"
+                    return sCreateResponse
+                }
+            }
+
+            if (relationAddRequest.relType =="sp2sp_TrafficNetwork_3"||relationAddRequest.relType =="sp2sp_TrafficNetwork_2"||relationAddRequest.relType =="sp2sp_TrafficNetwork_1") {
+                if (relZoneSpaceList[0].classCode != "GeneralZone") {
+                    /** 主对象编码识别到多个实例 */
+                    sCreateResponse.result = SResponseType.failure
+                    sCreateResponse.message = relationAddRequest.mainContent+":不是物业分区类型"
+                    sCreateResponse.errorType = "1"
+                    return sCreateResponse
+                }
+            }
+
+
             logger.debug("空间类型 = ${relZoneSpaceList.toJson()}")
             val relZoneSpace = relZoneSpaceList[0]
             for (fromContent in relationAddRequest.fromContent!!){
                 if(relationAddRequest.mainContent!! == fromContent){
                     /** 主对象和从对象不能重复 */
                     sCreateResponse.result = SResponseType.failure
-                    sCreateResponse.message = fromContent+":主对象和从对象不能重复"
+                    sCreateResponse.message = fromContent+":从对象不能重复"
                     sCreateResponse.errorType = "2"
                     return sCreateResponse
                 }
@@ -923,6 +956,33 @@ class ManualRelationAddService {
                     sCreateResponse.errorType = "2"
                     return sCreateResponse
                 }
+                if (relationAddRequest.relType == "sp2sp_RadiationNetwork_2"||relationAddRequest.relType =="sp2sp_RadiationNetwork_1") {
+                    if (relZoneToSpaceList[0].classCode != "LightingZone") {
+                        /** 主对象编码识别到多个实例 */
+                        sCreateResponse.result = SResponseType.failure
+                        sCreateResponse.message = relationAddRequest.mainContent+":不是照明分区类型"
+                        sCreateResponse.errorType = "2"
+                        return sCreateResponse
+                    }
+                }
+                if (relationAddRequest.relType == "sp2sp_ConvectionNetwork_2"||relationAddRequest.relType =="sp2sp_ConvectionNetwork_3"||relationAddRequest.relType =="sp2sp_ConvectionNetwork_1") {
+                    if (relZoneToSpaceList[0].classCode != "AirConditioningZone") {
+                        /** 主对象编码识别到多个实例 */
+                        sCreateResponse.result = SResponseType.failure
+                        sCreateResponse.message = relationAddRequest.mainContent+":不是空调分区类型"
+                        sCreateResponse.errorType = "2"
+                        return sCreateResponse
+                    }
+                }
+                if (relationAddRequest.relType =="sp2sp_TrafficNetwork_3"||relationAddRequest.relType =="sp2sp_TrafficNetwork_2"||relationAddRequest.relType =="sp2sp_TrafficNetwork_1") {
+                    if (relZoneToSpaceList[0].classCode != "GeneralZone") {
+                        /** 主对象编码识别到多个实例 */
+                        sCreateResponse.result = SResponseType.failure
+                        sCreateResponse.message = relationAddRequest.mainContent+":不是物业分区类型"
+                        sCreateResponse.errorType = "2"
+                        return sCreateResponse
+                    }
+                }
             }
             /** 处理关系 */
             val setCode = HashSet<String>()
@@ -2162,7 +2222,7 @@ class ManualRelationAddService {
             sCreateResponse.message = "添加成功"
             return sCreateResponse
         }else if (relationAddRequest.relType == "eq2eq_SensorNetwork_1"||relationAddRequest.relType == "eq2eq_ControlRelation_1"
-            ||relationAddRequest.relType == "eq2eq_SensorRelationship_ss2eq"||relationAddRequest.relType == "eq2eq_ValveRelationship_vv2eq"||relationAddRequest.relType =="eq2eq_ControlEquipNetwork"){
+            ||relationAddRequest.relType == "eq2eq_ValveRelationship_vv2eq"||relationAddRequest.relType =="eq2eq_ControlEquipNetwork"){
             /** 测控类 */
             /** 给排水类 和 消防类 */
             val equipmentList = EquipmentService.select(SFilter.eq("projectId", projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
@@ -2266,47 +2326,107 @@ class ManualRelationAddService {
                         e.printStackTrace()
                     }
                 }
-            }else if (relationAddRequest.relType == "eq2eq_SensorRelationship_ss2eq"){/** 传感器测量设备关系 */
+            }else if (relationAddRequest.relType == "eq2eq_ValveRelationship_vv2eq"){/** 阀门限制设备关系 */
                 for (equipmentTo in equipmentToList) {
                     val rEq2Eq = REq2Eq()
                     rEq2Eq.id1 = equipment.id
                     rEq2Eq.projectId = projectId
                     rEq2Eq.sign = 1
                     rEq2Eq.id2 = equipmentTo.id
-                    rEq2Eq.type = "eq2eq_SensorRelationship_ss2eq"
+                    rEq2Eq.type = "eq2eq_ValveRelationship_vv2eq"
                    val replace = rEq2EqService.replace(rEq2Eq)
                     try {
                         if (replace) {
                             /** 发送消息 */
-                            rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_SensorRelationship_ss2eq","11",rEq2Eq.id1!!,rEq2Eq.id2!!)
+                            rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ValveRelationship_vv2eq","11",rEq2Eq.id1!!,rEq2Eq.id2!!)
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                     }
                 }
-            }else if (relationAddRequest.relType == "eq2eq_ValveRelationship_vv2eq"){/** 阀门限制设备关系 */
+            }
+            sCreateResponse.result = SResponseType.success
+            sCreateResponse.message = "添加成功"
+            return sCreateResponse
+        }else if (relationAddRequest.relType == "eq2eq_SensorRelationship_ss2eq"){
+            /** 传感器测量设备关系 ***************************************************************************************/
+            /** 给排水类 和 消防类 */
+            val equipmentList = EquipmentService.select(SFilter.eq("projectId", projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
+            if (equipmentList.size<1){
+                /** 主对象不存在 */
+                sCreateResponse.result = SResponseType.failure
+                sCreateResponse.message = relationAddRequest.mainContent+":不存在"
+                sCreateResponse.errorType = "1"
+                return sCreateResponse
+            }
+            if (equipmentList.size>1){
+                /** 主对象编码识别到多个实例 */
+                sCreateResponse.result = SResponseType.failure
+                sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
+                sCreateResponse.errorType = "1"
+                return sCreateResponse
+            }
+
+            val ss2EqCheck = ss2EqCheck()
+            val containsKey = ss2EqCheck.containsKey(equipmentList[0].classCode)
+            if (!containsKey) {
+                /** 主对象编码识别到多个实例 */
+                sCreateResponse.result = SResponseType.failure
+                sCreateResponse.message = relationAddRequest.mainContent+":错误的类型参考：这里的传感器包含车库摄像头，车位检测器，办公摄像头，火灾探测器，燃气探测器，漏电探测器，消防设备电源传感器，监控摄像头，入侵报警探测器，以及传感器系统下所有设备类型"
+                sCreateResponse.errorType = "1"
+                return sCreateResponse
+            }
+
+            val equipment = equipmentList[0]
+            for (fromContent in relationAddRequest.fromContent!!){
+                /** 去除主对象空间id */
+                val equipmentToList = EquipmentService.select(
+                    SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!),
+                    SFilter.not(SFilter.eq("id",equipment.id!!))).exec()
+                if (equipmentToList.size<1){
+                    /** 从对象不存在 */
+                    sCreateResponse.result = SResponseType.failure
+                    sCreateResponse.message = fromContent+":不存在"
+                    sCreateResponse.errorType = "2"
+                    return sCreateResponse
+                }
+                if (equipmentToList.size>1){
+                    /** 从对象编码识别到多个实例 */
+                    sCreateResponse.result = SResponseType.failure
+                    sCreateResponse.message = fromContent+":存在多个实例"
+                    sCreateResponse.errorType = "2"
+                    return sCreateResponse
+                }
+            }
+            /** 处理关系 */
+            val setCode = HashSet<String>()
+            for (fromContent in relationAddRequest.fromContent!!){
+                setCode.add(fromContent)
+            }
+            /** 查询空间 */
+            val equipmentToList = EquipmentService.select(
+                SFilter.eq("projectId", projectId), SFilter.inList(relationAddRequest.type!!, setCode.toList()),
+                SFilter.not(SFilter.eq("id",equipment.id!!))).exec()
+
                 for (equipmentTo in equipmentToList) {
                     val rEq2Eq = REq2Eq()
                     rEq2Eq.id1 = equipment.id
                     rEq2Eq.projectId = projectId
                     rEq2Eq.sign = 1
                     rEq2Eq.id2 = equipmentTo.id
-                    rEq2Eq.type = "eq2eq_ValveRelationship_vv2eq"
-                   val replace = rEq2EqService.replace(rEq2Eq)
+                    rEq2Eq.type = "eq2eq_SensorRelationship_ss2eq"
+                    val replace = rEq2EqService.replace(rEq2Eq)
                     try {
                         if (replace) {
                             /** 发送消息 */
-                            rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_ValveRelationship_vv2eq","11",rEq2Eq.id1!!,rEq2Eq.id2!!)
+                            rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_SensorRelationship_ss2eq","11",rEq2Eq.id1!!,rEq2Eq.id2!!)
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                     }
                 }
-            }
-            sCreateResponse.result = SResponseType.success
-            sCreateResponse.message = "添加成功"
-            return sCreateResponse
-        }else if (relationAddRequest.relType == "eq2sy_ControlRelation_2"||relationAddRequest.relType == "eq2sy_SensorRelationship_ss2sy"||relationAddRequest.relType == "eq2sy_ValveRelationship_vv2sy"){
+
+        } else if (relationAddRequest.relType == "eq2sy_ControlRelation_2"||relationAddRequest.relType == "eq2sy_ValveRelationship_vv2sy"){
 
             if (!relationAddRequest.type.isNullOrEmpty()&&relationAddRequest.type == "cadId"){
                 /** 从对象不存在cadId编码 */
@@ -2376,47 +2496,110 @@ class ManualRelationAddService {
                         e.printStackTrace()
                     }
                 }
-            }else if (relationAddRequest.relType == "eq2sy_SensorRelationship_ss2sy"){ /** 传感器测量系统关系 */
+            }else  if (relationAddRequest.relType == "eq2sy_ValveRelationship_vv2sy"){ /** 阀门限制系统关系 */
                 for (equipmentTo in equipmentToList) {
                     val rEq2Sy = REq2Sy()
                     rEq2Sy.id1 = equipment.id
                     rEq2Sy.projectId = projectId
                     rEq2Sy.sign = 1
                     rEq2Sy.id2 = equipmentTo.id
-                    rEq2Sy.type = "eq2sy_SensorRelationship_ss2sy"
-                   val replace = rEq2SyService.replace(rEq2Sy)
+                    rEq2Sy.type = "eq2sy_ValveRelationship_vv2sy"
+                    val replace = rEq2SyService.replace(rEq2Sy)
                     try {
                         if (replace) {
                             /** 发送消息 */
-                            rabbitMqService.sendRel(Opt.projectId!!, "eq2sy_SensorRelationship_ss2sy","11",rEq2Sy.id1!!,rEq2Sy.id2!!)
+                            rabbitMqService.sendRel(Opt.projectId!!, "eq2sy_ValveRelationship_vv2sy","11",rEq2Sy.id1!!,rEq2Sy.id2!!)
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                     }
                 }
-            }else if (relationAddRequest.relType == "eq2sy_ValveRelationship_vv2sy"){ /** 阀门限制系统关系 */
+            }
+
+            sCreateResponse.result = SResponseType.success
+            sCreateResponse.message = "添加成功"
+            return sCreateResponse
+        }else if (relationAddRequest.relType == "eq2sy_SensorRelationship_ss2sy"){
+            /** 传感器测量系统关系 ********************************************************/
+            if (!relationAddRequest.type.isNullOrEmpty()&&relationAddRequest.type == "cadId"){
+                /** 从对象不存在cadId编码 */
+                sCreateResponse.result = SResponseType.failure
+                sCreateResponse.message = "从对象不存在CADID编码"
+                sCreateResponse.errorType = "2"
+                return sCreateResponse
+            }
+            /** 给排水类 和 消防类 */
+            val equipmentList = EquipmentService.select(SFilter.eq("projectId", projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
+            if (equipmentList.size<1){
+                /** 主对象不存在 */
+                sCreateResponse.result = SResponseType.failure
+                sCreateResponse.message = relationAddRequest.mainContent+":不存在"
+                sCreateResponse.errorType = "1"
+                return sCreateResponse
+            }
+            if (equipmentList.size>1){
+                /** 主对象编码识别到多个实例 */
+                sCreateResponse.result = SResponseType.failure
+                sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
+                sCreateResponse.errorType = "1"
+                return sCreateResponse
+            }
+
+            val ss2EqCheck = ss2EqCheck()
+            val containsKey = ss2EqCheck.containsKey(equipmentList[0].classCode)
+            if (!containsKey) {
+                /** 主对象编码识别到多个实例 */
+                sCreateResponse.result = SResponseType.failure
+                sCreateResponse.message = relationAddRequest.mainContent+":错误的类型参考：这里的传感器包含车库摄像头，车位检测器，办公摄像头，火灾探测器，燃气探测器，漏电探测器，消防设备电源传感器，监控摄像头，入侵报警探测器，以及传感器系统下所有设备类型"
+                sCreateResponse.errorType = "1"
+                return sCreateResponse
+            }
+
+            val equipment = equipmentList[0]
+            for (fromContent in relationAddRequest.fromContent!!){
+                /** 去除主对象空间id */
+                val equipmentToList = GeneralSystemService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
+                if (equipmentToList.size<1){
+                    /** 从对象不存在 */
+                    sCreateResponse.result = SResponseType.failure
+                    sCreateResponse.message = fromContent+":不存在"
+                    sCreateResponse.errorType = "2"
+                    return sCreateResponse
+                }
+                if (equipmentToList.size>1){
+                    /** 从对象编码识别到多个实例 */
+                    sCreateResponse.result = SResponseType.failure
+                    sCreateResponse.message = fromContent+":存在多个实例"
+                    sCreateResponse.errorType = "2"
+                    return sCreateResponse
+                }
+            }
+            /** 处理关系 */
+            val setCode = HashSet<String>()
+            for (fromContent in relationAddRequest.fromContent!!){
+                setCode.add(fromContent)
+            }
+            /** 查询空间 */
+            val equipmentToList = GeneralSystemService.select(SFilter.eq("projectId", projectId), SFilter.inList(relationAddRequest.type!!, setCode.toList())).exec()
+
                 for (equipmentTo in equipmentToList) {
                     val rEq2Sy = REq2Sy()
                     rEq2Sy.id1 = equipment.id
                     rEq2Sy.projectId = projectId
                     rEq2Sy.sign = 1
                     rEq2Sy.id2 = equipmentTo.id
-                    rEq2Sy.type = "eq2sy_ValveRelationship_vv2sy"
+                    rEq2Sy.type = "eq2sy_SensorRelationship_ss2sy"
                     val replace = rEq2SyService.replace(rEq2Sy)
                     try {
                         if (replace) {
                             /** 发送消息 */
-                            rabbitMqService.sendRel(Opt.projectId!!, "eq2sy_ValveRelationship_vv2sy","11",rEq2Sy.id1!!,rEq2Sy.id2!!)
+                            rabbitMqService.sendRel(Opt.projectId!!, "eq2sy_SensorRelationship_ss2sy","11",rEq2Sy.id1!!,rEq2Sy.id2!!)
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                     }
                 }
-            }
 
-            sCreateResponse.result = SResponseType.success
-            sCreateResponse.message = "添加成功"
-            return sCreateResponse
         }else if (relationAddRequest.relType == "eq2sp_SensorRelationship_ss2sp"){
             if (!relationAddRequest.type.isNullOrEmpty()&&relationAddRequest.type == "cadId"){
                 /** 从对象不存在cadId编码 */
@@ -2444,6 +2627,16 @@ class ManualRelationAddService {
 
             val equipment = equipmentList[0]
 
+            val ss2EqCheck = ss2EqCheck()
+            val containsKey = ss2EqCheck.containsKey(equipment.classCode)
+            if (!containsKey) {
+                /** 主对象编码识别到多个实例 */
+                sCreateResponse.result = SResponseType.failure
+                sCreateResponse.message = relationAddRequest.mainContent+":错误的类型参考：这里的传感器包含车库摄像头，车位检测器，办公摄像头，火灾探测器，燃气探测器，漏电探测器，消防设备电源传感器，监控摄像头，入侵报警探测器，以及传感器系统下所有设备类型"
+                sCreateResponse.errorType = "1"
+                return sCreateResponse
+            }
+
             for (fromContent in relationAddRequest.fromContent!!){
                 /** 去除主对象空间id */
                 val equipmentToList = ZoneSpaceBaseService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
@@ -3394,4 +3587,38 @@ class ManualRelationAddService {
         return df.format(Date())
     } // Fun
 
+    /**
+     * 传感器类型
+     */
+    fun ss2EqCheck(): HashMap<String,String> {
+        val map = HashMap<String,String>()
+        map["SPVSCM"] = "1"
+        map["FFEALS"] = "1"
+        map["FFFPSE"] = "1"
+        map["FFFASE"] = "1"
+        map["SPIASE"] = "1"
+        map["WEGMCM"] = "1"
+        map["WEOFCM"] = "1"
+        map["WEGMPD"] = "1"
+        map["FFGASE"] = "1"
+        map["OTSESP"] = "1"
+        map["OTSESD"] = "1"
+        map["OTSETP"] = "1"
+        map["OTSEVD"] = "1"
+        map["OTSEPS"] = "1"
+        map["OTSEPF"] = "1"
+        map["OTSERH"] = "1"
+        map["OTSEIP"] = "1"
+        map["OTSEIL"] = "1"
+        map["OTSEHT"] = "1"
+        map["OTSECB"] = "1"
+        map["OTSECT"] = "1"
+        map["OTSEEE"] = "1"
+        map["OTSEDP"] = "1"
+        map["OTSEFL"] = "1"
+        return map
+    }
+
+
+
 }

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

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

datacenter/src/main/resources/application.yml

@@ -1,28 +1,25 @@
 ###############################################################################################################
 
-#启用监控
-#management:
-#  endpoints:
-#    web:
-#      exposure:
-#        include:
-#          - "*"  # 开放所有端点health，info，metrics，通过actuator/+端点名就可以获取相应的信息。默认打开health和info
-#  endpoint:
-#    health:
-#      #未开启actuator/health时，我们获取到的信息是{"status":"UP"}，status的值还有可能是 DOWN。开启后打印详细信息
-#      show-details:                       always
-###############################################################################################################
+eureka:
+  client:                                   #客户端注册进eureka服务列表内
+    service-url:
+      #      defaultZone:                          http://192.168.64.18:9931/eureka
+      defaultZone:                          http://frame:123456@192.168.64.18:9931/eureka
+      #      defaultZone:                          http://admin:1qaz2wsx@127.0.0.1:8888/eureka/ #增加密码
+      enable-self-preservation: false # 设为false，关闭自我保护
+      eviction-interval-timer-in-ms: 5000 # 清理间隔（单位毫秒，默认是60*1000）启用主动失效，
 
-#eureka:
-#  client:                                   #客户端注册进eureka服务列表内
-#    service-url:
-#      defaultZone:                          http://172.17.11.174:8761/eureka
-#
-#  instance:
-#    # 实例ID
-#    # instance-id:                            ${spring.application.name}:${server.port}:${project.version}
-#    # 优先使用IP地址方式进行注册服务
-#    prefer-ip-address:                      true
+#启用监控
+management:
+  endpoints:
+    web:
+      exposure:
+        include:
+          - "*"  # 开放所有端点health，info，metrics，通过actuator/+端点名就可以获取相应的信息。默认打开health和info
+  endpoint:
+    health:
+      #未开启actuator/health时，我们获取到的信息是{"status":"UP"}，status的值还有可能是 DOWN。开启后打印详细信息
+      show-details:                       always
 
 
 server:
@@ -43,6 +40,9 @@ spring:
     name:                               datacenter
     type:                               com.alibaba.druid.pool.DruidDataSource
     driver-class-name:                  org.postgresql.Driver
+    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
+    username:                           postgres
+    password:                           cGVyc2FneV8yMDIwcXdlIUAj
 
   jackson:
     date-format:                        yyyy-MM-dd HH:mm:ss
@@ -56,6 +56,14 @@ spring:
       # 属性按字母顺序输出
       sort_properties_alphabetically:   true
 
+  rabbitmq:
+    host: 192.168.100.108
+    port: 9936
+    username: pbsage
+    password: pbsage123
+    #虚拟host 可以不设置,使用server默认host
+    virtual-host: /adm
+
 # spring-doc 配置
 springdoc:
   # springdoc 扫描的包，多个包之间使用逗号分隔
@@ -70,3 +78,12 @@ springdoc:
 
 mybatis:
   typeAliasesPackage:                   cn.sagacloud.server.datacenter.entities
+
+
+mqtopid: # 消息
+  exchange:                           exchange-dmp
+  routingKey:                         routingKey-center-adm
+  admQueue:                           queue-center-adm
+  synQueue:                           queue-center-syn
+  routingKey01:                       routing-dmp-rwd
+  routingKey02:                       routing-dmp-org

equip-component/src/main/resources/application-prod.yml

@@ -1,16 +1,16 @@
 
 
 server:
-  port: 8834
+  port: 8080
 
 spring:
   datasource:
 #    url:                                jdbc:postgresql://data-center:5432/datacenter
 #    username:                           postgres
 #    password:                           123qwe!@#
-    url:                                jdbc:postgresql://v49201.db.redstar.pro:5432/datacenter
+    url:                                jdbc:postgresql://172.17.23.64:5432/datacenter
     username:                           postgres
-    password:                           123456
+    password:                           cGVyc2FneV8yMDIwcXdlIUAj
 
 
 # spring-cloud相关配置
@@ -18,7 +18,7 @@ eureka:
   client:                                   #客户端注册进eureka服务列表内
     service-url:
       #      defaultZone:                          http://192.168.64.18:9931/eureka
-      defaultZone:                                http://frame:123456@172.16.46.33:9931/integrated-eureka/eureka/,http://frame:123456@172.16.46.34:9931/integrated-eureka/eureka/
+      defaultZone:                                http://frame:123456@39.102.43.179:9931/eureka/
       #      defaultZone:                                http://frame:123456@192.168.64.18:9931/eureka
       #      defaultZone:                          http://admin:1qaz2wsx@127.0.0.1:8888/eureka/ #增加密码
       enable-self-preservation: false # 设为false，关闭自我保护

equip-component/src/main/resources/application-prod1.yml

@@ -1,16 +1,16 @@
 
 
 server:
-  port: 8080
+  port: 8834
 
 spring:
   datasource:
 #    url:                                jdbc:postgresql://data-center:5432/datacenter
 #    username:                           postgres
 #    password:                           123qwe!@#
-    url:                                jdbc:postgresql://172.17.100.16:5432/datacenter
+    url:                                jdbc:postgresql://v49201.db.redstar.pro:5432/datacenter
     username:                           postgres
-    password:                           cGVyc2FneV8yMDIwcXdlIUAj
+    password:                           123456
 
 
 # spring-cloud相关配置
@@ -18,7 +18,7 @@ eureka:
   client:                                   #客户端注册进eureka服务列表内
     service-url:
       #      defaultZone:                          http://192.168.64.18:9931/eureka
-      defaultZone:                                http://frame:123456@39.102.43.179:9931/eureka/
+      defaultZone:                                http://frame:123456@172.16.46.33:9931/integrated-eureka/eureka/,http://frame:123456@172.16.46.34:9931/integrated-eureka/eureka/
       #      defaultZone:                                http://frame:123456@192.168.64.18:9931/eureka
       #      defaultZone:                          http://admin:1qaz2wsx@127.0.0.1:8888/eureka/ #增加密码
       enable-self-preservation: false # 设为false，关闭自我保护

scanbuilding/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
     #    url:                                jdbc:postgresql://data-center:5432/datacenter
     #    username:                           postgres
     #    password:                           123qwe!@#
-    url:                                jdbc:postgresql://172.17.100.16:5432/datacenter
+    url:                                jdbc:postgresql://172.17.23.64:5432/datacenter
 #    url:                                jdbc:postgresql://172.17.11.228:5432/datacenterlabsl
     username:                           postgres
     #    password:                           persagy_2020qwe!@#