|
|
@@ -632,7 +632,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
List<AlarmListVo> listVos = new ArrayList<>();
|
|
|
if (baseCameraManagementList.size() > 0) {
|
|
|
//判断流媒体是否有流
|
|
|
- String playFlv = cameraUtil.heartbeatgetPlayFlv(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel());
|
|
|
+ String playFlv = cameraUtil.heartbeatgetUrl(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel());
|
|
|
respHeartbeatVo.setCurrentStream(playFlv);
|
|
|
respHeartbeatVo.setIsAlarm(1);
|
|
|
respHeartbeatVo.setCameraCode(baseCameraManagementList.get(0).getCameraCode());
|
|
|
@@ -687,7 +687,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
if (baseList.size() > 0) {
|
|
|
for (int o = 0; o < baseList.size(); o++) {
|
|
|
//判断流媒体是否有流
|
|
|
- String playFlv = cameraUtil.heartbeatgetPlayFlv(baseList.get(o).getCameraCode(), baseList.get(o).getChannel());
|
|
|
+ String playFlv = cameraUtil.heartbeatgetUrl(baseList.get(o).getCameraCode(), baseList.get(o).getChannel());
|
|
|
AlarmListVo alarmListVo = new AlarmListVo();
|
|
|
//alarmList对象
|
|
|
alarmListVo.setCameraStream(playFlv);
|
|
|
@@ -749,7 +749,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
|
base.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
base.eq(BaseCameraManagement::getEnableOrNot, 1);
|
|
|
- base.last("limit 5");
|
|
|
+ base.last("limit 2");
|
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
|
|
|
if (list1.size() <= 0) {
|
|
|
jsonObject.put("resultCode", 0);
|
|
|
@@ -800,7 +800,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
|
base.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
base.eq(BaseCameraManagement::getEnableOrNot, 1);
|
|
|
- base.last("limit 5");
|
|
|
+ base.last("limit 2");
|
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
|
|
|
if (list1.size() <= 0) {
|
|
|
jsonObject.put("resultCode", 0);
|
gao.qiang