Pārlūkot izejas kodu

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

zhangweixin 4 gadi atpakaļ
vecāks
revīzija
96deaa1331

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

@@ -35,8 +35,6 @@ import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
 import com.persagy.service.SObjectService
 import com.persagy.service.utils.SJsonUtil
 import org.slf4j.LoggerFactory
-import org.springframework.amqp.rabbit.annotation.RabbitHandler
-import org.springframework.amqp.rabbit.annotation.RabbitListener
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
 import org.springframework.stereotype.Service
@@ -72,8 +70,8 @@ class MessageReceiver {
     /**
      * 接收中台消息
      */
-    @RabbitListener(queues = ["queue-center-syn"])
-    @RabbitHandler
+//    @RabbitListener(queues = ["queue-center-syn"])
+//    @RabbitHandler
     fun process(mess: String) {
         logger.debug("接收中台消息:${mess}")
         /** 解析消息 */

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

@@ -2391,7 +2391,7 @@ object EquipUtil {
         } catch (e: Exception) {
             e.printStackTrace()
         }
-        val containsKey3 = mapObj.containsKey("localId")
+        val containsKey3 = mapObj.containsKey("localName")
         if (containsKey3) {
             equipment.localName =  mapObj["localName"]!!.toString()
        }

+ 2 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/task/SchedulerTask.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
 
 /**
@@ -52,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()

+ 2 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/task/SchedulerTaskRel.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
 
 /**
@@ -52,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()