Browse Source

********************WX***********************
控制连接

zhangweixin 4 years ago
parent
commit
73cf4e7d7e

+ 11 - 11
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/task/BuildingDic.kt

@@ -37,24 +37,24 @@ import javax.persistence.Column
 @Schema(description = "建筑")
 class BuildingDic {
 
-    /** buildingId */
-    @Schema(description = "buildingId")
+    /** id */
+    @Schema(description = "id")
     @Column(name = "id")
-    var buildingId: String? = null
+    var id: String? = null
 
-    /** buildingName */
-    @Schema(description = "buildingName")
+    /** name */
+    @Schema(description = "name")
     @Column(name = "name")
-    var buildingName: String? = null
+    var name: String? = null
 
-    /** buildingLocalName */
-    @Schema(description = "buildingLocalName")
+    /** localName */
+    @Schema(description = "localName")
     @Column(name = "local_name")
-    var buildingLocalName: String? = null
+    var localName: String? = null
 
     /** floorList */
-    @Schema(description = "floorList")
-    var floorList: ArrayList<FloorDic>? = null
+    @Schema(description = "floor")
+    var floor: ArrayList<FloorDic>? = null
 
     /** floorListStr */
     @Schema(description = "floorListStr")

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

@@ -195,8 +195,8 @@ class ShaftController {
      */
     @Operation(summary ="查询和当前竖井有关联的业务空间所在建筑及楼层信息", description ="shaftId 为竖井id")
     @GetMapping(value = ["/shaft-zoneSpaceBaseTable-building"])
-    fun shaftZoneSpaceBaseTableBuilding(@RequestParam ShaftId: String,@RequestParam ObjectType:String?): SQueryResponse<BuildingDic>{
-        return ShaftService.shaftZoneSpaceBaseTableBuilding(ShaftId,ObjectType)
+    fun shaftZoneSpaceBaseTableBuilding(@RequestParam shaftId: String,@RequestParam objectType:String?): SQueryResponse<BuildingDic>{
+        return ShaftService.shaftZoneSpaceBaseTableBuilding(shaftId,objectType)
     } // Fun shaftZoneSpaceBaseTable()
 
 

+ 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")

+ 2 - 2
datacenter/src/main/kotlin/com/persagy/server/services/objects/ShaftService.kt

@@ -405,7 +405,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
                         setId.add(floor.floorId!!)
                     }
                     val floorLists = ArrayList<FloorDic>()
-                    val floorList = FloorService.select(SFilter.inList("id", setId.toList())).order("sequenceId desc").exec()
+                    val floorList = FloorService.select(SFilter.inList("id", setId.toList())).order("floorSequenceId desc").exec()
                     for (floors in floorList){
                         val floorDic = FloorDic()
                         floorDic.floorId = floors.id
@@ -413,7 +413,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
                         floorDic.floorName = floors.name
                         floorLists.add(floorDic)
                     }
-                    floor.floorList = floorLists
+                    floor.floor = floorLists
                     floor.floorListStr = null
                 }
             }

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/MepSystemCalcService.kt

@@ -76,7 +76,7 @@ class MepSystemCalcService {
                 if(it.sourceType != null && it.sourceType!!.length == 4)
                     typeSet.add(it.sourceType!!)
             }
-            val equipments = equipmentService.select(SFilter.and(SFilter.not(SFilter.isNull("bimId")), SFilter.eq("projectId", projectId), SFilter.inList("category", typeSet.toList()))).exec()
+            val equipments = equipmentService.select(SFilter.and(SFilter.not(SFilter.isNull("bimId")), SFilter.eq("projectId", projectId), SFilter.inList("classCode", typeSet.toList()))).exec()
             val bimIdSet = HashSet<String>()
             equipments.forEach {
                 if(it.bimId != null && it.bimId!!.length > 10)

+ 2 - 1
datacenter/src/main/resources/application-dev.yml

@@ -34,7 +34,8 @@ spring:
     type:                               com.alibaba.druid.pool.DruidDataSource
     driver-class-name:                  org.postgresql.Driver
 #    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
-    url:                                jdbc:postgresql://192.168.64.15:5432/datacenter
+    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
+#    url:                                jdbc:postgresql://192.168.64.15:5432/datacenter
 #    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
     username:                           postgres
 #    password:                           persagy_2020qwe!@#

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

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

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

@@ -5,9 +5,9 @@ spring:
 #    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
     #    username:                           postgres
     #    password:                           123qwe!@#
-#    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
+    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
 #    url:                                jdbc:postgresql://192.168.64.15:5432/datacenter
-    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
+#    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
     username:                           postgres
     #    password:                           persagy_2020qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj