心跳接口修改

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

@@ -825,7 +825,7 @@ public class GeoHazardMonitorTokenController {
                                 }
                             }
                         }
-                    }else if (!ObjectUtils.isEmpty(preAlarm)) {
+                    }else if (!ObjectUtils.isEmpty(preAlarm.getPreAlarmList())) {
                         List<PreAlarmListResponse> responseList = new ArrayList<>();
                         List<PreAlarmResponse.PreAlarmList> preAlarmList = JSON.parseArray(preAlarm.getPreAlarmList(), PreAlarmResponse.PreAlarmList.class);
                         Comparator<PreAlarmResponse.PreAlarmList> distanceComparator = new Comparator<PreAlarmResponse.PreAlarmList>() {
@@ -1017,7 +1017,7 @@ public class GeoHazardMonitorTokenController {
                         twoMap.put("cameraCode", list1.get(0).getCameraCode());
                         respHeartbeatVo.setIsAlarm(2);
                     }
-                }else if (!ObjectUtils.isEmpty(preAlarm)) {
+                }else if (!ObjectUtils.isEmpty(preAlarm.getPreAlarmList())){
                     List<PreAlarmListResponse> responseList = new ArrayList<>();
                     List<PreAlarmResponse.PreAlarmList> preAlarmList = JSON.parseArray(preAlarm.getPreAlarmList(), PreAlarmResponse.PreAlarmList.class);
                     Comparator<PreAlarmResponse.PreAlarmList> distanceComparator = new Comparator<PreAlarmResponse.PreAlarmList>() {
@@ -1238,10 +1238,14 @@ public class GeoHazardMonitorTokenController {
                 baseVideoTrainsService.save(baseVideoTrains);
                 heartbeatUtils.createHeartbeat(Constant.HERTBEA_KEY + heartbeatVo.getTerminalCode(), string);
                 log.info("---------data---结果-------" + respHeartbeatVo);
-                if (StringUtils.isNotEmpty(respHeartbeatVo.getCameraList())) {
-                    AjaxResults1 = new AjaxResults(1, "ok", respHeartbeatVo);
+                if (!ObjectUtils.isEmpty(respHeartbeatVo.getPreAlarmList())) {
+                    if (!ObjectUtils.isEmpty(respHeartbeatVo.getCameraList())) {
+                        AjaxResults1 = new AjaxResults(1, "ok", respHeartbeatVo);
+                    } else {
+                        AjaxResults1 = new AjaxResults(0, "视频加载中", respHeartbeatVo);
+                    }
                 }else {
-                    AjaxResults1 = new AjaxResults(0, "视频加载中", respHeartbeatVo);
+                    AjaxResults1 = new AjaxResults(1, "ok", respHeartbeatVo);
                 }
                 long end = System.currentTimeMillis();
                 log.info("结束心跳时间: " + sdf.format(new Date(end)));