修改历史数据相关bug

jeecg-module-interlock/src/main/java/org/jeecg/modules/binlog/PostgreSQLClient.java

@@ -633,6 +633,9 @@ public class PostgreSQLClient implements ApplicationRunner {
                             }
                         }
                         */
+                            LocalDateTime currentDateTime = LocalDateTime.now();
+                            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                            String formattedDateTime = currentDateTime.format(formatter);
 
                             QueryWrapper<InterlockSummaryTemp> summaryTempQuery = new QueryWrapper<>();
                             summaryTempQuery.eq("id",summaryId);
@@ -663,7 +666,7 @@ public class PostgreSQLClient implements ApplicationRunner {
                                 List<InterlockDetail> list1 = detailService.list(interlockDetailQueryWrapper);
                                 InterlockSummaryHistory interlockSummaryHistory = InterlockSummaryHistoryConvert.INSTANCE.toHistory(interlock);
                                 interlockSummaryHistory.setSummaryOriginId(interlock.getId());
-                                interlockSummaryHistory.setTagTime(tagTime);
+                                interlockSummaryHistory.setTagTime(formattedDateTime);
                                 interlockSummaryHistory.setInterlockStatusTy(base.getInterlockStatusTy());//联锁状态-正常状态-值
                                 interlockSummaryHistory.setInterlockStatusTyName(base.getInterlockStatusTyName());//联锁状态-正常状态-名称
                                 interlockSummaryHistory.setInterlockStatusWtyName(base.getInterlockStatusWtyName());//联锁状态-故障状态-名称
@@ -679,7 +682,7 @@ public class PostgreSQLClient implements ApplicationRunner {
                                     item.setSummaryid(interlockSummaryHistory.getId());
                                     InterlockDetailHistory interlockDetailHistory = InterlockDetailHistoryConvert.INSTANCE.toHistory(item);
                                     interlockDetailHistory.setSummaryOriginId(interlock.getId());
-                                    interlockDetailHistory.setTagTime(tagTime);
+                                    interlockDetailHistory.setTagTime(formattedDateTime);
                                     //保存当前0/1的含义
                                     //旁路状态
                                     interlockDetailHistory.setBypassYes(base.getBypassYes());//旁路状态-正常状态-值

jeecg-module-interlock/src/main/java/org/jeecg/modules/summary/service/impl/InterlockSummaryServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.summary.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -374,6 +375,9 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
         loopHealthLevel = getLHL(instrumentStatus, instrumentStatusAbnormal,interlockStatus, interlockStatusWty, controlSystemStatus, controlSystemStatusAbnormal);
 
         InterlockSummary interlockSummary = InterlockSummaryConvert.INSTANCE.toInterlockSummary1(interlockAddDTO,interlockStatus,loopHealthLevel);
+        if (ObjectUtil.isNull(interlockSummary.getInterlockOutValue())){
+            interlockSummary.setDeviceId("1");
+        }
         //修改联锁总表数据
         interlockSummaryMapper.updateById(interlockSummary);
         //修改联锁总表临时表数据