线路台账线编号开发

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

@@ -214,6 +214,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable ,Co
     private String remark;
 
     @TableField(exist = false)
+    @Excel(name = "线路类型",readConverterExp = "1=高铁,2=普铁")
     private Integer railwayType;
 
     @TableField(exist = false)

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

@@ -20,6 +20,7 @@ public class CameraTree implements Serializable,Comparable<CameraTree> {
     String name;
     boolean flay;
     Integer mileage;
+    Integer number;
     /**
      * 所属工务段
      */

business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraManagementDto.java

@@ -53,5 +53,8 @@ public class BaseCameraManagementDto extends BaseEntity implements Serializable
      */
     @Excel(name = "线路编码")
     private String railwayCode;
+
+
+    private String lineNumber;
     
 }

business-service/src/main/java/com/ozs/service/entity/vo/DeviceStateResp.java

@@ -43,6 +43,8 @@ public class DeviceStateResp extends PageVo implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+    @Excel(name = "线路类型",readConverterExp = "1=高铁,2=普铁")
+    private Integer railwayType;
     private String railwayCode;
     private String deptId;
     /**

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

@@ -57,7 +57,8 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                 // 线路
                 CameraTree build = CameraTree.builder()
                         .code(o.getRailwayCode())
-                        .name(o.getRailwayName())
+                        .name(o.getLineNumber()+o.getRailwayName())
+                        .number(Integer.valueOf(o.getLineNumber()))
                         .flay(true)
                         .publicWorksSection(o.getPublicWorksSection())
                         .children(new ArrayList<>())
@@ -72,7 +73,8 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                //工务段
                 CameraTree build3 = CameraTree.builder()
                         .code(o.getRailwayCode())
-                        .name(o.getRailwayName())
+                        .name(o.getLineNumber()+o.getRailwayName())
+                        .number(Integer.valueOf(o.getLineNumber()))
                         .flay(true)
                         .publicWorksSection(o.getPublicWorksSection())
                         .children(new ArrayList<>())

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

@@ -126,6 +126,7 @@
         ca.install_mile AS installMile,
         ca.measure_point_name AS measurePointName,
         ra.railway_name AS railwayName,
+        ra.railway_type AS railwayType,
         de.dept_name AS deptName,
         CASE
         line_dir

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

@@ -11,6 +11,7 @@
 			a.install_mile AS installMile, 
 			a.id AS id,
 			a.dept_id,
+		    a.line_number AS lineNumber,
 			d.dept_name as publicWorksSection
 		FROM base_camera_management AS a
 		    inner join sys_dept as d on a.dept_id = d.dept_id

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

@@ -592,6 +592,7 @@ public class BaseCameraManagementController extends BaseController {
             }
             BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
             baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
+            baseCameraManagement.setRailwayType(baseRailwayManagement.getRailwayType());
             String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             baseCameraManagement.setInstallMiles(mils);
             if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())) {
@@ -757,11 +758,16 @@ public class BaseCameraManagementController extends BaseController {
         children.sort(new Comparator<CameraTree>() {
             @Override
             public int compare(CameraTree o1, CameraTree o2) {
-                String name1 = ChineseToPingyin.convertHanziToPinyin(o1.getName());
-                String substring1 = name1.substring(0, 1);
-                String name2 = ChineseToPingyin.convertHanziToPinyin(o2.getName());
-                String substring2 = name2.substring(0, 1);
-                return substring1.compareTo(substring2);
+                int mileageDiff  = o1.getNumber() - o2.getNumber();
+                if (mileageDiff == 0) {
+                    String name1 = ChineseToPingyin.convertHanziToPinyin(o1.getName());
+                    String substring1 = name1.substring(0, 1);
+                    String name2 = ChineseToPingyin.convertHanziToPinyin(o2.getName());
+                    String substring2 = name2.substring(0, 1);
+                    return substring1.compareTo(substring2);
+                }else {
+                    return mileageDiff;
+                }
             }
         });
         for (CameraTree child : children) {