代码修改

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

@@ -641,6 +641,8 @@ public class GeoHazardMonitorTokenController {
                     camera.le(BaseCameraManagement::getBeginMile, list.get(0).getAlarmMile());
                     camera.eq(BaseCameraManagement::getLineDir, heartbeatVo.getLineDir());
                     camera.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
+                    camera.eq(BaseCameraManagement::getOnline,2);
+                    camera.eq(BaseCameraManagement::getEnableOrNot,1);
                     camera.orderByAsc(BaseCameraManagement::getInstallMile);
                     List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
                     List<AlarmListVo> listVos = new ArrayList<>();
@@ -650,7 +652,8 @@ public class GeoHazardMonitorTokenController {
                         respHeartbeatVo.setCurrentStream(playFlv);
                         respHeartbeatVo.setIsAlarm(1);
                         respHeartbeatVo.setCameraCode(baseCameraManagementList.get(0).getCameraCode());
-                        twoMap.put("currentStream", playFlv);
+//                        twoMap.put("currentStream", playFlv);
+                        twoMap.put("currentStream", baseCameraManagementList.get(0).getRtspUrl());
                         twoMap.put("cameraCode", baseCameraManagementList.get(0).getCameraCode());
                         //alarmInfo对象
                         AlarmInfoVo alarmInfoVo = new AlarmInfoVo();
@@ -692,6 +695,8 @@ public class GeoHazardMonitorTokenController {
                         ment.le(BaseCameraManagement::getBeginMile, list.get(i).getAlarmMile());
                         ment.eq(BaseCameraManagement::getLineDir, heartbeatVo.getLineDir());
                         ment.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
+                        camera.eq(BaseCameraManagement::getOnline,2);
+                        camera.eq(BaseCameraManagement::getEnableOrNot,1);
                         ment.orderByAsc(BaseCameraManagement::getInstallMile);
                         if (i == 0) {
                             ment.last("limit 1,1000000");
@@ -703,7 +708,8 @@ public class GeoHazardMonitorTokenController {
                                 String flv = CameraUtil.getPlayFlvRtsp(baseList.get(o).getCameraCode(), baseList.get(o).getChannel(), false);
                                 AlarmListVo alarmListVo = new AlarmListVo();
                                 //alarmList对象
-                                alarmListVo.setCameraStream(flv);
+//                                alarmListVo.setCameraStream(flv);
+                                alarmListVo.setCameraStream(baseList.get(o).getRtspUrl());
                                 alarmListVo.setCameraCode(baseList.get(o).getCameraCode());
                                 //alarmInfo对象
                                 AlarmInfoVo alarmInfoVo1 = new AlarmInfoVo();
@@ -745,6 +751,8 @@ public class GeoHazardMonitorTokenController {
                     base.eq(BaseCameraManagement::getLineDir, heartbeatVo.getLineDir());
                     base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
                     base.orderByAsc(BaseCameraManagement::getInstallMile);
+                    base.eq(BaseCameraManagement::getOnline,2);
+                    base.eq(BaseCameraManagement::getEnableOrNot,1);
                     base.last("limit 4");
                     List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
                     if (list1.size() <= 0) {
@@ -755,13 +763,14 @@ public class GeoHazardMonitorTokenController {
                     }
                     CameraUtil.invite(list1.get(0).getCameraCode(), list1.get(0).getChannel());
                     String flv = CameraUtil.getPlayFlvRtsp(list1.get(0).getCameraCode(), list1.get(0).getChannel(), false);
-                    twoMap.put("currentStream", flv);
+//                    twoMap.put("currentStream", flv);
+                    twoMap.put("currentStream", list1.get(0).getRtspUrl());
                     twoMap.put("cameraCode", list1.get(0).getCameraCode());
                     for (BaseCameraManagement baseCameraManagement : list1) {
                         String flv1 = CameraUtil.getPlayFlvRtsp(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), false);
                         CameraUtil.invite(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
                     }
-                    respHeartbeatVo.setCurrentStream(flv);
+                    respHeartbeatVo.setCurrentStream(list1.get(0).getRtspUrl());
                     respHeartbeatVo.setIsAlarm(2);
                     respHeartbeatVo.setCameraCode(list1.get(0).getCameraCode());
                     respHeartbeatVo.setAlarmList(null);
@@ -891,6 +900,8 @@ public class GeoHazardMonitorTokenController {
             if (!ObjectUtils.isEmpty(cameraVo.getLineDir())) {
                 wrapper.eq(BaseCameraManagement::getLineDir, cameraVo.getLineDir());
             }
+            wrapper.eq(BaseCameraManagement::getOnline,2);
+            wrapper.eq(BaseCameraManagement::getEnableOrNot,1);
             wrapper.orderByAsc(BaseCameraManagement::getInstallMile);
             List<BaseCameraManagement> list = baseCameraManagementService.list(wrapper);
             if (list.size() <= 0) {
@@ -981,15 +992,18 @@ public class GeoHazardMonitorTokenController {
             }
             LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
             lw.eq(BaseCameraManagement::getCameraCode, cameraPlayVo.getCameraCode());
+            lw.eq(BaseCameraManagement::getOnline,2);
+            lw.eq(BaseCameraManagement::getEnableOrNot,1);
             BaseCameraManagement one = baseCameraManagementService.getOne(lw);
             if (ObjectUtils.isEmpty(one)) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
-                jsonObject.put("data", "没有该相机编码的相机");
+                jsonObject.put("data", "没有该相机编码的相机或已离线");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
             }
             String flv = CameraUtil.getPlayFlvRtsp(one.getCameraCode(), one.getChannel(), false);
-            map.put("url", flv);
+//            map.put("url", flv);
+            map.put("url",one.getRtspUrl());
             jsonObject.put("resultCode", 1);
             jsonObject.put("message", "ok");
             jsonObject.put("data", map);
@@ -1129,25 +1143,28 @@ public class GeoHazardMonitorTokenController {
                     camera.ge(BaseCameraManagement::getEndMile, one.getAlarmMile());
                     camera.eq(BaseCameraManagement::getLineDir, one.getLineDir());
                     camera.orderByAsc(BaseCameraManagement::getInstallMile);
+                    camera.eq(BaseCameraManagement::getOnline,2);
+                    camera.eq(BaseCameraManagement::getEnableOrNot,1);
                     List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
                     if (baseCameraManagementList.size() > 0) {
                         BaseCameraManagement baseCameraManagement = baseCameraManagementList.get(0);
-                        long time = one.getAlarmTime().getTime();
-                        long time2 = time - 600000L;
-                        one.setAlarmTime(new Date(time2));
-                        String url = null;
-                        if ("1".equals(one.getIsRelease().toString())) {
-                            url = CameraUtil.historyPlayListStr(baseCameraManagement.getChannel(),
-                                    one.getAlarmTime(),
-                                    one.getReleasedTime(),
-                                    true);
-                        } else {
-                            url = CameraUtil.historyPlayListStr(baseCameraManagement.getChannel(),
-                                    one.getAlarmTime(),
-                                    new Date(),
-                                    false);
-                        }
-                        one.setReleasedUrl(url);
+//                        long time = one.getAlarmTime().getTime();
+//                        long time2 = time - 600000L;
+//                        one.setAlarmTime(new Date(time2));
+//                        String url = null;
+//                        if ("1".equals(one.getIsRelease().toString())) {
+//                            url = CameraUtil.historyPlayListStr(baseCameraManagement.getChannel(),
+//                                    one.getAlarmTime(),
+//                                    one.getReleasedTime(),
+//                                    true);
+//                        } else {
+//                            url = CameraUtil.historyPlayListStr(baseCameraManagement.getChannel(),
+//                                    one.getAlarmTime(),
+//                                    new Date(),
+//                                    false);
+//                        }
+//                        one.setReleasedUrl(url);
+                        one.setReleasedUrl(baseCameraManagement.getRtspUrl());
                         msgAlarmService.updateById(one);
                     } else {
                         jsonObject.put("resultCode", 0);