第三方报警回放接口修改

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

@@ -683,21 +683,21 @@ public class GeoHazardMonitorTokenController {
                         List<AlarmListVo> listVos = new ArrayList<>();
                         if (baseCameraManagementList.size() > 0) {
                             int minDifference = Integer.MAX_VALUE;
-                            String code=null;
-                            String channel=null;
+                            String code = null;
+                            String channel = null;
                             for (BaseCameraManagement baseCameraManagement : baseCameraManagementList) {
-                                log.info("------------baseCameraManagement.getInstallMile()-------"+baseCameraManagement.getInstallMile());
-                                log.info("------------list.get(0).getAlarmMile()-------"+list.get(0).getAlarmMile());
+                                log.info("------------baseCameraManagement.getInstallMile()-------" + baseCameraManagement.getInstallMile());
+                                log.info("------------list.get(0).getAlarmMile()-------" + list.get(0).getAlarmMile());
                                 int difference = Math.abs(baseCameraManagement.getInstallMile() - list.get(0).getAlarmMile());
-                                log.info("------------difference-------"+difference);
-                                log.info("------------minDifference-------"+minDifference);
+                                log.info("------------difference-------" + difference);
+                                log.info("------------minDifference-------" + minDifference);
                                 if (difference < minDifference) {
                                     minDifference = difference;
-                                    log.info("------------minDifference变更-------"+minDifference);
+                                    log.info("------------minDifference变更-------" + minDifference);
                                     code = baseCameraManagement.getCameraCode();
-                                    log.info("------------code-------"+code);
+                                    log.info("------------code-------" + code);
                                     channel = baseCameraManagement.getChannel();
-                                    log.info("------------channel-------"+channel);
+                                    log.info("------------channel-------" + channel);
                                 }
                             }
                             String playFlv1;
@@ -979,14 +979,14 @@ public class GeoHazardMonitorTokenController {
                         //            String[] parts = str.split("/");
                         //            log.info("--------------parts--------------:" + parts);
                         //            if (parts.length == 2) {
-                                        CompletableFuture.runAsync(() -> {
-                                            try {
-                                                TimeUnit.SECONDS.sleep(3);
-                                            } catch (InterruptedException e) {
-                                                e.printStackTrace();
-                                            }
-                                            cameraUtil.heartbeatGetPlayFlv();
-                                        });
+                        CompletableFuture.runAsync(() -> {
+                            try {
+                                TimeUnit.SECONDS.sleep(3);
+                            } catch (InterruptedException e) {
+                                e.printStackTrace();
+                            }
+                            cameraUtil.heartbeatGetPlayFlv();
+                        });
                         //            }
                         //        }
                         //    }
@@ -1192,7 +1192,7 @@ public class GeoHazardMonitorTokenController {
                         ArrayList<String> list3 = new ArrayList<>();
                         //添加缓存
                         for (BaseCameraManagement baseCameraManagement : list1) {
-                            String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel()+"/h264_720";
+                            String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel() + "/h264_720";
                             list3.add(code);
                         }
                         log.info("--------------heartbeat--------------:" + list3);
@@ -1266,7 +1266,7 @@ public class GeoHazardMonitorTokenController {
                         ArrayList<String> list3 = new ArrayList<>();
                         //添加缓存
                         for (BaseCameraManagement baseCameraManagement : list1) {
-                            String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel()+"/h264_720";
+                            String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel() + "/h264_720";
                             list3.add(code);
                         }
                         log.info("--------------heartbeat--------------:" + list3);
@@ -1785,35 +1785,33 @@ public class GeoHazardMonitorTokenController {
                 jsonObject.put("data", "没有该报警唯一UUID的报警数据");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
             } else {
-                if (ObjectUtils.isEmpty(one.getReleasedUrl())) {
-                    //获取报警里程所监控的所有相机
-                    LambdaQueryWrapper<BaseCameraManagement> camera = new LambdaQueryWrapper<BaseCameraManagement>();
-                    if (one.getLineDir() == 1) {
-                        camera.le(BaseCameraManagement::getBeginMile, one.getAlarmMile());
-                        camera.ge(BaseCameraManagement::getEndMile, one.getAlarmMile());
-                        camera.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
-                        camera.orderByAsc(BaseCameraManagement::getInstallMile);
-                        camera.eq(BaseCameraManagement::getEnableOrNot, 1);
-                    } else if (one.getLineDir() == 2) {
-                        camera.le(BaseCameraManagement::getBeginMile, one.getAlarmMile());
-                        camera.ge(BaseCameraManagement::getEndMile, one.getAlarmMile());
-                        camera.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
-                        camera.orderByDesc(BaseCameraManagement::getInstallMile);
-                        camera.eq(BaseCameraManagement::getEnableOrNot, 1);
-                    }
-                    List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
-                    if (baseCameraManagementList.size() > 0) {
-                        BaseCameraManagement baseCameraManagement = baseCameraManagementList.get(0);
-                        log.info("---------获取报警回放-------------");
-                        String url = cameraUtil.streamConversion(baseCameraManagement.getCameraCode());
-                        one.setReleasedUrl(url);
-                        msgAlarmService.updateById(one);
-                    } else {
-                        jsonObject.put("resultCode", 0);
-                        jsonObject.put("message", "失败");
-                        jsonObject.put("data", "没有该报警里程位置的相机");
-                        return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
-                    }
+                //获取报警里程所监控的所有相机
+                LambdaQueryWrapper<BaseCameraManagement> camera = new LambdaQueryWrapper<BaseCameraManagement>();
+                if (one.getLineDir() == 1) {
+                    camera.le(BaseCameraManagement::getBeginMile, one.getAlarmMile());
+                    camera.ge(BaseCameraManagement::getEndMile, one.getAlarmMile());
+                    camera.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
+                    camera.orderByAsc(BaseCameraManagement::getInstallMile);
+                    camera.eq(BaseCameraManagement::getEnableOrNot, 1);
+                } else if (one.getLineDir() == 2) {
+                    camera.le(BaseCameraManagement::getBeginMile, one.getAlarmMile());
+                    camera.ge(BaseCameraManagement::getEndMile, one.getAlarmMile());
+                    camera.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
+                    camera.orderByDesc(BaseCameraManagement::getInstallMile);
+                    camera.eq(BaseCameraManagement::getEnableOrNot, 1);
+                }
+                List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
+                if (baseCameraManagementList.size() > 0) {
+                    BaseCameraManagement baseCameraManagement = baseCameraManagementList.get(0);
+                    log.info("---------获取报警回放-------------");
+                    String url = cameraUtil.streamConversion(baseCameraManagement.getCameraCode());
+                    one.setReleasedUrl(url);
+                    msgAlarmService.updateById(one);
+                } else {
+                    jsonObject.put("resultCode", 0);
+                    jsonObject.put("message", "失败");
+                    jsonObject.put("data", "没有该报警里程位置的相机");
+                    return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
                 }
             }
             map.put("url", one.getReleasedUrl());