Browse Source

解决问题:"删除装置系统时不删除历史数据"

丁治程 7 months ago
parent
commit
f9c0ba4666

+ 24 - 24
jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockAvoidCircular/service/impl/InterlockAvoidCircularServiceImpl.java

@@ -773,30 +773,30 @@ public class InterlockAvoidCircularServiceImpl implements InterlockAvoidCircular
         interlockSummaryTempQueryWrapper.in("interlock_system_id",id);
         interlockSummaryTempService.remove(interlockSummaryTempQueryWrapper);
 
-        //删除对应的历史数据表
-        ArrayList<String> historySummaryIdList = new ArrayList<>();
-        QueryWrapper<InterlockSummaryHistory> historySummaryQuery = new QueryWrapper<>();
-        historySummaryQuery.eq("interlock_system_id",id);
-        List<InterlockSummaryHistory> historySummaryList = summaryHistoryService.list(historySummaryQuery);
-        for (InterlockSummaryHistory historySummary : historySummaryList) {
-            historySummaryIdList.add(historySummary.getId());
-        }
-        QueryWrapper<InterlockDetailHistory> interlockDetailHistoryQueryWrapper = new QueryWrapper<>();
-        interlockDetailHistoryQueryWrapper.in("summaryid",historySummaryIdList);
-        if (ObjectUtil.isNotNull(historySummaryIdList)) {
-            detailHistoryService.remove(interlockDetailHistoryQueryWrapper);
-        }
-        QueryWrapper<InterlockSummaryHistory> interlockSummaryHistoryQueryWrapper = new QueryWrapper<>();
-        interlockSummaryHistoryQueryWrapper.in("interlock_system_id",id);
-        summaryHistoryService.remove(interlockSummaryHistoryQueryWrapper);
-
-        //删除对应的统计数据表
-        QueryWrapper<InterlockCountDay> interlockCountDayQueryWrapper = new QueryWrapper<>();
-        interlockCountDayQueryWrapper.in("interlock_system_id",id);
-        countDayService.remove(interlockCountDayQueryWrapper);
-        QueryWrapper<InterlockCountMonth> interlockCountMonthQueryWrapper = new QueryWrapper<>();
-        interlockCountMonthQueryWrapper.in("interlock_system_id",id);
-        countMonthService.remove(interlockCountMonthQueryWrapper);
+        ////删除对应的历史数据表
+        //ArrayList<String> historySummaryIdList = new ArrayList<>();
+        //QueryWrapper<InterlockSummaryHistory> historySummaryQuery = new QueryWrapper<>();
+        //historySummaryQuery.eq("interlock_system_id",id);
+        //List<InterlockSummaryHistory> historySummaryList = summaryHistoryService.list(historySummaryQuery);
+        //for (InterlockSummaryHistory historySummary : historySummaryList) {
+        //    historySummaryIdList.add(historySummary.getId());
+        //}
+        //QueryWrapper<InterlockDetailHistory> interlockDetailHistoryQueryWrapper = new QueryWrapper<>();
+        //interlockDetailHistoryQueryWrapper.in("summaryid",historySummaryIdList);
+        //if (ObjectUtil.isNotNull(historySummaryIdList)) {
+        //    detailHistoryService.remove(interlockDetailHistoryQueryWrapper);
+        //}
+        //QueryWrapper<InterlockSummaryHistory> interlockSummaryHistoryQueryWrapper = new QueryWrapper<>();
+        //interlockSummaryHistoryQueryWrapper.in("interlock_system_id",id);
+        //summaryHistoryService.remove(interlockSummaryHistoryQueryWrapper);
+
+        ////删除对应的统计数据表
+        //QueryWrapper<InterlockCountDay> interlockCountDayQueryWrapper = new QueryWrapper<>();
+        //interlockCountDayQueryWrapper.in("interlock_system_id",id);
+        //countDayService.remove(interlockCountDayQueryWrapper);
+        //QueryWrapper<InterlockCountMonth> interlockCountMonthQueryWrapper = new QueryWrapper<>();
+        //interlockCountMonthQueryWrapper.in("interlock_system_id",id);
+        //countMonthService.remove(interlockCountMonthQueryWrapper);
     }
 
     /**