相机输 添加所属工务段字段

business-service/src/main/java/com/ozs/service/entity/CameraTree.java

@@ -1,5 +1,6 @@
 package com.ozs.service.entity;
 
+import com.ozs.common.annotation.Excel;
 import lombok.Builder;
 import lombok.Data;
 import sun.reflect.generics.tree.Tree;
@@ -19,6 +20,11 @@ public class CameraTree implements Serializable,Comparable<CameraTree> {
     String name;
     boolean flay;
     Integer mileage;
+    /**
+     * 所属工务段
+     */
+    @Excel(name = "所属工务段")
+    private String publicWorksSection;
     List<CameraTree> children;
 
     @Override

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

@@ -49,9 +49,9 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                         .code(o.getRailwayCode())
                         .name(o.getRailwayName())
                         .flay(true)
+                        .publicWorksSection(o.getPublicWorksSection())
                         .children(new ArrayList<>())
                         .build();
-
                 if (!cameraTree.getChildren().stream()
                         .map(CameraTree::getCode)
                         .collect(Collectors.toList())
@@ -59,18 +59,16 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                     cameraTree.getChildren().add(build);
                     map.put(o.getRailwayCode(), build);
                 }
-
                 // 里程
                 String mils = AppendUtils.stringAppend(o.getInstallMile());
                 CameraTree build1 = CameraTree.builder()
                         .code(mils + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"))
                         .name(mils + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"))
                         .flay(true)
+                        .publicWorksSection(o.getPublicWorksSection())
                         .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(cameraTree1)) {
@@ -78,23 +76,19 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                         map.get(o.getRailwayCode()).getChildren().add(build1);
                     }
                 }
-
                 // 摄像头
                 CameraTree build2 = CameraTree.builder()
                         .code(o.getCameraCode())
                         .name(o.getCameraCode())
                         .flay(true)
+                        .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);
                 }
             }
         }
-
-
         return cameraTree;
     }
 }

business-service/src/main/resources/mapper/service/BaseDeviceDynamicManagementMapper.xml

@@ -9,10 +9,12 @@
 			a.camera_code AS cameraCode, 
 			a.line_dir AS lineDir, 
 			a.install_mile AS installMile, 
-			a.id AS id
-		FROM
-		    base_camera_management AS a inner join
-		    base_railway_management AS l on a.railway_code = l.railway_code
+			a.id AS id,
+			a.dept_id,
+			d.dept_name as publicWorksSection
+		FROM base_camera_management AS a
+		    inner join sys_dept as d on a.dept_id = d.dept_id
+		    inner join base_railway_management AS l on a.railway_code = l.railway_code
 		<where>
 			<if test="railwayCode != null and railwayCode !=''">
 				and concat(l.railway_name,a.camera_code,a.railway_code) like concat("%",#{railwayCode},"%")

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

@@ -759,8 +759,6 @@ public class BaseCameraManagementController extends BaseController {
                 return substring1.compareTo(substring2);
             }
         });
-
-
         for (CameraTree child : children) {
             List<CameraTree> children1 = child.getChildren();
             children1.sort(new Comparator<CameraTree>() {