车载心跳机制交互修改

vehicle-admin/src/main/java/com/ozs/web/controller/sdk/GeoHazardMonitorTokenController.java

@@ -662,7 +662,14 @@ public class GeoHazardMonitorTokenController {
                     LambdaQueryWrapper<MsgAlarm> queryWrapper2 = new LambdaQueryWrapper<>();
                     if (!ObjectUtils.isEmpty(list2)) {
                         List<String> collect1 = list2.stream().map(TerminalIgnoreAlarm::getAlarmId).collect(Collectors.toList());
-                        queryWrapper2.notIn(MsgAlarm::getAlarmId, collect1);
+                        List<String> list = collect.stream()
+                                .filter(item -> !collect1.contains(item))
+                                .collect(Collectors.toList());
+                        if (!ObjectUtils.isEmpty(list)) {
+                            queryWrapper2.in(MsgAlarm::getAlarmId, list);
+                        }else {
+                            queryWrapper2.eq(MsgAlarm::getAlarmId, "1111111111111");
+                        }
                     } else {
                         queryWrapper2.in(MsgAlarm::getAlarmId, collect);
                     }