车载心跳监测接口定义修改

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

@@ -327,6 +327,22 @@ public class GeoHazardMonitorTokenController {
             BaseUser admin = baseUserService.getUserName("admin");
             MsgAlarmFrequency msgAlarmVice = new MsgAlarmFrequency();
             if (ObjectUtils.isEmpty(alarm)) {
+                // 获取当前时间的前5分钟
+                List<SysDictData> alarmTime = dictTypeService.selectDictDataByType("alarm_time");
+
+                Date fiveMinutesAgo;
+                if (ObjectUtils.isEmpty(alarmTime)){
+                    fiveMinutesAgo = Date.from(Instant.now().minus(Long.valueOf("5"), ChronoUnit.MINUTES));
+                }else {
+                    fiveMinutesAgo = Date.from(Instant.now().minus(Long.valueOf(alarmTime.get(0).getDictValue()), ChronoUnit.MINUTES));
+                }
+                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                String formatted = format.format(fiveMinutesAgo);
+                LambdaQueryWrapper<MsgAlarm> wrapper1 = new LambdaQueryWrapper<MsgAlarm>();
+                wrapper1.eq(MsgAlarm::getAlarmMile, reqMsgAlarmVo.getAlarmMile());
+                wrapper1.ge(MsgAlarm::getAlarmTime, formatted);
+                List<MsgAlarm> list = msgAlarmService.list(lw);
+
                 List<String> stringList = new ArrayList<>();
                 MsgAlarm msgAlarm = new MsgAlarm();
                 BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarm);
@@ -376,21 +392,8 @@ public class GeoHazardMonitorTokenController {
                 log.info("->>>>>>>>>>>>>>>>>>>>>>>>>>>>" + result);
                 log.info("result：{}", result);
 
-                // 获取当前时间的前5分钟
-                List<SysDictData> alarmTime = dictTypeService.selectDictDataByType("alarm_time");
-
-                Date fiveMinutesAgo;
-                if (ObjectUtils.isEmpty(alarmTime)){
-                    fiveMinutesAgo = Date.from(Instant.now().minus(Long.valueOf("5"), ChronoUnit.MINUTES));
-                }else {
-                    fiveMinutesAgo = Date.from(Instant.now().minus(Long.valueOf(alarmTime.get(0).getDictValue()), ChronoUnit.MINUTES));
-                }
-                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                String formatted = format.format(fiveMinutesAgo);
-                LambdaQueryWrapper<MsgAlarm> wrapper1 = new LambdaQueryWrapper<MsgAlarm>();
-                wrapper1.eq(MsgAlarm::getAlarmMile, reqMsgAlarmVo.getAlarmMile());
-                wrapper1.ge(MsgAlarm::getAlarmTime, formatted);
-                List<MsgAlarm> list = msgAlarmService.list(lw);
+                log.info("list.size()------>" + list.size());
+                log.info("list-----data->"+list);
                 if (list.size() < 0) {
                     if (!ObjectUtils.isEmpty(baseCameraManagementList)) {
                         int minDifference = Integer.MAX_VALUE;