|
@@ -825,7 +825,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- } else if (!ObjectUtils.isEmpty(preAlarm.getPreAlarmList()) && preAlarm.getPreAlarmList().length() > 0) {
|
|
|
+ } else if (!"[]".equals(preAlarm.getPreAlarmList())) {
|
|
|
log.info("preAlarm.getPreAlarmList()------"+preAlarm.getPreAlarmList());
|
|
|
List<PreAlarmListResponse> responseList = new ArrayList<>();
|
|
|
List<PreAlarmResponse.PreAlarmList> preAlarmList = JSON.parseArray(preAlarm.getPreAlarmList(), PreAlarmResponse.PreAlarmList.class);
|
|
@@ -1018,7 +1018,8 @@ public class GeoHazardMonitorTokenController {
|
|
|
twoMap.put("cameraCode", list1.get(0).getCameraCode());
|
|
|
respHeartbeatVo.setIsAlarm(2);
|
|
|
}
|
|
|
- } else if (!ObjectUtils.isEmpty(preAlarm.getPreAlarmList()) && preAlarm.getPreAlarmList().length() > 0) {
|
|
|
+ } else if (!"[]".equals(preAlarm.getPreAlarmList())) {
|
|
|
+ log.info("preAlarm.getPreAlarmList()------"+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>() {
|