Forráskód Böngészése

********************WX***********************
添加微服务和数据中台通讯方式

zhangweixin 4 éve
szülő
commit
a40770bd4b

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

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

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

@@ -154,7 +154,7 @@ interface IRelationExcelExportMapper {
     @Select("SELECT r.eq_id AS id, eq.name, eq.local_id, eq.local_name, '设备' AS object_type,\n" +
             "       r.sp_id AS _id, sp.name AS _name, sp.local_id AS _local_id, sp.local_name AS _local_name, '空间' AS _object_type\n" +
             "FROM relationship.r_eq2sp r JOIN equipment AS eq ON r.eq_id = eq.id JOIN zone_space_base AS sp ON r.sp_id = sp.id\n" +
-            "WHERE r.project_id = #{projectId} AND r.type = #{type} AND r.zoneType = #{zoneType}")
+            "WHERE r.project_id = #{projectId} AND r.type = #{type} AND r.zone_type = #{zoneType}")
     fun eq2sp(projectId: String, type: String, zoneType :String): List<HashMap<String, Any?>>
 
     /**

+ 1 - 3
datacenter/src/main/kotlin/com/persagy/server/services/dict/dictnew/DictDefClassService.kt

@@ -319,7 +319,6 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
             /** 项目对应的集团对象不为空 */
             if (dictProject!=null) {
                 val dictDefFuncBuilder01 = dictDefFuncId.select(request.filters).filter(SFilter.eq("projectId", projectId),
-                    SFilter.eq("groupCode", dictProject.groupCode!!),
                     SFilter.eq("classCode", request.type!!))
 
                 val dictDefFuncList01 = dictDefFuncBuilder01.table("dict.def_funcid_project").order("sort").exec()
@@ -333,7 +332,6 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                         schemeService.dictInfoProperty(projectId, dictProject.groupCode!!, equipFamily.equipCode!!,request.type!!)
                         val dictDefFuncBuilder = dictDefFuncId.select(
                             SFilter.eq("projectId", projectId),
-                            SFilter.eq("groupCode", dictProject.groupCode!!),
                             SFilter.eq("classCode", request.type!!)
                         )
                         val dictDefFuncList = dictDefFuncBuilder.table("dict.def_funcid_project").order("sort").exec()
@@ -366,7 +364,7 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                 sQueryResponse.result = SResponseType.success
             }
         }else {
-           return  dictDefFuncId.pageQuery(request)
+           return  dictDefFuncId.pageQuery(request, arrayListOf(SFilter.eq("projectId", projectId!!)))
         }
         return sQueryResponse
     } // Fun categoryInfoQuery()

+ 9 - 1
datacenter/src/main/kotlin/com/persagy/server/services/objects/EquipmentProSyService.kt

