王帅

industry-admin/src/views/collector/index.vue

@@ -383,15 +383,22 @@ export default {
         }],
       },
       dialogLog: false,
-      LogList: []
+      LogList: [],
+      statusTask: null
     }
   },
   created() {
     this.getCollectorList();
-    setInterval(() => {
+    this.statusTask = setInterval(() => {
       this.getClientStatusByList();
     }, 15000)
   },
+  beforeDestroy() {
+    if (this.statusTask) {
+      clearInterval(this.statusTask)
+      this.statusTask = null
+    }
+  },
   methods: {
     /** 搜索 */
     handelSearch(event) {

industry-admin/src/views/source/itemGroup/model/modbusList.vue

@@ -103,7 +103,7 @@ export default {
         ioType: 0,
         byteOrder: '',
         dataType: '',
-        scale: '1.0',
+        scale: '',
         startAddress: '',
         endAddress: ''
       }
@@ -154,7 +154,7 @@ export default {
         ioType: data.ioType,
         byteOrder: data.byteOrder || '',
         dataType: data.dataType || '',
-        scale: data.scale || '1.0',
+        scale: data.scale || '',
         startAddress: data.startAddress || '',
         endAddress: data.endAddress || '',
         time: data.time
@@ -278,7 +278,7 @@ export default {
             ioType: config.ioType,
             byteOrder: config.byteOrder || '',
             dataType: config.dataType || '',
-            scale: config.scale || '1.0',
+            scale: config.scale || '',
             startAddress: config.startAddress,
             endAddress: config.endAddress || '',
             time: config.time

industry-admin/src/views/source/itemGroup/model/modbusView.vue

@@ -59,7 +59,7 @@ export default {
         ioType: 0,
         byteOrder: 'AB',
         dataType: '',
-        scale: '1.0',
+        scale: '',
         startAddress: '',
         endAddress: '',
         time: ''

industry-system/cqcy-ei-influxdb/src/main/java/com/cqcy/ei/influxdb/util/InfluxDBUtil.java

@@ -90,7 +90,7 @@ public class InfluxDBUtil {
                 // 按年分库按月分表
                 for (int i = startYear; i <= endYear; i++) {
                     endMon = i == endYear ? endMonth: 12;
-                    startMon = i == startMonth ? startMonth: 1;
+                    startMon = i == startYear ? startMonth: 1;
                     measurements = new ArrayList<>();
                     params = new HashMap<>();
                     params.put("bucket", properties.getBucket() + "_" + i);

industry-system/cqcy-ei-influxdb/src/main/java/com/cqcy/ei/influxdb/util/SysCronUtil.java

@@ -92,6 +92,9 @@ public class SysCronUtil {
                 // 只分库
                 start = DateUtil.parse(str[1] + "-01-01");
                 end = DateUtil.endOfYear(start);
+                if (end.after(endTime)) {
+                    end = DateUtil.endOfDay(DateUtil.yesterday());
+                }
                 // 迁移数据
                 inFluxDBService.moveMeasurementByTime(start, end, bucket, properties.getMeasurement());
                 StaticLog.info("====>迁移数据执行完成，目标库：{}，目标表：{}，耗时：{}ms", bucket, properties.getMeasurement(), System.currentTimeMillis() - time);
@@ -107,6 +110,9 @@ public class SysCronUtil {
                 String[] tables = measurement.split("_");
                 start = DateUtil.parse(tables[1] + "-" + tables[2] + "-01");
                 end = DateUtil.endOfMonth(start);
+                if (end.after(endTime)) {
+                    end = DateUtil.endOfDay(DateUtil.yesterday());
+                }
                 // 迁移数据
                 inFluxDBService.moveMeasurementByTime(start, end, bucket, measurement);
                 StaticLog.info("====>迁移数据执行完成，目标库：{}，目标表：{}，耗时：{}ms", bucket, measurement, System.currentTimeMillis() - time);

telegraf-client/src/main/java/com/cqcy/ei/telegraf/client/util/BlankUtil.java

@@ -1,8 +1,16 @@
 package com.cqcy.ei.telegraf.client.util;
 
+import cn.hutool.core.convert.Convert;
+
 public class BlankUtil {
 
     public static boolean isNotEmpty(Object obj) {
-        return obj != null;
+        if (obj == null) {
+            return false;
+        }
+        if (obj instanceof String) {
+            return !"".equals(Convert.toStr(obj, ""));
+        }
+        return true;
     }
 }