/*绍兴站查询algmap 异常bug修改*/

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AlgorithmRequestRetryableConsumerManager.java

@@ -92,7 +92,7 @@ public class AlgorithmRequestRetryableConsumerManager {
     @Scheduled(fixedDelay = 5000)
     public void logThreadPoolStatus() {
         ThreadPoolExecutor executor = consumer.getExecutor();
-        log.info("AlgorithmRequestRetryableConsumerManager ThreadPool - active: {}, queue: {}, completed: {}",
+        log.debug("AlgorithmRequestRetryableConsumerManager ThreadPool - active: {}, queue: {}, completed: {}",
                 executor.getActiveCount(),
                 executor.getQueue().size(),
                 executor.getCompletedTaskCount());

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java

@@ -856,14 +856,14 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService {
             patrolTaskStatus.setTaskEstimatedTime(algorithmProgress);
             if ("100.0".equals(algorithmProgress)) {
                 patrolTaskStatus.setEndTime(DateUtil.formatDateTime(new Date()));
-                log.info(Color.GREEN + "DONE calcRemoteAlgorithmProgress: curNumber: {}, totalNumer: {}, algorithmProgress: {}, taskPatrolledId: {}, db-taskProgress: {}" + Color.END,
-                        resultAnalysisList.size(), totalNumber, algorithmProgress, taskPatrolledId, patrolTaskStatus.getTaskProgress());
+                log.info(Color.GREEN + "DONE CALC_REMOTE_ALGORITHM_PROGRESS: taskPatrolledId: {}, curNumber: {}, totalNumer: {}, algorithmProgress: {}, db-taskProgress: {}" + Color.END,
+                        taskPatrolledId, resultAnalysisList.size(), totalNumber, algorithmProgress, patrolTaskStatus.getTaskProgress());
                 patrolTaskStatus.setTaskProgress("100.0");
                 patrolTaskStatus.setTaskState(TaskStatus.DONE.getCode());
                 patrolTaskStatusService.updatePatrolTaskStatus(patrolTaskStatus);
             } else {
-                log.info(Color.GREEN + "RUNNING calcRemoteAlgorithmProgress: curNumber: {}, totalNumer: {}, algorithmProgress: {}, taskPatrolledId: {}, status: {}" + Color.END,
-                        resultAnalysisList.size(), totalNumber, algorithmProgress, taskPatrolledId, patrolTaskStatus.getTaskState());
+                log.info(Color.GREEN + "RUNNING CALC_REMOTE_ALGORITHM_PROGRESS taskPatrolledId: {}, curNumber: {}, totalNumer: {}, algorithmProgress: {}, status: {}" + Color.END,
+                        taskPatrolledId, resultAnalysisList.size(), totalNumber, algorithmProgress, patrolTaskStatus.getTaskState());
 
                 if (TaskStatus.RUNNING.getCode().equals(patrolTaskStatus.getTaskState())) {
                     patrolTaskStatus.setTaskState(TaskStatus.RUNNING.getCode());
@@ -888,27 +888,34 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService {
     }
 
     private AlgValue selectAlgMap(String devId, String type) {
-        log.info("selectAlgMap patrolPointId: {}, type: {}", devId, type);
         AlgValue algValue = null;
-
         Map<String, String> map = this.resultAnalysisService.selectPointInfoById(devId);
         String alarmThreshold = map.get(AnalyseConstants.ANALYSE_ALARM_THRESHOLD);
+        log.info("selectAlgMap patrolPointId: {}, type: {}, alarmThreshold: {}", devId, type, alarmThreshold);
         if (StringUtils.isNotBlank(alarmThreshold)) {
-            JSONArray thresholdList = JSONArray.parseArray(alarmThreshold);
-            for (int i = 0; i < thresholdList.size(); ++i) {
-                JSONObject threshold = thresholdList.getJSONObject(i);
-                if (StringUtils.isNotEmpty(type) && type.equals(threshold.getString(AnalyseConstants.ANALYSE_CODE))) {
-                    log.info("selectAlgMap patrolpoint threshold: {}", JSONObject.toJSONString(threshold));
-                    algValue = new AlgValue(threshold.getString(AnalyseConstants.ANALYSE_UPPER_VALUE), threshold.getString(AnalyseConstants.ANALYSE_LOWER_VALUE));
+            try {
+                JSONArray thresholdList = JSONArray.parseArray(alarmThreshold);
+                for (int i = 0; i < thresholdList.size(); ++i) {
+                    JSONObject threshold = thresholdList.getJSONObject(i);
+                    if (StringUtils.isNotEmpty(type) && type.equals(threshold.getString(AnalyseConstants.ANALYSE_CODE))) {
+                        log.info("selectAlgMap patrolpoint threshold: {}", JSONObject.toJSONString(threshold));
+                        algValue = new AlgValue(threshold.getString(AnalyseConstants.ANALYSE_UPPER_VALUE), threshold.getString(AnalyseConstants.ANALYSE_LOWER_VALUE));
+                    }
                 }
+            } catch (Exception e) {
+                log.error("selectAlgMap Exception alarmThreshold: {}, Msg: {}", alarmThreshold, e.getMessage());
             }
         }
 
         if (algValue == null) {
             Map<String, String> threshold = patrolResultService.selectPatrolPresetParam(devId);
             if (threshold != null) {
-                log.info("selectAlgMap patrolpreset threshold: {}", JSONObject.toJSONString(threshold));
-                algValue = new AlgValue(threshold.get(AnalyseConstants.ANALYSE_MAX_TEMP), threshold.get(AnalyseConstants.ANALYSE_MIN_TEMP));
+                log.info("selectAlgMap patrolPreset threshold: {}", JSONObject.toJSONString(threshold));
+                try {
+                    algValue = new AlgValue(threshold.get(AnalyseConstants.ANALYSE_MAX_TEMP), threshold.get(AnalyseConstants.ANALYSE_MIN_TEMP));
+                } catch (Exception e) {
+                    log.error("selectAlgMap Exception-2 Msg: {}", e.getMessage());
+                }
             }
         }
 

inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java

@@ -322,7 +322,7 @@ public class BasedataEqpBookController extends BaseController {
 
         for (BasedataEqpBook basedataEqpBookList : list) {
             if (!StringUtils.isEmpty(String.valueOf(basedataEqpBookList.getEqpBookId()))) {
-                AjaxResult ajaxResult = this.feignMsgClient.getMessageByEqpbookId(String.valueOf(basedataEqpBookList.getPatrolDeviceCode()));
+                AjaxResult ajaxResult = this.feignMsgClient.getMessageByEqpBookId(String.valueOf(basedataEqpBookList.getPatrolDeviceCode()));
                 List patrolTaskList = (List) ajaxResult.get("data");
                 basedataEqpBookList.setPatrolTaskList(patrolTaskList);
             }

inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/BasedataMontDataMqAcceptHandle.java

@@ -14,7 +14,6 @@ import org.springframework.amqp.rabbit.annotation.Queue;
 import org.springframework.amqp.rabbit.annotation.QueueBinding;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.handler.annotation.Headers;
 import org.springframework.messaging.handler.annotation.Payload;
 import org.springframework.stereotype.Component;
@@ -54,67 +53,67 @@ public class BasedataMontDataMqAcceptHandle {
             IBasedataMontDataHandleService basedataMontDataHandleService;
             if ("21".equals(type)) {
                 basedataMontDataHandleService = this.registerMontDataHandelBean.getServiceImpl("basedataMont-21");
-                basedataMontDataHandleService.handMontData(jsonObject);
+                basedataMontDataHandleService.handleMontData(jsonObject);
             }
 
             if ("10004".equals(type)) {
                 basedataMontDataHandleService = this.registerMontDataHandelBean.getServiceImpl("basedataMont-10004");
-                basedataMontDataHandleService.handMontData(jsonObject);
+                basedataMontDataHandleService.handleMontData(jsonObject);
             }
 
             if ("20001".equals(type)) {
                 basedataMontDataHandleService = this.registerMontDataHandelBean.getServiceImpl("basedataMont-20001");
-                basedataMontDataHandleService.handMontData(jsonObject);
+                basedataMontDataHandleService.handleMontData(jsonObject);
             }
 
             if ("5".equals(type)) {
                 basedataMontDataHandleService = this.registerMontDataHandelBean.getServiceImpl("basedataMont-5");
-                basedataMontDataHandleService.handMontData(jsonObject);
+                basedataMontDataHandleService.handleMontData(jsonObject);
             }
 
             if ("3".equals(type)) {
                 basedataMontDataHandleService = this.registerMontDataHandelBean.getServiceImpl("basedataMont-3");
-                basedataMontDataHandleService.handMontData(jsonObject);
+                basedataMontDataHandleService.handleMontData(jsonObject);
             }
 
             if ("4".equals(type)) {
                 basedataMontDataHandleService = this.registerMontDataHandelBean.getServiceImpl("basedataMont-4");
-                basedataMontDataHandleService.handMontData(jsonObject);
+                basedataMontDataHandleService.handleMontData(jsonObject);
             }
 
             if ("2".equals(type)) {
                 basedataMontDataHandleService = this.registerMontDataHandelBean.getServiceImpl("basedataMont-2");
-                basedataMontDataHandleService.handMontData(jsonObject);
+                basedataMontDataHandleService.handleMontData(jsonObject);
             }
 
             if ("1".equals(type)) {
                 basedataMontDataHandleService = this.registerMontDataHandelBean.getServiceImpl("basedataMont-1");
-                basedataMontDataHandleService.handMontData(jsonObject);
+                basedataMontDataHandleService.handleMontData(jsonObject);
             }
 
             if ("61".equals(type)) {
                 basedataMontDataHandleService = this.registerMontDataHandelBean.getServiceImpl("basedataMont-61");
-                basedataMontDataHandleService.handMontData(jsonObject);
+                basedataMontDataHandleService.handleMontData(jsonObject);
             }
 
             if ("41".equals(type)) {
                 basedataMontDataHandleService = this.registerMontDataHandelBean.getServiceImpl("basedataMont-41");
-                basedataMontDataHandleService.handMontData(jsonObject);
+                basedataMontDataHandleService.handleMontData(jsonObject);
             }
 
             if ("modelup-1024".equals(type)) {
                 basedataMontDataHandleService = this.registerMontDataHandelBean.getServiceImpl("basedataMont-modelup-1024");
-                basedataMontDataHandleService.handMontData(jsonObject);
+                basedataMontDataHandleService.handleMontData(jsonObject);
             }
 
             if ("heartbeat".equals(type)) {
                 basedataMontDataHandleService = this.registerMontDataHandelBean.getServiceImpl("basedataMont-heartbeat");
-                basedataMontDataHandleService.handMontData(jsonObject);
+                basedataMontDataHandleService.handleMontData(jsonObject);
             }
 
             if ("modelup-1024-test".equals(type)) {
                 basedataMontDataHandleService = this.registerMontDataHandelBean.getServiceImpl("basedataMont-modelup-1024-test");
-                basedataMontDataHandleService.handMontData(jsonObject);
+                basedataMontDataHandleService.handleMontData(jsonObject);
             }
 
         }

inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/IBasedataMontDataHandleService.java

@@ -3,5 +3,5 @@ package com.inspect.metadata.montdatamqhandle.service;
 import com.alibaba.fastjson.JSONObject;
 
 public interface IBasedataMontDataHandleService {
-    void handMontData(JSONObject jsonObject);
+    void handleMontData(JSONObject jsonObject);
 }

inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontEvnDataConsumerHandle.java

@@ -3,6 +3,7 @@ package com.inspect.metadata.montdatamqhandle.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.inspect.base.core.constant.Color;
 import com.inspect.metadata.eqpbook.domain.BasedataEqpBook;
 import com.inspect.metadata.eqpbook.service.IBasedataEqpBookService;
 import com.inspect.metadata.montdata.domain.BasedataMontEvnData;
@@ -19,10 +20,12 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
+@Slf4j
 @Component("basedataMont-21")
 public class BasedataMontEvnDataConsumerHandle implements IBasedataMontDataHandleService {
     @Resource
@@ -34,7 +37,8 @@ public class BasedataMontEvnDataConsumerHandle implements IBasedataMontDataHandl
     @Resource
     private FeignMsgClient feignMsgClient;
 
-    public void handMontData(JSONObject jsonObject) {
+    public void handleMontData(JSONObject jsonObject) {
+        log.info(Color.BLUE + "handleMontData-21: {}" + Color.END, jsonObject.toString());
         String Type = jsonObject.getString("Type");
         JSONArray jsonObjectItems = jsonObject.getJSONArray("Items");
         List<BasedataMontEvnData> list = jsonObjectItems.toJavaList(BasedataMontEvnData.class);

inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontHeartBeatConsumerHandle.java

@@ -21,17 +21,15 @@ import com.inspect.base.redis.service.RedisService;
 import java.util.Date;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
+@Slf4j
 @Component("basedataMont-heartbeat")
 public class BasedataMontHeartBeatConsumerHandle implements IBasedataMontDataHandleService {
-    private final Logger log = LoggerFactory.getLogger(BasedataMontHeartBeatConsumerHandle.class);
-
     @Resource
     private IBasedataEqpBookService basedataEqpBookService;
     @Resource
@@ -43,7 +41,8 @@ public class BasedataMontHeartBeatConsumerHandle implements IBasedataMontDataHan
     @Value("${liveSIPB.url}")
     private String liveSIPB_URL;
 
-    public void handMontData(JSONObject jsonObject) {
+    public void handleMontData(JSONObject jsonObject) {
+        log.info(Color.BLUE + "handleMontData-heartbeat: {}" + Color.END, jsonObject.toString());
         String Type = jsonObject.getString("Type");
         String uuid = jsonObject.getString("uuid");
         log.info(Color.GREEN + "[METADATA] handMontData 会话: {}, 类型: {}, 消息体: {}" + Color.END, uuid, Type, jsonObject.toJSONString());

inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontNestRunDataConsumerHandle.java

@@ -3,6 +3,7 @@ package com.inspect.metadata.montdatamqhandle.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.inspect.base.core.constant.Color;
 import com.inspect.metadata.eqpbook.domain.BasedataEqpBook;
 import com.inspect.metadata.eqpbook.service.IBasedataEqpBookService;
 import com.inspect.metadata.montdata.domain.BasedataMontNestRunData;
@@ -20,10 +21,12 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
+@Slf4j
 @Component("basedataMont-10004")
 public class BasedataMontNestRunDataConsumerHandle implements IBasedataMontDataHandleService {
     @Resource
@@ -35,7 +38,8 @@ public class BasedataMontNestRunDataConsumerHandle implements IBasedataMontDataH
     @Resource
     private FeignMsgClient feignMsgClient;
 
-    public void handMontData(JSONObject jsonObject) {
+    public void handleMontData(JSONObject jsonObject) {
+        log.info(Color.BLUE + "handleMontData-10004: {}" + Color.END, jsonObject.toString());
         String Type = jsonObject.getString("Type");
         JSONArray jsonObjectItems = jsonObject.getJSONArray("Items");
         List<BasedataMontNestRunData> list = jsonObjectItems.toJavaList(BasedataMontNestRunData.class);

inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontNestStaDataConsumerHandle.java

@@ -3,6 +3,7 @@ package com.inspect.metadata.montdatamqhandle.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.inspect.base.core.constant.Color;
 import com.inspect.metadata.eqpbook.domain.BasedataEqpBook;
 import com.inspect.metadata.eqpbook.service.IBasedataEqpBookService;
 import com.inspect.metadata.montdata.domain.BasedataMontNestStaData;
@@ -20,10 +21,12 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
+@Slf4j
 @Component("basedataMont-20001")
 public class BasedataMontNestStaDataConsumerHandle implements IBasedataMontDataHandleService {
     @Resource
@@ -35,7 +38,8 @@ public class BasedataMontNestStaDataConsumerHandle implements IBasedataMontDataH
     @Resource
     private RedisService redisService;
 
-    public void handMontData(JSONObject jsonObject) {
+    public void handleMontData(JSONObject jsonObject) {
+        log.info(Color.BLUE + "handleMontData-20001: {}" + Color.END, jsonObject.toString());
         String Type = jsonObject.getString("Type");
         JSONArray jsonObjectItems = jsonObject.getJSONArray("Items");
         List<BasedataMontNestStaData> list = jsonObjectItems.toJavaList(BasedataMontNestStaData.class);
@@ -82,7 +86,7 @@ public class BasedataMontNestStaDataConsumerHandle implements IBasedataMontDataH
                 System.out.println("机巢状态数据到websocket mont/montNestStaData:::" + jsonString);
             }
 
-            this.feignMsgClient.senMessageToZk(Type, jsonObject.toJSONString());
+            this.feignMsgClient.sendMessageToUpperSystem(Type, jsonObject.toJSONString());
         }
     }
 

inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevAlmAbnConsumerHandle.java

@@ -3,6 +3,7 @@ package com.inspect.metadata.montdatamqhandle.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.inspect.base.core.constant.Color;
 import com.inspect.metadata.eqpbook.domain.BasedataEqpBook;
 import com.inspect.metadata.eqpbook.service.IBasedataEqpBookService;
 import com.inspect.metadata.montdata.domain.BasedataMontPatDevAlmAbn;
@@ -18,10 +19,12 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
+@Slf4j
 @Component("basedataMont-5")
 public class BasedataMontPatDevAlmAbnConsumerHandle implements IBasedataMontDataHandleService {
     @Resource
@@ -33,7 +36,8 @@ public class BasedataMontPatDevAlmAbnConsumerHandle implements IBasedataMontData
     @Resource
     private FeignMsgClient feignMsgClient;
 
-    public void handMontData(JSONObject jsonObject) {
+    public void handleMontData(JSONObject jsonObject) {
+        log.info(Color.BLUE + "handleMontData-5: {}" + Color.END, jsonObject.toString());
         JSONArray jsonObjectItems = jsonObject.getJSONArray("Items");
         List<BasedataMontPatDevAlmAbn> list = jsonObjectItems.toJavaList(BasedataMontPatDevAlmAbn.class);
         if (null != list && !list.isEmpty()) {
@@ -72,8 +76,8 @@ public class BasedataMontPatDevAlmAbnConsumerHandle implements IBasedataMontData
                 System.out.println("巡视设备异常报警到 websocket mont/montPatrolDeviceAlmabnData:::" + jsonString);
             }
 
-            this.feignMsgClient.senMessageToZk(Type, jsonObject.toJSONString());
-            this.feignMsgClient.senAbnMessageToTask(Type, jsonObject.toJSONString());
+            this.feignMsgClient.sendMessageToUpperSystem(Type, jsonObject.toJSONString());
+            this.feignMsgClient.sendAbnormalMessageToTask(Type, jsonObject.toJSONString());
         }
     }
 

inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevCoordConsumerHandle.java

@@ -3,6 +3,7 @@ package com.inspect.metadata.montdatamqhandle.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.inspect.base.core.constant.Color;
 import com.inspect.metadata.eqpbook.domain.BasedataEqpBook;
 import com.inspect.metadata.eqpbook.service.IBasedataEqpBookService;
 import com.inspect.metadata.montdata.domain.BasedataMontPatDevCoord;
@@ -18,10 +19,12 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
+@Slf4j
 @Component("basedataMont-3")
 public class BasedataMontPatDevCoordConsumerHandle implements IBasedataMontDataHandleService {
     @Resource
@@ -33,7 +36,8 @@ public class BasedataMontPatDevCoordConsumerHandle implements IBasedataMontDataH
     @Resource
     private FeignMsgClient feignMsgClient;
 
-    public void handMontData(JSONObject jsonObject) {
+    public void handleMontData(JSONObject jsonObject) {
+        log.info(Color.BLUE + "handleMontData-3: {}" + Color.END, jsonObject.toString());
         String Type = jsonObject.getString("Type");
         JSONArray jsonObjectItems = jsonObject.getJSONArray("Items");
         List<BasedataMontPatDevCoord> list = jsonObjectItems.toJavaList(BasedataMontPatDevCoord.class);
@@ -73,7 +77,7 @@ public class BasedataMontPatDevCoordConsumerHandle implements IBasedataMontDataH
                 System.out.println("巡视设备坐标信息 websocket mont/montPatrolDeviceCoord:::" + jsonString);
             }
 
-            this.feignMsgClient.senMessageToZk(Type, jsonObject.toJSONString());
+            this.feignMsgClient.sendMessageToUpperSystem(Type, jsonObject.toJSONString());
         }
     }
 

inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevPatRouteConsumerHandle.java

@@ -3,6 +3,7 @@ package com.inspect.metadata.montdatamqhandle.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.inspect.base.core.constant.Color;
 import com.inspect.metadata.eqpbook.domain.BasedataEqpBook;
 import com.inspect.metadata.eqpbook.service.IBasedataEqpBookService;
 import com.inspect.metadata.montdata.domain.BasedataMontPatDevPatRoute;
@@ -18,10 +19,12 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
+@Slf4j
 @Component("basedataMont-4")
 public class BasedataMontPatDevPatRouteConsumerHandle implements IBasedataMontDataHandleService {
     @Resource
@@ -33,7 +36,8 @@ public class BasedataMontPatDevPatRouteConsumerHandle implements IBasedataMontDa
     @Resource
     private FeignMsgClient feignMsgClient;
 
-    public void handMontData(JSONObject jsonObject) {
+    public void handleMontData(JSONObject jsonObject) {
+        log.info(Color.BLUE + "handleMontData-4: {}" + Color.END, jsonObject.toString());
         String Type = jsonObject.getString("Type");
         JSONArray jsonObjectItems = jsonObject.getJSONArray("Items");
         List<BasedataMontPatDevPatRoute> list = jsonObjectItems.toJavaList(BasedataMontPatDevPatRoute.class);
@@ -73,7 +77,7 @@ public class BasedataMontPatDevPatRouteConsumerHandle implements IBasedataMontDa
                 System.out.println("巡视设备巡检路线信息 websocket mont/montPatDevPatRoute:::" + jsonString);
             }
 
-            this.feignMsgClient.senMessageToZk(Type, jsonObject.toJSONString());
+            this.feignMsgClient.sendMessageToUpperSystem(Type, jsonObject.toJSONString());
         }
     }
 

inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevRunDataConsumerHandle.java

@@ -3,6 +3,7 @@ package com.inspect.metadata.montdatamqhandle.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.inspect.base.core.constant.Color;
 import com.inspect.metadata.eqpbook.domain.BasedataEqpBook;
 import com.inspect.metadata.eqpbook.service.IBasedataEqpBookService;
 import com.inspect.metadata.montdata.domain.BasedataMontPatDevRunData;
@@ -19,10 +20,12 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
+@Slf4j
 @Component("basedataMont-2")
 public class BasedataMontPatDevRunDataConsumerHandle implements IBasedataMontDataHandleService {
     @Resource
@@ -34,7 +37,8 @@ public class BasedataMontPatDevRunDataConsumerHandle implements IBasedataMontDat
     @Resource
     RedisService redisService;
 
-    public void handMontData(JSONObject jsonObject) {
+    public void handleMontData(JSONObject jsonObject) {
+        log.info(Color.BLUE + "handleMontData-2: {}" + Color.END, jsonObject.toString());
         String Type = jsonObject.getString("Type");
         JSONArray jsonObjectItems = jsonObject.getJSONArray("Items");
         List<BasedataMontPatDevRunData> list = jsonObjectItems.toJavaList(BasedataMontPatDevRunData.class);

inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevStaDataConsumerHandle.java

@@ -3,6 +3,7 @@ package com.inspect.metadata.montdatamqhandle.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.inspect.base.core.constant.Color;
 import com.inspect.metadata.eqpbook.domain.BasedataEqpBook;
 import com.inspect.metadata.eqpbook.service.IBasedataEqpBookService;
 import com.inspect.metadata.montdata.domain.BasedataMontPatDevStaData;
@@ -19,10 +20,12 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
+@Slf4j
 @Component("basedataMont-1")
 public class BasedataMontPatDevStaDataConsumerHandle implements IBasedataMontDataHandleService {
     @Resource
@@ -34,7 +37,8 @@ public class BasedataMontPatDevStaDataConsumerHandle implements IBasedataMontDat
     @Resource
     RedisService redisService;
 
-    public void handMontData(JSONObject jsonObject) {
+    public void handleMontData(JSONObject jsonObject) {
+        log.info(Color.BLUE + "handleMontData-1: {}" + Color.END, jsonObject.toString());
         String Type = jsonObject.getString("Type");
         JSONArray jsonObjectItems = jsonObject.getJSONArray("Items");
         List<BasedataMontPatDevStaData> list = jsonObjectItems.toJavaList(BasedataMontPatDevStaData.class);

inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatrolPointConsumerHandle.java

@@ -29,15 +29,12 @@ import java.util.Iterator;
 import java.util.List;
 import javax.annotation.Resource;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+@Slf4j
 @Component("basedataMont-modelup-1024")
 public class BasedataMontPatrolPointConsumerHandle implements IBasedataMontDataHandleService {
-    private final Logger log = LoggerFactory.getLogger(BasedataMontPatrolPointConsumerHandle.class);
-
     @Resource
     private IBasedataPatrolPointService basedataPatrolPointService;
     @Resource
@@ -60,17 +57,17 @@ public class BasedataMontPatrolPointConsumerHandle implements IBasedataMontDataH
     BasedataAlgSubtypeMapper basedataAlgSubtypeMapper;
     @Resource
     BasedataMontPatrolPointHandleComponent basedataMontPatrolPointHandleComponent;
-    @Autowired
+    @Resource
     private SftpClient sftpClient;
-    @Autowired
+    @Resource
     private BaseDataAreaMapper baseDataAreaMapper;
-    @Autowired
+    @Resource
     private BasedataPatrolPointPresetMapper basedataPatrolPointPresetMapper;
     @Resource
     private BasedataPatrolPointMapper basedataPatrolpointMapper;
 
-    public void handMontData(JSONObject jsonObject) {
-        log.info(Color.BLUE + "[METADATA] 模型同步basedataMont-modelup-1024-----------jsonObject-----: {}" + Color.END, jsonObject);
+    public void handleMontData(JSONObject jsonObject) {
+        log.info(Color.BLUE + "handleMontData-modelup-1024: {}" + Color.END, jsonObject.toString());
         String Type = jsonObject.getString("Type");
         String convertFlag = "0";
         String SendCode = jsonObject.getString("SendCode");

inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontTaskResultConsumerHandle.java

@@ -2,6 +2,7 @@ package com.inspect.metadata.montdatamqhandle.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.inspect.base.core.constant.Color;
 import com.inspect.metadata.eqpbook.domain.BasedataEqpBook;
 import com.inspect.metadata.eqpbook.service.IBasedataEqpBookService;
 import com.inspect.metadata.montdata.domain.BasedataMontTaskResult;
@@ -14,15 +15,15 @@ import com.inspect.base.core.utils.DateUtils;
 import java.util.Date;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
+@Slf4j
 @Component("basedataMont-61")
 public class BasedataMontTaskResultConsumerHandle implements IBasedataMontDataHandleService {
-    private static final Logger logger = LoggerFactory.getLogger(BasedataMontTaskResultConsumerHandle.class);
+
     @Resource
     private IBasedataMontTaskResultService basedataMontTaskResultService;
     @Resource
@@ -30,28 +31,27 @@ public class BasedataMontTaskResultConsumerHandle implements IBasedataMontDataHa
     @Resource
     private FeignMsgClient feignMsgClient;
 
-    public void handMontData(JSONObject jsonObject) {
-        logger.info("handMontData:" + jsonObject);
+    public void handleMontData(JSONObject jsonObject) {
+        log.info(Color.BLUE + "handleMontData-61: {}" + Color.END, jsonObject.toString());
         String Type = jsonObject.getString("Type");
         JSONArray jsonObjectItems = jsonObject.getJSONArray("Items");
         List<BasedataMontTaskResult> list = jsonObjectItems.toJavaList(BasedataMontTaskResult.class);
         if (null != list && !list.isEmpty()) {
             Date nowDate = DateUtils.getNowDate();
-
-            for (BasedataMontTaskResult basedataMontTaskresult : list) {
+            for (BasedataMontTaskResult basedataMontTaskResult : list) {
                 BasedataEqpBook basedataEqpbook = new BasedataEqpBook();
-                basedataEqpbook.setPatrolDeviceCode(basedataMontTaskresult.getPatrolDeviceCode());
+                basedataEqpbook.setPatrolDeviceCode(basedataMontTaskResult.getPatrolDeviceCode());
                 List<BasedataEqpBook> basedataEqpBookList = this.basedataEqpBookService.selectBasedataEqpBookList(basedataEqpbook);
                 if (!basedataEqpBookList.isEmpty()) {
-                    basedataMontTaskresult.setEqpBookId(basedataEqpBookList.get(0).getEqpBookId());
+                    basedataMontTaskResult.setEqpBookId(basedataEqpBookList.get(0).getEqpBookId());
                 }
 
-                basedataMontTaskresult.setCreateTime(nowDate);
-                this.basedataMontTaskResultService.insertBasedataMontTaskResult(basedataMontTaskresult);
-                basedataMontTaskresult.setCreateTime(null);
+                basedataMontTaskResult.setCreateTime(nowDate);
+                this.basedataMontTaskResultService.insertBasedataMontTaskResult(basedataMontTaskResult);
+                basedataMontTaskResult.setCreateTime(null);
             }
 
-            this.feignMsgClient.senMessageToMl(Type, jsonObject.toJSONString());
+            this.feignMsgClient.sendMessageToMainService(Type, jsonObject.toJSONString());
         }
     }
 

inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontTaskStaDataConsumerHandle.java

@@ -14,15 +14,14 @@ import com.inspect.base.core.utils.DateUtils;
 import java.util.Date;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
+@Slf4j
 @Component("basedataMont-41")
 public class BasedataMontTaskStaDataConsumerHandle implements IBasedataMontDataHandleService {
-    private static final Logger logger = LoggerFactory.getLogger(BasedataMontTaskStaDataConsumerHandle.class);
     @Resource
     private IBasedataMontTaskStaDataService basedataMontTaskStaDataService;
     @Resource
@@ -30,8 +29,8 @@ public class BasedataMontTaskStaDataConsumerHandle implements IBasedataMontDataH
     @Resource
     private FeignMsgClient feignMsgClient;
 
-    public void handMontData(JSONObject jsonObject) {
-        logger.info(Color.GREEN + "[METADATA] handMontData: {}" + Color.END, jsonObject);
+    public void handleMontData(JSONObject jsonObject) {
+        log.info(Color.BLUE + "handleMontData-41: {}" + Color.END, jsonObject.toString());
         String Type = jsonObject.getString("Type");
         JSONArray jsonObjectItems = jsonObject.getJSONArray("Items");
         List<BasedataMontTaskStaData> list = jsonObjectItems.toJavaList(BasedataMontTaskStaData.class);
@@ -43,7 +42,7 @@ public class BasedataMontTaskStaDataConsumerHandle implements IBasedataMontDataH
                 basedataMontTaskstadata.setCreateTime(null);
             }
 
-            feignMsgClient.senMessageToMl(Type, jsonObject.toJSONString());
+            feignMsgClient.sendMessageToMainService(Type, jsonObject.toJSONString());
         }
     }
 

inspect-metadata/src/main/java/com/inspect/metadata/mqutil/FeignMsgClient.java

@@ -10,17 +10,17 @@ import org.springframework.web.bind.annotation.RequestParam;
 @FeignClient("inspect-main")
 public interface FeignMsgClient {
     @PostMapping({"/partrolresult/sendMessage"})
-    AjaxResult senMessageToMl(@RequestParam("type") String type, @RequestBody String messageBody);
+    AjaxResult sendMessageToMainService(@RequestParam("type") String type, @RequestBody String messageBody);
 
     @PostMapping({"/client/upData"})
-    AjaxResult senMessageToZk(@RequestParam("type") String type, @RequestParam("msg") String msg);
+    AjaxResult sendMessageToUpperSystem(@RequestParam("type") String type, @RequestParam("msg") String msg);
 
     @GetMapping({"/partrolresult/taskAndstatus"})
-    AjaxResult getMessageByEqpbookId(@RequestParam("eqpbookId") String eqpbookId);
+    AjaxResult getMessageByEqpBookId(@RequestParam("eqpbookId") String eqpBookId);
 
     @GetMapping({"/partrolresult/productionAndstatus"})
     AjaxResult getMessageByDeviceId(@RequestParam("deviceId") String deviceId);
 
     @PostMapping({"/notify/alarm"})
-    AjaxResult senAbnMessageToTask(@RequestParam("type") String type, @RequestParam("msg") String msg);
+    AjaxResult sendAbnormalMessageToTask(@RequestParam("type") String type, @RequestParam("msg") String msg);
 }