@@ -78,7 +78,15 @@ object EquipmentProSyService : Service<EquipmentProSy>(SMybatisDao(EquipmentProS
             equip.projectId = projectId
             /** 设备名字 */
             if (equip.name.isNullOrEmpty()) {
-                equip.name = ShaftNameUtil.shaftName("设备-")
+                val entity = defClassService.select(
+                    SFilter.eq("projectId", equip.projectId!!),
+                    SFilter.eq("code", equip.classCode!!)
+                ).entity()
+                if (entity!=null) {
+                    equip.name = ShaftNameUtil.shaftName(entity.name+"-")
+                }else {
+                    equip.name = ShaftNameUtil.shaftName("设备-")
+                }
             }
 
         } catch (e: Exception) {

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

@@ -79,9 +79,20 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
         }
         /** 项目id */
         equip.projectId = Opt.projectId
+        if (equip.classCode.isNullOrEmpty()) {
+            return false
+        }
         /** 设备名字 */
         if (equip.name.isNullOrEmpty()) {
-            equip.name = ShaftNameUtil.shaftName("设备-")
+            val entity = defClassService.select(
+                SFilter.eq("projectId", equip.projectId!!),
+                SFilter.eq("code", equip.classCode!!)
+            ).entity()
+            if (entity!=null) {
+                equip.name = ShaftNameUtil.shaftName(entity.name+"-")
+            }else {
+                equip.name = ShaftNameUtil.shaftName("设备-")
+            }
         }
         equip.codeType = 1
         return true

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

@@ -155,6 +155,9 @@ open class ManualRelationCalcService {
             /** 级联资产 */
             val sCascadeQuery = SCascadeQuery()
             sCascadeQuery.name = "objectInfo"
+            if (!manualRelationCalcRequest.category.isNullOrEmpty()) {
+                sCascadeQuery.filters = "zoneType = '${manualRelationCalcRequest.category}'"
+            }
             sCascadeQueryList.add(sCascadeQuery)
             sQueryRequest.cascade = sCascadeQueryList
 
@@ -2274,7 +2277,7 @@ open class ManualRelationCalcService {
                     delete = REqForBdService.delete(SFilter.eq("projectId", projectId!!),
                         SFilter.eq("equipId", manualRelationCalcDel.fromId!!), SFilter.eq("buildingId", manualRelationCalcDel.toId!!))
                 }else if (manualRelationCalcDel.relType == "sy2sp_for"){ /** 系统服务于业务空间 */
-                    delete = RSyForSpBaseService.delete(SFilter.eq("projectId", projectId!!),
+                    delete = rSy2SpService.delete(SFilter.eq("projectId", projectId!!),
                         SFilter.eq("id1", manualRelationCalcDel.fromId!!), SFilter.eq("id2", manualRelationCalcDel.toId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
                 }else if (manualRelationCalcDel.relType == "sy2sh_for"){
                     /** 系统服务于竖井 */
@@ -3646,7 +3649,7 @@ open class ManualRelationCalcService {
                     manualRelationCalcResponse.total = pageQuery.total
                     logger.debug("条件1= ${manualRelationCalcResponse.toJson()}")
                     return manualRelationCalcResponse
-                }else if (manualRelationCalcRequest.relType == "sp2sp_TrafficNetwork_3") {
+                }else if (manualRelationCalcRequest.relType == "sp2sp_TrafficNetwork_2") {
                     /** 空间消防常开交通 */
                     val pageQuery = relZoneSpacefireOpenService.pageQuery(sQueryRequest, list)
                     val manualRelationCalcResponse = ManualRelationCalcResponse()

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

@@ -31,20 +31,20 @@ 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.100.16:5432/datacenter
 #    url:                                jdbc:postgresql://172.17.11.228:5432/datacenterlabsl
-    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
+#    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
     username:                           postgres
 #    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:

+ 13 - 2
equip-component/src/main/kotlin/com/persagy/server/service/EquipmentProSyService.kt

@@ -29,6 +29,7 @@ package com.persagy.server.service
 import com.persagy.database.SFilter
 import com.persagy.database.extensions.keyValue
 import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.datacenter.models.entities.dictnew.DefClass
 import com.persagy.server.datacenter.models.entities.objects.Property
 import com.persagy.server.datacenter.models.entities.rel.RSyEq
 import com.persagy.server.models.EquipmentProSy
@@ -37,6 +38,7 @@ import com.persagy.server.service.objects.PropertyService
 import com.persagy.server.synchronize.MessageHandler
 import com.persagy.server.utils.IdUtils
 import com.persagy.server.utils.ShaftNameUtil
+import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.requests.SCreateRequest
 import com.persagy.service.utils.SSpringContextUtil
@@ -57,7 +59,8 @@ object EquipmentProSyService : Service<EquipmentProSy>(SMybatisDao(EquipmentProS
     private val messageHandler by lazy {
         SSpringContextUtil.getBean(MessageHandler::class.java) as MessageHandler
     }
-
+    /** 平台集团对象类型 */
+    val defClassService = SObjectService(SMybatisDao(DefClass::class.java))
 
     override fun onCreateBefore(equip: EquipmentProSy): Boolean {
         try {
@@ -77,7 +80,15 @@ object EquipmentProSyService : Service<EquipmentProSy>(SMybatisDao(EquipmentProS
             equip.projectId = projectId
             /** 设备名字 */
             if (equip.name.isNullOrEmpty()) {
-                equip.name = ShaftNameUtil.shaftName("设备-")
+                val entity = defClassService.select(
+                    SFilter.eq("projectId", equip.projectId!!),
+                    SFilter.eq("code", equip.classCode!!)
+                ).entity()
+                if (entity!=null) {
+                    equip.name = ShaftNameUtil.shaftName(entity.name+"-")
+                }else {
+                    equip.name = ShaftNameUtil.shaftName("设备-")
+                }
             }
 
         } catch (e: Exception) {

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

@@ -19,9 +19,9 @@ 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.100.16:5432/datacenter
 #    url:                                jdbc:postgresql://172.17.11.228:5432/datacenterlabsl
-    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
+#    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
     username:                           postgres
 #    password:                           persagy_2020qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj