相机导出修改

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,Comparable<BaseCameraManagement> {
+public class BaseCameraManagement extends BaseEntity implements Serializable ,Comparable<BaseCameraManagement>{
 
     private static final long serialVersionUID = 1L;
 

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

@@ -29,7 +29,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Builder
 @ApiModel("线路管理表")
-public class BaseRailwayManagement extends BaseEntity implements Serializable {
+public class BaseRailwayManagement extends BaseEntity implements Serializable ,Comparable<BaseRailwayManagement>{
 
     private static final long serialVersionUID = 1L;
 
@@ -73,4 +73,10 @@ public class BaseRailwayManagement extends BaseEntity implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
+
+    @Override
+    public int compareTo(BaseRailwayManagement o) {
+        int i =o.getRailwayName().compareTo(o.railwayName);
+        return i;
+    }
 }

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

@@ -578,22 +578,6 @@ 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());
@@ -614,6 +598,20 @@ public class BaseCameraManagementController extends BaseController {
                 baseCameraManagement.setBeginMiles(begin);
             }
         }
+        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;
+            }
+        });
         ExcelUtil<BaseCameraManagement> util = new ExcelUtil<>(BaseCameraManagement.class);
         util.exportExcel(response, baseCameraManagementList, "台账管理相机数据");
     }

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

@@ -11,6 +11,7 @@ import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysDictData;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.AppendUtils;
+import com.ozs.common.utils.ChineseToPingyin;
 import com.ozs.common.utils.IdempotenceUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
@@ -40,6 +41,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -299,7 +301,18 @@ public class BaseRailwayManagementController extends BaseController {
     @GetMapping("/query")
     @Log(title = "线路台账管理", businessType = BusinessType.SELECT)
     public AjaxResult query() {
-        return AjaxResult.success(baseRailwayManagementService.list());
+        List<BaseRailwayManagement> list = baseRailwayManagementService.list();
+        list.sort(new Comparator<BaseRailwayManagement>() {
+            @Override
+            public int compare(BaseRailwayManagement o1, BaseRailwayManagement 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);
+                return substring1.compareTo(substring2);
+            }
+        });
+        return AjaxResult.success(list);
     }