上报到上级系统本地调试问题修改

inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/service/SyncDataToUpstreamService.java

@@ -25,6 +25,7 @@ public class SyncDataToUpstreamService {
     }
 
     public AjaxResult postMessage(String type, String msg) {
+        log.info("sendUrl: " + sendUrl);
         try {
             String resultJson = HttpClientUtils.postJson(sendUrl, msg, null);
             AjaxResult ajaxResult = JSONObject.parseObject(resultJson, AjaxResult.class);

inspect-job/src/main/java/com/inspect/job/task/UpTask.java

@@ -1,6 +1,7 @@
 package com.inspect.job.task;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.inspect.base.core.exception.ServiceException;
@@ -48,20 +49,30 @@ public class UpTask {
     PatrolDeviceStateMapper mapper;
 
     public void timerTaskData() {
-        String timeIntervalData = this.redisService.getCacheObject(this.timeIntervalKey);
-        if (StringUtils.isBlank(timeIntervalData)) {
-            this.logger.warn("未设置上报数据执行间隔，可能的原因是，tcpClient未成功连接上级系统");
+        this.logger.info("********************** UpTask timerTaskData ******************************");
+        Object timeIntervalData = this.redisService.getCacheObject(this.timeIntervalKey);
+        if(timeIntervalData == null) {
+            this.logger.info("未设置上报数据执行间隔，可能的原因是，tcpClient未成功连接上级系统");
         } else {
-            TimeIntervalData intervalData = JSONObject.parseObject(timeIntervalData, TimeIntervalData.class);
-            this.upData(intervalData);
+            if(timeIntervalData instanceof JSONObject) {
+                TimeIntervalData intervalData = ((JSONObject) timeIntervalData).toJavaObject(TimeIntervalData.class);
+                this.logger.info("timeIntervalData1: " + JSONUtil.toJsonStr(intervalData));
+                this.upData(intervalData);
+            } else if(timeIntervalData instanceof String) {
+                TimeIntervalData intervalData = JSONObject.parseObject((String)timeIntervalData, TimeIntervalData.class);
+                this.logger.info("timeIntervalData2: " + JSONUtil.toJsonStr(intervalData));
+                this.upData(intervalData);
+            }
         }
     }
 
     public void upDeviceStatisticsTask() {
+        this.logger.info("********************** UpTask upDeviceStatisticsTask ******************************");
         this.upDeviceStatisticsData();
     }
 
     public void initPatrolDeviceStateTask() {
+        this.logger.info("********************** UpTask initPatrolDeviceStateTask ******************************");
         this.initPatrolDeviceState();
     }
 
@@ -69,12 +80,12 @@ public class UpTask {
         String today = DateUtil.format(new Date(), "yyyy-MM-dd");
         String lock = this.redisService.getCacheObject(this.INIT_PATROL_DEVICE_STATE_LOCK_PRE + today);
         if (null != lock) {
-            this.logger.warn("今日已经执行过初始化巡视设备状态初始化，取消操作");
+            this.logger.info("今日已经执行过初始化巡视设备状态初始化，取消操作");
         } else {
             synchronized (this) {
                 lock = (String) this.redisService.getCacheObject(this.INIT_PATROL_DEVICE_STATE_LOCK_PRE + today);
                 if (null != lock) {
-                    this.logger.warn("今日已经执行过初始化巡视设备状态初始化，取消操作");
+                    this.logger.info("今日已经执行过初始化巡视设备状态初始化，取消操作");
                 } else {
                     this.mapper.initData();
                     this.mapper.initDataInfo();
@@ -119,7 +130,7 @@ public class UpTask {
         this.logger.info("上报巡视设备统计信息");
         List<HashMap<String, Object>> list = this.mapper.queryData();
         if (CollectionUtils.isEmpty(list)) {
-            this.logger.warn("上报巡视设备统计信息定时任务，查询巡视设备状态表为空");
+            this.logger.info("上报巡视设备统计信息定时任务，查询巡视设备状态表为空");
         } else {
             JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(list));
             JSONArray items = this.handleItems(jsonArray);

inspect-metadata/src/main/resources/mapper/prodevmnt/BasedataDeviceMapper.xml

@@ -369,7 +369,7 @@
         </foreach>
     </select>
 
-    <select id="getDeviceAllDeviceCode" parameterType="String" resultType="java.util.List">
+    <select id="getDeviceAllDeviceCode" parameterType="java.lang.String" resultType="java.lang.String">
         SELECT DISTINCT(b.patrol_device_code)
         FROM basedata_eqpbook b
         WHERE b.patrol_device_code != ''