已处理和未处理，添加type处理

src/main/java/com/zhili/dashboard/service/impl/AlarmMsgServiceImpl.java

@@ -1156,6 +1156,7 @@ public class AlarmMsgServiceImpl extends ServiceImpl<AlarmMsgMapper, AlarmMsg> i
 
         int interval = 7;
         long maxId = 0L;
+        long maxId1 = 0L;
         QueryWrapper<AlarmMsg> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_delete", 0);
         queryWrapper.eq("type", 1);
@@ -1165,6 +1166,15 @@ public class AlarmMsgServiceImpl extends ServiceImpl<AlarmMsgMapper, AlarmMsg> i
             maxId = alarmMsg.getId();
         }
 
+        QueryWrapper<AlarmMsg> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("is_delete", 0);
+        queryWrapper1.eq("type", 2);
+        queryWrapper1.select("max(sid) as id");
+        AlarmMsg alarmMsg1 = alarmMsgMapper.selectOne(queryWrapper1);
+        if (alarmMsg1 != null && alarmMsg1.getId() != null) {
+            maxId1 = alarmMsg1.getId();
+        }
+
         //获取电池信息
         List<String> response = new ArrayList<>();
         try {
@@ -1179,7 +1189,7 @@ public class AlarmMsgServiceImpl extends ServiceImpl<AlarmMsgMapper, AlarmMsg> i
             TableInfoParam paramDone = new TableInfoParam();
             paramDone.setSignature(SIGNATURE);
             paramDone.setInterfaceName("设备基本信息");
-            paramDone.setCondition("date_info <= DATE_ADD(now(), INTERVAL -" + interval + " DAY) and id>" + maxId + " order by id ");
+            paramDone.setCondition("date_info <= DATE_ADD(now(), INTERVAL -" + interval + " DAY) and id>" + maxId1 + " order by id ");
             paramDone.setTableName("algo_all_fault_info_done");
             paramDone.setFields("id,sn,fault_code,start_time,end_time,fault_advice,update_by");
 

src/main/java/com/zhili/dashboard/service/impl/AlarmMsgWarnServiceImpl.java

@@ -92,15 +92,25 @@ public class AlarmMsgWarnServiceImpl extends ServiceImpl<AlarmMsgWarnMapper, Ala
 
         int interval = 5;
         long maxId = 0L;
+        long maxId1 = 0L;
         QueryWrapper<AlarmMsgWarn> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_delete", 0);
-        queryWrapper.eq("type", 2);
+        queryWrapper.eq("type", 1);
         queryWrapper.select("max(sid) as id");
         AlarmMsgWarn alarmMsg = alarmMsgWarnMapper.selectOne(queryWrapper);
         if (alarmMsg != null && alarmMsg.getId() != null) {
             maxId = alarmMsg.getId();
         }
 
+        QueryWrapper<AlarmMsgWarn> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("is_delete", 0);
+        queryWrapper1.eq("type", 2);
+        queryWrapper1.select("max(sid) as id");
+        AlarmMsgWarn alarmMsg1 = alarmMsgWarnMapper.selectOne(queryWrapper1);
+        if (alarmMsg1 != null && alarmMsg1.getId() != null) {
+            maxId1 = alarmMsg1.getId();
+        }
+
 
         //获取电池信息
         List<String> response = new ArrayList<>();
@@ -116,7 +126,7 @@ public class AlarmMsgWarnServiceImpl extends ServiceImpl<AlarmMsgWarnMapper, Ala
             TableInfoParam paramDone = new TableInfoParam();
             paramDone.setSignature(SIGNATURE);
             paramDone.setInterfaceName("设备基本信息");
-            paramDone.setCondition("date_info <= DATE_ADD(now(), INTERVAL -" + interval + " DAY) and id>" + maxId + " order by id ");
+            paramDone.setCondition("date_info <= DATE_ADD(now(), INTERVAL -" + interval + " DAY) and id>" + maxId1 + " order by id ");
             paramDone.setTableName("algo_all_fault_info_done");
             paramDone.setFields("id,sn,fault_code,start_time,end_time,fault_advice,update_by");