模拟预警信息接口开发

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

@@ -1074,8 +1074,8 @@ public class GeoHazardMonitorTokenController {
 //                            }
 //                            respHeartbeatVo.setPreAlarmList(responseList);
 //                        }
-                    } else if (!ObjectUtils.isEmpty(preAlarmLists.get(0).getPreAlarmList())) {
-                        if (!"[]".equals(preAlarmLists.get(0).getPreAlarmList())) {
+                    } else if (!ObjectUtils.isEmpty(preAlarmLists)) {
+                        if (!"[]".equals(preAlarmLists.get(0).getPreAlarmList()) && !ObjectUtils.isEmpty(preAlarmLists.get(0).getPreAlarmList())) {
                             log.info("preAlarm.getPreAlarmList()------" + preAlarmLists.get(0).getPreAlarmList());
                             List<PreAlarmListResponse> responseList = new ArrayList<>();
                             List<PreAlarmResponse.PreAlarmList> preAlarmList = JSON.parseArray(preAlarmLists.get(0).getPreAlarmList(), PreAlarmResponse.PreAlarmList.class);
@@ -1252,7 +1252,7 @@ public class GeoHazardMonitorTokenController {
                                         }
                                     }
                                 }
-                            }else {
+                            } else {
                                 //没有报警信息的时候
                                 BaseCameraManagementReq baseCameraManagementReq = new BaseCameraManagementReq();
                                 if (heartbeatVo.getLineDir() == 1) {
@@ -1637,8 +1637,8 @@ public class GeoHazardMonitorTokenController {
                         }
                         respHeartbeatVo.setIsAlarm(2);
                     }
-                } else if (!ObjectUtils.isEmpty(preAlarmLists.get(0).getPreAlarmList())) {
-                    if (!"[]".equals(preAlarmLists.get(0).getPreAlarmList())) {
+                } else if (!ObjectUtils.isEmpty(preAlarmLists)) {
+                    if (!"[]".equals(preAlarmLists.get(0).getPreAlarmList()) && !ObjectUtils.isEmpty(preAlarmLists.get(0).getPreAlarmList())) {
                         log.info("preAlarm.getPreAlarmList()------" + preAlarmLists.get(0).getPreAlarmList());
                         List<PreAlarmListResponse> responseList = new ArrayList<>();
                         List<PreAlarmResponse.PreAlarmList> preAlarmList = JSON.parseArray(preAlarmLists.get(0).getPreAlarmList(), PreAlarmResponse.PreAlarmList.class);
@@ -1815,7 +1815,7 @@ public class GeoHazardMonitorTokenController {
                                     }
                                 }
                             }
-                        }else {
+                        } else {
                             //没有报警信息的时候
                             BaseCameraManagementReq baseCameraManagementReq = new BaseCameraManagementReq();
                             if (heartbeatVo.getLineDir() == 1) {
@@ -3047,12 +3047,12 @@ public class GeoHazardMonitorTokenController {
     }
 
     @PostMapping("/api/savePreAlarm")
-    public void savePreAlarm(@RequestBody PreAlarmReq preAlarmReq){
+    public void savePreAlarm(@RequestBody PreAlarmReq preAlarmReq) {
         List<PreAlarm> list = preAlarmService.list(new LambdaQueryWrapper<PreAlarm>()
                 .ge(PreAlarm::getPreAlarmTime, preAlarmReq.getBeginTime())
                 .le(PreAlarm::getPreAlarmTime, preAlarmReq.getEndTime()).orderByAsc(PreAlarm::getPreAlarmTime));
-        log.info("savePreAlarm---------------"+list.toString());
-        if (!ObjectUtils.isEmpty(list)){
+        log.info("savePreAlarm---------------" + list.toString());
+        if (!ObjectUtils.isEmpty(list)) {
             for (PreAlarm preAlarm : list) {
                 try {
                     TimeUnit.SECONDS.sleep(1);
@@ -3063,7 +3063,7 @@ public class GeoHazardMonitorTokenController {
                     preAlarm.setPreAlarmTime(cal.getTime());
                     preAlarm.setCreatedTime(new Date());
                     boolean save = preAlarmService.save(preAlarm);
-                    log.info("savePreAlarm--------------时间-"+new Date()+"----"+save);
+                    log.info("savePreAlarm--------------时间-" + new Date() + "----" + save);
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                 }