恢复最新状态

.gitignore

@@ -12,4 +12,5 @@ target
 
 logs
 !**/nacos/target
-data/gtcvr.db
+data/gtcvr.db
+/data/

src/main/java/com/gct/edge/service/excutor/ModbusReadService.java

@@ -65,7 +65,8 @@ public class ModbusReadService {
                 List<List<Double>> sgt = readBody.card;
                 Double s = readBody.s;
                 Double n = readBody.n;
-                String prodTime = readBody.prodTime;
+                String prodTime = LocalDateTime.now().format(df);
+                String checkTime = readBody.prodTime;
                 if (Objects.isNull(sgt) || Objects.isNull(s) || Objects.isNull(n) ||Objects.isNull(prodTime) || s < 1e-6 || n < 1e-6) {
                     log.error("read Rtu modbus failed, sgt: {},s: {},n: {},prodTime: {}", sgt, s, n, prodTime);
                     continue;
@@ -76,12 +77,12 @@ public class ModbusReadService {
                 if (Objects.isNull(lastDumpRecord)){
                     lastDumpRecord = new DumpRecord();
                     lastDumpRecord.setTableName(aoidConfigData.getJh());
-                    lastDumpRecord.setDumpTime(prodTime);
+                    lastDumpRecord.setDumpTime(checkTime);
                     dumpRecordService.save(lastDumpRecord);
                 }else {
-                    if (lastDumpRecord.getDumpTime().equals(prodTime))continue;
+                    if (lastDumpRecord.getDumpTime().equals(checkTime))continue;
                     else {
-                        lastDumpRecord.setDumpTime(prodTime);
+                        lastDumpRecord.setDumpTime(checkTime);
                         dumpRecordService.update(lastDumpRecord,new QueryWrapper<DumpRecord>().eq("table_name", aoidConfigData.getJh()));
                     }
                 }