车载心跳机制交互修改

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

@@ -77,6 +77,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
@@ -640,10 +642,21 @@ public class GeoHazardMonitorTokenController {
                 List<MsgAlarm> alarmsList = msgAlarmService.list(queryWrapper);
                 //根据终端编码 判断终端忽略报警信息记录表中的是否有忽略的报警
                 if (!ObjectUtils.isEmpty(alarmsList)) {
+                    // 获取当前时间
+                    LocalDateTime currentDateTime = LocalDateTime.now();
+                    // 获取前一天的时间
+                    LocalDateTime previousDateTime = currentDateTime.minusDays(1);
+                    // 格式化日期时间
+                    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                    String currentFormattedDateTime = currentDateTime.format(formatter);
+                    String previousFormattedDateTime = previousDateTime.format(formatter);
+                    
                     LambdaQueryWrapper<TerminalIgnoreAlarm> queryWrapper1 = new LambdaQueryWrapper<>();
                     List<String> collect = alarmsList.stream().map(MsgAlarm::getAlarmId).collect(Collectors.toList());
                     queryWrapper1.in(TerminalIgnoreAlarm::getAlarmId, collect);
                     queryWrapper1.eq(TerminalIgnoreAlarm::getTerminalCode, heartbeatVo.getTerminalCode());
+                    queryWrapper1.ge(TerminalIgnoreAlarm::getIgnoreTime,previousFormattedDateTime);
+                    queryWrapper1.le(TerminalIgnoreAlarm::getIgnoreTime,currentFormattedDateTime);
                     List<TerminalIgnoreAlarm> list2 = terminalIgnoreAlarmService.list(queryWrapper1);
                     //找出未忽略的报警信息
                     LambdaQueryWrapper<MsgAlarm> queryWrapper2 = new LambdaQueryWrapper<>();