|
@@ -732,25 +732,31 @@ public class GeoHazardMonitorTokenController {
|
|
|
base.last("limit 1");
|
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
|
|
|
CameraVos cameraVos = new CameraVos();
|
|
|
- cameraVos.setCameraCode(list1.get(0).getCameraCode());
|
|
|
- cameraVos.setCurrentStream(cameraUtil.getPlayFlvRtsp(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), type, httpUrl));
|
|
|
+ if (!ObjectUtils.isEmpty(list1)) {
|
|
|
+ cameraVos.setCameraCode(list1.get(0).getCameraCode());
|
|
|
+ cameraVos.setCurrentStream(cameraUtil.getPlayFlvRtsp(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), type, httpUrl));
|
|
|
+ boolean finalType6 = type;
|
|
|
+ CompletableFuture.runAsync(() -> {
|
|
|
+ String playFlv = cameraUtil.heartbeatgetPlayFlv(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), finalType6);
|
|
|
+ if (StringUtils.isEmpty(playFlv)) {
|
|
|
+ try {
|
|
|
+ cameraUtil.heartbeatgetUrl(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), finalType6, httpUrl);
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }else {
|
|
|
+ cameraVos.setCameraCode("");
|
|
|
+ cameraVos.setCurrentStream("");
|
|
|
+ }
|
|
|
List<CameraVos> cameraVosList = new ArrayList<>();
|
|
|
cameraVosList.add(cameraVos);
|
|
|
respHeartbeatVo.setCameraList(cameraVosList);
|
|
|
respHeartbeatVo.setIsAlarm(1);
|
|
|
- boolean finalType6 = type;
|
|
|
- CompletableFuture.runAsync(() -> {
|
|
|
- String playFlv = cameraUtil.heartbeatgetPlayFlv(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), finalType6);
|
|
|
- if (StringUtils.isEmpty(playFlv)) {
|
|
|
- try {
|
|
|
- cameraUtil.heartbeatgetUrl(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), finalType6, httpUrl);
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
}
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
|
+ AlarmListVo alarmListVo = new AlarmListVo();
|
|
|
MsgHeartbeatAlarmMessage msgHearbeatAlarmMessage = new MsgHeartbeatAlarmMessage();
|
|
|
msgHearbeatAlarmMessage.setAlarmId(list.get(i).getAlarmId());
|
|
|
msgHearbeatAlarmMessage.setTerminalCode(heartbeatVo.getTerminalCode());
|
|
@@ -775,7 +781,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
//获取所有报警安装里程位置的相机
|
|
|
List<BaseCameraManagement> baseList = baseCameraManagementService.list(ment);
|
|
|
if (baseList.size() > 0) {
|
|
|
- if (i > 0) {
|
|
|
+ if (i == 0) {
|
|
|
int minDifference = Integer.MAX_VALUE;
|
|
|
String code = null;
|
|
|
String graphicsCard = null;
|
|
@@ -793,42 +799,40 @@ public class GeoHazardMonitorTokenController {
|
|
|
graphicsCard = baseCameraManagement.getGraphicsCard();
|
|
|
log.info("------------graphicsCard-------" + graphicsCard);
|
|
|
}
|
|
|
+ break;
|
|
|
}
|
|
|
- playFlv1 = cameraUtil.heartbeatgetPlayFlv(code, graphicsCard, type);
|
|
|
- }
|
|
|
- AlarmListVo alarmListVo = new AlarmListVo();
|
|
|
- //alarmList对象
|
|
|
- if (playFlv1 != null) {
|
|
|
- alarmListVo.setCameraStream(playFlv1);
|
|
|
- } else {
|
|
|
- alarmListVo.setCameraStream("");
|
|
|
+ //alarmList对象
|
|
|
+ alarmListVo.setCameraStream(CameraUtil.getPlayFlvRtsp(code, graphicsCard, type, httpUrl));
|
|
|
+ alarmListVo.setCameraCode(code);
|
|
|
}
|
|
|
- alarmListVo.setCameraCode(baseList.get(0).getCameraCode());
|
|
|
- //alarmInfo对象
|
|
|
- AlarmInfoVo alarmInfoVo1 = new AlarmInfoVo();
|
|
|
- log.info("----------------list.get(i).getAlarmId()---后续-----------" + list.get(i).getAlarmId());
|
|
|
- alarmInfoVo1.setAlarmId(list.get(i).getAlarmId());
|
|
|
- alarmInfoVo1.setAlarmMile(list.get(i).getAlarmMile());
|
|
|
- alarmInfoVo1.setAlarmTime(list.get(i).getAlarmTime().getTime());
|
|
|
- alarmInfoVo1.setAlarmType(list.get(i).getAlarmType());
|
|
|
- alarmInfoVo1.setAlarmContent(list.get(i).getContent());
|
|
|
- alarmInfoVo1.setAlarmLevel(list.get(i).getAlarmLevel());
|
|
|
- LambdaQueryWrapper<MsgAlarmExt> alarm = new LambdaQueryWrapper<>();
|
|
|
- alarm.eq(MsgAlarmExt::getAlarmId, list.get(i).getAlarmId());
|
|
|
- List<MsgAlarmExt> list1 = msgAlarmExtService.list(alarm);
|
|
|
- if (list1.size() > 0) {
|
|
|
- AlarmFilesVo[] vo = new AlarmFilesVo[list1.size()];
|
|
|
- for (int i1 = 0; i1 < list1.size(); i1++) {
|
|
|
- vo[i1] = new AlarmFilesVo();
|
|
|
- vo[i1].setAlarmAttType(list1.get(i1).getAlarmAttType());
|
|
|
- vo[i1].setAlarmAttPath(list1.get(i1).getAlarmAttPath());
|
|
|
- }
|
|
|
- alarmInfoVo1.setAlarmFiles(vo);
|
|
|
+ } else {
|
|
|
+ alarmListVo.setCameraStream("");
|
|
|
+ alarmListVo.setCameraCode("");
|
|
|
+ }
|
|
|
+ //alarmInfo对象
|
|
|
+ AlarmInfoVo alarmInfoVo1 = new AlarmInfoVo();
|
|
|
+ log.info("----------------list.get(i).getAlarmId()---后续-----------" + list.get(i).getAlarmId());
|
|
|
+ alarmInfoVo1.setAlarmId(list.get(i).getAlarmId());
|
|
|
+ alarmInfoVo1.setAlarmMile(list.get(i).getAlarmMile());
|
|
|
+ alarmInfoVo1.setAlarmTime(list.get(i).getAlarmTime().getTime());
|
|
|
+ alarmInfoVo1.setAlarmType(list.get(i).getAlarmType());
|
|
|
+ alarmInfoVo1.setAlarmContent(list.get(i).getContent());
|
|
|
+ alarmInfoVo1.setAlarmLevel(list.get(i).getAlarmLevel());
|
|
|
+ LambdaQueryWrapper<MsgAlarmExt> alarm = new LambdaQueryWrapper<>();
|
|
|
+ alarm.eq(MsgAlarmExt::getAlarmId, list.get(i).getAlarmId());
|
|
|
+ List<MsgAlarmExt> list1 = msgAlarmExtService.list(alarm);
|
|
|
+ if (list1.size() > 0) {
|
|
|
+ AlarmFilesVo[] vo = new AlarmFilesVo[list1.size()];
|
|
|
+ for (int i1 = 0; i1 < list1.size(); i1++) {
|
|
|
+ vo[i1] = new AlarmFilesVo();
|
|
|
+ vo[i1].setAlarmAttType(list1.get(i1).getAlarmAttType());
|
|
|
+ vo[i1].setAlarmAttPath(list1.get(i1).getAlarmAttPath());
|
|
|
}
|
|
|
- alarmListVo.setAlarmInfo(alarmInfoVo1);
|
|
|
- log.info("----------------alarmListVo-----------" + alarmListVo);
|
|
|
- listVos.add(alarmListVo);
|
|
|
+ alarmInfoVo1.setAlarmFiles(vo);
|
|
|
}
|
|
|
+ alarmListVo.setAlarmInfo(alarmInfoVo1);
|
|
|
+ log.info("----------------alarmListVo-----------" + alarmListVo);
|
|
|
+ listVos.add(alarmListVo);
|
|
|
}
|
|
|
AlarmListVo[] array = listVos.toArray(new AlarmListVo[]{});
|
|
|
log.info("----------------array-----------" + Arrays.toString(array));
|
|
@@ -855,19 +859,10 @@ public class GeoHazardMonitorTokenController {
|
|
|
for (BaseCameraManagement cameraManagement : baseCameraManagementList1) {
|
|
|
boolean finalType2 = type;
|
|
|
CompletableFuture.runAsync(() -> {
|
|
|
- int index = 0;
|
|
|
- String url;
|
|
|
- if (index < 2) {
|
|
|
- url = httpUrl;
|
|
|
- index++;
|
|
|
- } else {
|
|
|
- url = httpUrls;
|
|
|
- index = 0;
|
|
|
- }
|
|
|
String playFlv = cameraUtil.heartbeatgetPlayFlv(cameraManagement.getCameraCode(), cameraManagement.getGraphicsCard(), finalType2);
|
|
|
if (StringUtils.isEmpty(playFlv)) {
|
|
|
try {
|
|
|
- cameraUtil.heartbeatgetUrl(cameraManagement.getCameraCode(), cameraManagement.getGraphicsCard(), finalType2, url);
|
|
|
+ cameraUtil.heartbeatgetUrl(cameraManagement.getCameraCode(), cameraManagement.getGraphicsCard(), finalType2, httpUrl);
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
@@ -974,25 +969,30 @@ public class GeoHazardMonitorTokenController {
|
|
|
base.last("limit 1");
|
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
|
|
|
CameraVos cameraVos = new CameraVos();
|
|
|
- cameraVos.setCameraCode(list1.get(0).getCameraCode());
|
|
|
- cameraVos.setCurrentStream(cameraUtil.getPlayFlvRtsp(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), type, httpUrl));
|
|
|
+ if (!ObjectUtils.isEmpty(list1)) {
|
|
|
+ cameraVos.setCameraCode(list1.get(0).getCameraCode());
|
|
|
+ cameraVos.setCurrentStream(cameraUtil.getPlayFlvRtsp(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), type, httpUrl));
|
|
|
+ boolean finalType6 = type;
|
|
|
+ CompletableFuture.runAsync(() -> {
|
|
|
+ String playFlv = cameraUtil.heartbeatgetPlayFlv(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), finalType6);
|
|
|
+ if (StringUtils.isEmpty(playFlv)) {
|
|
|
+ try {
|
|
|
+ cameraUtil.heartbeatgetUrl(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), finalType6, httpUrl);
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }else {
|
|
|
+ cameraVos.setCameraCode("");
|
|
|
+ cameraVos.setCurrentStream("");
|
|
|
+ }
|
|
|
List<CameraVos> cameraVosList = new ArrayList<>();
|
|
|
cameraVosList.add(cameraVos);
|
|
|
respHeartbeatVo.setCameraList(cameraVosList);
|
|
|
respHeartbeatVo.setIsAlarm(1);
|
|
|
preAlarmListResponse.setCameraCode("");
|
|
|
preAlarmListResponse.setCameraStream("");
|
|
|
- boolean finalType6 = type;
|
|
|
- CompletableFuture.runAsync(() -> {
|
|
|
- String playFlv = cameraUtil.heartbeatgetPlayFlv(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), finalType6);
|
|
|
- if (StringUtils.isEmpty(playFlv)) {
|
|
|
- try {
|
|
|
- cameraUtil.heartbeatgetUrl(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), finalType6, httpUrl);
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
} else {
|
|
|
preAlarmListResponse.setCameraCode("");
|
|
|
preAlarmListResponse.setCameraStream("");
|
|
@@ -1245,25 +1245,30 @@ public class GeoHazardMonitorTokenController {
|
|
|
base.last("limit 1");
|
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
|
|
|
CameraVos cameraVos = new CameraVos();
|
|
|
- cameraVos.setCameraCode(list1.get(0).getCameraCode());
|
|
|
- cameraVos.setCurrentStream(cameraUtil.getPlayFlvRtsp(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), type, httpUrl));
|
|
|
+ if (!ObjectUtils.isEmpty(list1)) {
|
|
|
+ cameraVos.setCameraCode(list1.get(0).getCameraCode());
|
|
|
+ cameraVos.setCurrentStream(cameraUtil.getPlayFlvRtsp(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), type, httpUrl));
|
|
|
+ boolean finalType6 = type;
|
|
|
+ CompletableFuture.runAsync(() -> {
|
|
|
+ String playFlv = cameraUtil.heartbeatgetPlayFlv(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), finalType6);
|
|
|
+ if (StringUtils.isEmpty(playFlv)) {
|
|
|
+ try {
|
|
|
+ cameraUtil.heartbeatgetUrl(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), finalType6, httpUrl);
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }else {
|
|
|
+ cameraVos.setCameraCode("");
|
|
|
+ cameraVos.setCurrentStream("");
|
|
|
+ }
|
|
|
List<CameraVos> cameraVosList = new ArrayList<>();
|
|
|
cameraVosList.add(cameraVos);
|
|
|
respHeartbeatVo.setCameraList(cameraVosList);
|
|
|
respHeartbeatVo.setIsAlarm(1);
|
|
|
preAlarmListResponse.setCameraCode("");
|
|
|
preAlarmListResponse.setCameraStream("");
|
|
|
- boolean finalType6 = type;
|
|
|
- CompletableFuture.runAsync(() -> {
|
|
|
- String playFlv = cameraUtil.heartbeatgetPlayFlv(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), finalType6);
|
|
|
- if (StringUtils.isEmpty(playFlv)) {
|
|
|
- try {
|
|
|
- cameraUtil.heartbeatgetUrl(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), finalType6, httpUrl);
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
} else {
|
|
|
preAlarmListResponse.setCameraCode("");
|
|
|
preAlarmListResponse.setCameraStream("");
|