Sfoglia il codice sorgente

******************************************* wx *****************
修改接口

zhangweixin 4 anni fa
parent
commit
71296cd284

+ 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("createTime").exec()
+                    val syncRwdMessageList = syncRwdMessageService.select(SFilter.not(SFilter.eq("state", 0))).order("createTime").limit(100).exec()
                     if (syncRwdMessageList.size >0){
                         rwdSync.dataSync(syncRwdMessageList)
                         messageTypeRwd = 1

+ 5 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/models/tools/EquipUtil.kt

@@ -2382,7 +2382,11 @@ object EquipUtil {
         equipment.projectId = projectId
         equipment.classCode = mapObj["classCode"].toString()
         equipment.id =  mapObj["id"]!!.toString()
-        equipment.name =  mapObj["name"]!!.toString()
+        val containsKey14 = mapObj.containsKey("name")
+        if (containsKey14){
+            equipment.name =  mapObj["name"]!!.toString()
+        }
+
         try {
             val containsKey2 = mapObj.containsKey("localId")
             if (containsKey2) {

+ 2 - 2
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdComponent.kt

@@ -81,7 +81,7 @@ class RwdComponent {
                         jsonObject2["objTo"] = equipment.id
                         val queryRelationList =
                             EquipApi.queryRelation(dictProject.groupCode!!, message.projectId!!, jsonObject2)
-                        equipService.insert(equipment)
+                        equipService.replace(equipment)
                         if (queryRelationList.size>0){
                             val hashMap = queryRelationList[0]
                             if (hashMap.containsKey("objTo")){
@@ -111,7 +111,7 @@ class RwdComponent {
                             dictProject!!.groupCode!!,
                             queryIdList[0]
                         )
-                        equipService.update(floorDataConversions)
+                        equipService.replace(floorDataConversions)
                         message.state = 0
                     } else {
                         message.state = 2

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

@@ -89,7 +89,7 @@ class RwdEquip {
                             }
                         }
 
-                        equipService.insert(equipment)
+                        equipService.replace(equipment)
                         message.state = 0
                     } else {
                         message.state = 2
@@ -113,7 +113,7 @@ class RwdEquip {
                             dictProject!!.groupCode!!,
                             queryIdList[0]
                         )
-                        equipService.update(floorDataConversions)
+                        equipService.replace(floorDataConversions)
                         message.state = 0
                     } else {
                         message.state = 2

+ 2 - 2
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdShaft.kt

@@ -72,7 +72,7 @@ class RwdShaft {
                             dictProject!!.groupCode!!,
                             queryIdList[0]
                         )
-                        shaftService.insert(shaft)
+                        shaftService.replace(shaft)
                         message.state = 0
                     } else {
                         message.state = 2
@@ -96,7 +96,7 @@ class RwdShaft {
                             dictProject!!.groupCode!!,
                             queryIdList[0]
                         )
-                        val update = shaftService.update(shaft)
+                        val update = shaftService.replace(shaft)
                         if (update) {
                             message.state = 0
                         } else {

+ 2 - 4
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdSpace.kt

@@ -98,7 +98,7 @@ class RwdSpace {
                                 space.floorId = hashMap["objFrom"].toString()
                             }
                         }
-                        spaceService.insert(space)
+                        spaceService.replace(space)
                         message.state = 0
                     } else {
                         message.state = 2
@@ -122,9 +122,7 @@ class RwdSpace {
                             dictProject!!.groupCode!!,
                             queryIdList[0]
                         )
-
-
-                        spaceService.update(space)
+                        spaceService.replace( space)
                         message.state = 0
                     } else {
                         message.state = 2

+ 2 - 2
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdSystem.kt

@@ -71,7 +71,7 @@ class RwdSystem {
                             dictProject!!.groupCode!!,
                             queryIdList[0]
                         )
-                        systemService.insert(system)
+                        systemService.replace(system)
                         message.state = 0
                     } else {
                         message.state = 2
@@ -95,7 +95,7 @@ class RwdSystem {
                             dictProject!!.groupCode!!,
                             queryIdList[0]
                         )
-                        systemService.update(system)
+                        systemService.replace(system)
                         message.state = 0
                     } else {
                         message.state = 2

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

@@ -53,7 +53,7 @@ class SchedulerTask {
     //cron表达式:每隔5秒执行一次
 //    @Scheduled(cron = "0 */3 * * * ?")
 //    @Scheduled(cron="0/30 * *  * * ? ")   //每5秒执行一次
-    @Scheduled(cron = "0 */1 * * * ?")
+//    @Scheduled(cron = "0 */1 * * * ?")
     fun scheduled() {
         logger.info("同步数据中心任务开始至中台")
         messageProcessing.syncDataCenter()

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

@@ -53,7 +53,7 @@ class SchedulerTaskRel {
     //cron表达式:每隔5秒执行一次
 //    @Scheduled(cron = "0 */3 * * * ?")
 //    @Scheduled(cron="0/5 * *  * * ? ")   //每5秒执行一次
-    @Scheduled(cron = "0 */1 * * * ?")
+//    @Scheduled(cron = "0 */1 * * * ?")
     fun scheduled() {
         logger.info("同步数据中心任务开始至数据中台-关系数据")
         messageProcessing.syncDataCenterRel()

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

@@ -29,6 +29,7 @@ package com.persagy.server.syn.task
 import com.persagy.server.syn.jms.MessageProcessing
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Service
 
 /**
@@ -51,7 +52,7 @@ class SchedulerTaskTwo {
     //cron表达式:每隔5秒执行一次
 //    @Scheduled(cron = "0 */3 * * * ?")
 //    @Scheduled(cron = "0 */1 * * * ?")
-//    @Scheduled(cron="0/5 * *  * * ? ")   //每5秒执行一次
+    @Scheduled(cron="0/5 * *  * * ? ")   //每5秒执行一次
     fun scheduled() {
         try {
             logger.info("同步中台任务开始} *****************************************************************")

+ 2 - 2
equip-component/src/main/kotlin/com/persagy/server/service/objects/EquipmentService.kt

@@ -905,8 +905,8 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                     if (FloorComponList.size>0){
                         for (floorCompon in FloorComponList){
                             val count = propertyService.select(SFilter.eq("projectId", projectId!!),SFilter.eq("floorId", floorCompon.id!!),
-                                    SFilter.isNull("BIMID"), SFilter.not(SFilter.isNull("BIMLocation"))
-                                    ,SFilter.isNull("EquipmentId")).exec()
+                                    SFilter.isNull("bimId"), SFilter.not(SFilter.isNull("bimLocation"))
+                                    ,SFilter.isNull("equipId")).exec()
                             logger.debug("查询数量=${count.size}")
                             num += count.size
                         }