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

@@ -486,17 +486,25 @@ public class PostgreSQLClient implements ApplicationRunner {
                         // 只要有任意一个状态发生了变化 就将当前联锁、联锁条件记录到历史数据中  (可此时记录的状态确实是未改变之前的，但是点位值却是已经改变之后的)
                         //修改：记录历史数据的同时，记录下当下的含义，便于以后展示历史数据
                         if ("1".equals(ifYbStatus) || "1".equals(ifLsStatus) || "1".equals(ifKzxtStatus) || "1".equals(ifHljkjbStatus) || "1".equals(ifPlStatus)){
-                            QueryWrapper<InterlockSummaryTemp> summaryTempQuery = new QueryWrapper<>();
-                            summaryTempQuery.eq("id",summaryId);
-                            InterlockSummaryTemp interlockTemp = summaryTempService.getOne(summaryTempQuery);
+                            //QueryWrapper<InterlockSummaryTemp> summaryTempQuery = new QueryWrapper<>();
+                            //summaryTempQuery.eq("id",summaryId);
+                            //InterlockSummaryTemp interlockTemp = summaryTempService.getOne(summaryTempQuery)
+
+                            QueryWrapper<InterlockSummary> summaryQuery1 = new QueryWrapper<>();
+                            summaryQuery1.eq("id", summaryId);
+                            InterlockSummary interlock = summaryService.getOne(summaryQuery1);
+
                             //QueryWrapper<InterlockSummaryHistory> summaryHistoryQuery = new QueryWrapper<>();
                             //summaryHistoryQuery.eq("tag_time",interlockTemp.getTagTime());
                             //long count1 = summaryHistoryService.count(summaryHistoryQuery);
                             long count1 = 0;
                             if (count1 == 0){
-                                List<InterlockDetailTemp> tempList = detailTempService.selectListBySummaryId(summaryId);
-                                InterlockSummaryHistory interlockSummaryHistory = InterlockSummaryHistoryConvert.INSTANCE.toTempHistory(interlockTemp);
-                                interlockSummaryHistory.setSummaryOriginId(interlockTemp.getId());
+                                //List<InterlockDetailTemp> tempList = detailTempService.selectListBySummaryId(summaryId);
+                                QueryWrapper<InterlockDetail> interlockDetailQueryWrapper = new QueryWrapper<>();
+                                interlockDetailQueryWrapper.eq("summaryid",summaryId);
+                                List<InterlockDetail> list1 = detailService.list(interlockDetailQueryWrapper);
+                                InterlockSummaryHistory interlockSummaryHistory = InterlockSummaryHistoryConvert.INSTANCE.toHistory(interlock);
+                                interlockSummaryHistory.setSummaryOriginId(interlock.getId());
                                 interlockSummaryHistory.setTagTime(tagTime);
                                 interlockSummaryHistory.setInterlockStatusTy(base.getInterlockStatusTy());//联锁状态-正常状态-值
                                 interlockSummaryHistory.setInterlockStatusTyName(base.getInterlockStatusTyName());//联锁状态-正常状态-名称
@@ -509,10 +517,10 @@ public class PostgreSQLClient implements ApplicationRunner {
                                 }
                                 summaryHistoryService.save(interlockSummaryHistory);
                                 ArrayList<InterlockDetailHistory> historyList = new ArrayList<>();
-                                for (InterlockDetailTemp item:tempList) {
+                                for (InterlockDetail item:list1) {
                                     item.setSummaryid(interlockSummaryHistory.getId());
-                                    InterlockDetailHistory interlockDetailHistory = InterlockDetailHistoryConvert.INSTANCE.toTempHistory(item);
-                                    interlockDetailHistory.setSummaryOriginId(interlockTemp.getId());
+                                    InterlockDetailHistory interlockDetailHistory = InterlockDetailHistoryConvert.INSTANCE.toHistory(item);
+                                    interlockDetailHistory.setSummaryOriginId(interlock.getId());
                                     interlockDetailHistory.setTagTime(tagTime);
                                     //保存当前0/1的含义
                                     //旁路状态