浏览代码

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

zhangweixin 4 年之前
父节点
当前提交
807644386e

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

@@ -112,8 +112,8 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
 //                    pageInfo = queryBuilder.pageQuery(1, 1000)
 
                         dictSchemeCategoryList = defClassService.select(
-                            SFilter.eq("parentCode","equipment"), SFilter.eq("type", "group"),
-                            SFilter.eq("groupCode", dictProject.groupCode!!)
+                            SFilter.eq("parentCode","equipment"),
+                            SFilter.eq("projectId",projectId!!)
                         ).exec()
 
                     }

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

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

+ 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.11.228:5432/datacenterlabsl
+    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
     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:

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

@@ -77,7 +77,7 @@ class MessageProcessing {
             if (messageTypeRwd!=0){
                 try {
                     messageTypeRwd = 0
-                    val syncRwdMessageList = syncRwdMessageService.select(SFilter.not(SFilter.eq("state", 0))).order("lastUpdate").limit(1000).exec()
+                    val syncRwdMessageList = syncRwdMessageService.select(SFilter.eq("projectId","Pj3702020002"),SFilter.not(SFilter.eq("state", 0))).order("lastUpdate").limit(1000).exec()
                     if (syncRwdMessageList.size >0){
                         rwdSync.dataSync(syncRwdMessageList)
                         messageTypeRwd = 1

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

@@ -86,7 +86,7 @@ object DClassDefService : SObjectService<DefClass>(SMybatisDao(DefClass::class.j
         val groupQueryList = DictTypeApi.groupQuery()
         logger.debug("集团结果:${groupQueryList.toJson()}")
         if (groupQueryList.size > 0) {
-            groupService.deleteAll()
+//            groupService.deleteAll()
             for (groupQuery in groupQueryList) {
                 val group = Group()
                 group.id = groupQuery.id

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

@@ -88,7 +88,6 @@ class RwdEquip {
                                 equipment.floorId = hashMap["objTo"].toString()
                             }
                         }
-
                         equipService.replace(equipment)
                         message.state = 0
                     } else {
@@ -113,6 +112,25 @@ class RwdEquip {
                             dictProject!!.groupCode!!,
                             queryIdList[0]
                         )
+
+                        /** 设备的建筑 */
+                        val equipInBuildingList =
+                            EquipApi.equipInBuilding(dictProject.groupCode!!, message.projectId!!, message.targetId!!)
+                        if (equipInBuildingList.size>0){
+                            val hashMap = equipInBuildingList[0]
+                            if (hashMap.containsKey("objTo")){
+                                floorDataConversions.buildingId = hashMap["objTo"].toString()
+                            }
+                        }
+                        /** 查询设备和楼层关系 */
+                        val equipInFloorList = EquipApi.equipInFloor(dictProject.groupCode!!, message.projectId!!, message.targetId!!)
+                        if (equipInFloorList.size>0){
+                            val hashMap = equipInFloorList[0]
+                            if (hashMap.containsKey("objTo")){
+                                floorDataConversions.floorId = hashMap["objTo"].toString()
+                            }
+                        }
+
                         equipService.replace(floorDataConversions)
                         message.state = 0
                     } else {

+ 97 - 13
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdRelationAdd.kt

@@ -171,63 +171,147 @@ class RwdRelationAdd {
                         /** 空间隔断有门 */
                         }else if (relCode == "Window") {
                             /** 空间隔断有窗 */
+                        }else if (relCode == "DoorWindow") {
+                            /** 空间隔断有门窗 */
+                        }else if (relCode == "Connect") {
+                            /** 空间连通 */
                         }
                     }
                     "TrafficNetwork" -> {
                         /** 建筑交通网络(同类) */
-
+                        if (relCode == "Normal"){
+                            /** 普通交通 */
+                        }else if (relCode == "FFOpen") {
+                            /** 消防常开交通 */
+                        }else if (relCode == "FFClose") {
+                            /** 消防常关交通 */
+                        }
                     }
                     "ConvectionNetwork" -> {
                         /** 空气流通网络(同类) */
-
+                        if (relCode == "Natural"){
+                            /** 空气自然对流 */
+                        }else if (relCode == "OnewayMech") {
+                            /** 空气单向机械通风 */
+                        }else if (relCode == "MixMech") {
+                            /** 空气混合机械通风 */
+                        }
                     }
                     "RadiationNetwork" -> {
                         /** 光照辐射网络(同类) */
-
+                        if (relCode == "Connect"){
+                        /** 光照连通 */
+                        }else if (relCode == "Transparent"){
+                        /** 光照透明隔断 */
+                        }
                     }
                     "LUDistribution" -> {
                         /** 低压配电网络 */
-
+                        if (relCode == "Normal"){
+                            /** 低压配电普通连接 */
+                        }else if (relCode == "Backup"){
+                            /** 低压配电互备连接 */
+                        }
                     }
                     "HUDistribution" -> {
                         /** 高压变配电网络 */
-
+                        if (relCode == "Normal"){
+                            /** 高压变配电普通连接 */
+                        }else if (relCode == "Backup"){
+                            /** 高压变配电互备连接 */
+                        }
                     }
                     "ChillWaterLoop" -> {
                         /** 空调冷冻水管网 */
-
+                        if (relCode == "Supply"){
+                            /** 空调冷冻水供水 */
+                        }else if (relCode == "Return"){
+                            /** 空调冷冻水回水 */
+                        }else if (relCode == "Bypass"){
+                            /** 空调冷冻水旁通 */
+                        }else if (relCode == "Fill"){
+                            /** 空调冷冻水补水 */
+                        }
+                    }
+                    "CoolingWaterLoop" -> {
+                        /** 空调冷却水管网 */
+                        if (relCode == "Supply"){
+                            /** 空调冷却水供水 */
+                        }else if (relCode == "Return"){
+                            /** 空调冷却水回水 */
+                        }else if (relCode == "Bypass"){
+                            /** 空调冷却水旁通 */
+                        }else if (relCode == "Fill"){
+                            /** 空调冷却水补水 */
+                        }
                     }
                     "HeatWaterLoop" -> {
                         /** 采暖水管网 */
-
+                        if (relCode == "Supply"){
+                            /** 采暖水供水 */
+                        }else if (relCode == "Return"){
+                            /** 采暖水回水 */
+                        }else if (relCode == "Bypass"){
+                            /** 采暖水旁通 */
+                        }else if (relCode == "Fill"){
+                            /** 采暖水补水 */
+                        }
                     }
                     "CondWaterNetwork" -> {
                         /** 空调冷凝水管网 */
-
+                        if (relCode == "Discharge"){
+                            /** 空调冷凝水排水 */
+                        }
                     }
                     "ACAirNetwork" -> {
                         /** 空调风管网 */
-
+                        if (relCode == "Supply"){
+                            /** 空调送风 */
+                        }else if (relCode == "Return"){
+                            /** 空调回风 */
+                        }else if (relCode == "Discharge"){
+                            /** 空调排风 */
+                        }
                     }
                     "FreshAirNetwork" -> {
                         /** 新风管网 */
-
+                        if (relCode == "Fresh"){
+                            /** 新风送风 */
+                        }
                     }
                     "VentNetwork" -> {
                         /** 通风管网 */
-
+                        if (relCode == "Supply"){
+                            /** 通风送风 */
+                        }else if (relCode == "Discharge"){
+                            /** 通风排风 */
+                        }else if (relCode == "Uncertain"){
+                            /** 通风不确定 */
+                        }
                     }
                     "VRFNetwork" -> {
                         /** 多联机管网 */
-
+                        if (relCode == "SupplyReturn"){
+                            /** 多联机供回制冷剂 */
+                        }
                     }
                     "DomesticWaterNetwork" -> {
                         /** 生活给水管网 */
-
+                        if (relCode == "Supply"){
+                            /** 生活给水供水 */
+                        }else if (relCode == "Bypass"){
+                            /** 生活给水旁通 */
+                        }
                     }
                     "DrainingWaterNetwork" -> {
                         /** 污水排水管网 */
+                        if (relCode == "Discharge"){
+                            /** 污水排水 */
+                        }else if (relCode == "Bypass"){
+                            /** 污水旁通 */
+
 
+                        }
                     }
                     "RecycleWaterNetwork" -> {
                         /** 中水管网 */

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/task/SchedulerTaskTwo.kt

@@ -56,7 +56,7 @@ class SchedulerTaskTwo {
     fun scheduled() {
         try {
             logger.info("同步中台任务开始} *****************************************************************")
-            messageProcessing.syncRwdData()
+//            messageProcessing.syncRwdData()
         } catch (e: Exception) {
             e.printStackTrace()
         }

+ 4 - 0
equip-component/src/main/kotlin/com/persagy/server/models/planar/PlanarSpace.kt

@@ -84,6 +84,10 @@ class PlanarSpace: Serializable {
     @Column(name = "func_type")
     var roomFuncType: String? = null
 
+    @Schema(description = "坐标点")
+    @Column(name = "bim_location")
+    var bimLocation: String? = null
+
     /** 轮廓线 */
     @Schema(description = "轮廓线")
     @Column(name = "outline")