相机导出修改

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

@@ -31,7 +31,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Builder
 @ApiModel("相机台账管理表")
-public class BaseCameraManagement extends BaseEntity implements Serializable {
+public class BaseCameraManagement extends BaseEntity implements Serializable,Comparable<BaseCameraManagement> {
 
     private static final long serialVersionUID = 1L;
 
@@ -208,4 +208,10 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     
     @Excel(name = "备注")
     private String remark;
+
+    @Override
+    public int compareTo(BaseCameraManagement o) {
+        int i =o.getRailwayName().compareTo(o.railwayName);
+        return i;
+    }
 }

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

@@ -578,6 +578,22 @@ public class BaseCameraManagementController extends BaseController {
             baseCameraManagementVo.setEndMile(baseCameraManagementVo.getEndMile() * 1000);
         }
         List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.baseCameraManagementList(baseCameraManagementVo);
+
+        baseCameraManagementList.sort(new Comparator<BaseCameraManagement>() {
+            @Override
+            public int compare(BaseCameraManagement o1, BaseCameraManagement o2) {
+                String name1 = ChineseToPingyin.convertHanziToPinyin(o1.getRailwayName());
+                String substring1 = name1.substring(0, 1);
+                String name2 = ChineseToPingyin.convertHanziToPinyin(o2.getRailwayName());
+                String substring2 = name2.substring(0, 1);
+                int i = substring1.compareTo(substring2);
+                if (i == 0) {
+                    return o1.getInstallMile() - o2.getInstallMile();
+                }
+                return i;
+            }
+        });
+       
         for (BaseCameraManagement baseCameraManagement : baseCameraManagementList) {
             SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
             baseCameraManagement.setDeptName(sysDept.getDeptName());