相机树修改

business-service/src/main/java/com/ozs/service/service/impl/BaseDeviceDynamicManagementServiceImpl.java

@@ -59,6 +59,19 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                     cameraTree.getChildren().add(build);
                     map.put(o.getRailwayCode(), build);
                 }
+               //工务段
+                CameraTree build3 = CameraTree.builder()
+                        .code(o.getRailwayCode())
+                        .name(o.getRailwayName())
+                        .flay(true)
+                        .publicWorksSection(o.getPublicWorksSection())
+                        .children(new ArrayList<>())
+                        .build();
+                if (!ObjectUtils.isEmpty(map.get(o.getRailwayCode()))) {
+                    map.put(o.getRailwayCode()+"-"+o.getPublicWorksSection(), build3);
+                    map.get(o.getRailwayCode()).getChildren().add(build3);
+                }
+
                 // 里程
                 String mils = AppendUtils.stringAppend(o.getInstallMile());
                 CameraTree build1 = CameraTree.builder()
@@ -69,11 +82,11 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                         .mileage(o.getInstallMile())
                         .children(new ArrayList<>())
                         .build();
-                if (!ObjectUtils.isEmpty(map.get(o.getRailwayCode()))) {
-                    CameraTree cameraTree1 = map.get(o.getRailwayCode()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"));
+                if (!ObjectUtils.isEmpty(map.get(o.getRailwayCode()+"-"+o.getPublicWorksSection()))) {
+                    CameraTree cameraTree1 = map.get(o.getRailwayCode()+"-"+o.getPublicWorksSection()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"));
                     if (ObjectUtils.isEmpty(cameraTree1)) {
-                        map.put(o.getRailwayCode()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"), build1);
-                        map.get(o.getRailwayCode()).getChildren().add(build1);
+                        map.put(o.getRailwayCode()+"-"+o.getPublicWorksSection()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"), build1);
+                        map.get(o.getRailwayCode()+"-"+o.getPublicWorksSection()).getChildren().add(build1);
                     }
                 }
                 // 摄像头
@@ -84,8 +97,8 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                         .publicWorksSection(o.getPublicWorksSection())
                         .children(new ArrayList<>())
                         .build();
-                if (!ObjectUtils.isEmpty(map.get(o.getRailwayCode()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")))) {
-                    map.get(o.getRailwayCode()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")).getChildren().add(build2);
+                if (!ObjectUtils.isEmpty(map.get(o.getRailwayCode()+"-"+o.getPublicWorksSection()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")))) {
+                    map.get(o.getRailwayCode()+"-"+o.getPublicWorksSection()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")).getChildren().add(build2);
                 }
             }
         }

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -743,30 +743,33 @@ public class BaseCameraManagementController extends BaseController {
         });
         for (CameraTree child : children) {
             List<CameraTree> children1 = child.getChildren();
-            children1.sort(new Comparator<CameraTree>() {
-                @Override
-                public int compare(CameraTree o1, CameraTree o2) {
-                    int i = o1.getMileage() - o2.getMileage();
-                    if (i == 0) {
-                        String[] split = o1.getName().split("-");
-                        return "上行".equals(split[1]) ? -1 : 1;
-                    } else {
-                        return i;
+            for (CameraTree tree3 : children1) {
+                List<CameraTree> cameraTreeList = tree3.getChildren();
+                cameraTreeList.sort(new Comparator<CameraTree>() {
+                    @Override
+                    public int compare(CameraTree o1, CameraTree o2) {
+                        int i = o1.getMileage() - o2.getMileage();
+                        if (i == 0) {
+                            String[] split = o1.getName().split("-");
+                            return "上行".equals(split[1]) ? -1 : 1;
+                        } else {
+                            return i;
+                        }
                     }
-                }
-            });
-            for (CameraTree tree : children1) {
-                List<CameraTree> children2 = tree.getChildren();
-                if (children2.size() < 2) {
-                    String code = children2.get(0).getCode();
-                    tree.setCode(code);
-                    children2.remove(0);
-                } else {
-                    for (CameraTree cameraTree1 : children2) {
-                        count = count + 1;
-                        cameraTree1.setName("相机" + count);
+                });
+                for (CameraTree tree : cameraTreeList) {
+                    List<CameraTree> children2 = tree.getChildren();
+                    if (children2.size() < 2) {
+                        String code = children2.get(0).getCode();
+                        tree.setCode(code);
+                        children2.remove(0);
+                    } else {
+                        for (CameraTree cameraTree1 : children2) {
+                            count = count + 1;
+                            cameraTree1.setName("相机" + count);
+                        }
+                        count = 0;
                     }
-                    count = 0;
                 }
             }
         }

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -736,6 +736,15 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         }
     }
 
+    /**
+     * 旧的视频回放的接口
+     * @param channel
+     * @param startTm
+     * @param endTm
+     * @param mappingUrl
+     * @param wUrl
+     * @return
+     */
     public static List<Map<String, Object>> filterRecordList(String channel,
                                                              Date startTm,
                                                              Date endTm,