Kaynağa Gözat

********************WX******************
调整空间关系

zhangweixin 4 yıl önce
ebeveyn
işleme
4b7eda2154

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

@@ -63,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")

+ 7 - 8
datacenter/src/main/kotlin/com/persagy/server/services/objects/GeneralSystemService.kt

@@ -467,15 +467,14 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
 //        else if(floorId.isNullOrEmpty()&&buildingId.isNullOrEmpty()){
 //            /** 楼层id为空,建筑id为空 ---> 查询所有 */
 //        }
-        logger.debug("id01= ${list.toJson()}")
+//        logger.debug("id01= ${list.toJson()}")
         val pageInfo = pageQuery(request, list)
-
-//        for(system in pageInfo.content!!){
-//            val queryBuilder = buildingFloorInfoService.selectAll()
-//            queryBuilder.tableName="f_get_bd_and_fl('${system.id}','$buildingId','$floorId')"
-//            val bdflList = queryBuilder.exec()
-//            system.buildingFloorInfoList = bdflList
-//        }
+        for(system in pageInfo.content!!){
+            val queryBuilder = buildingFloorInfoService.selectAll()
+            queryBuilder.tableName="f_get_bd_and_fl('${system.id}','$buildingId','$floorId')"
+            val bdflList = queryBuilder.exec()
+            system.buildingFloorInfoList = bdflList
+        }
         return pageInfo
     } // Fun pageQuerys
 

+ 14 - 14
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: