稳压泵信息添加排序字段

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java

@@ -796,7 +796,9 @@ public class SupervisionConfigureController extends AbstractBaseController {
                                                @RequestParam(value = "startTime", required = false) String startTime,
                                                @RequestParam(value = "endTime", required = false) String endTime,
                                                @RequestParam(value = "pageNum") String pageNum,
-                                               @RequestParam(value = "pageSize") String pageSize) {
+                                               @RequestParam(value = "pageSize") String pageSize,
+                                               @RequestParam(value = "timeSort",  required = false) String timeSort,
+                                               @RequestParam(value = "stateSort", required = false) String stateSort) {
 
         if (ObjectUtils.isEmpty(bizOrgCode)) {
             ReginParams reginParams = getSelectedOrgInfo();
@@ -808,7 +810,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
                 }
             }
         }
-        Map<String, Object> list = supervisionVideoService.getPressurePumpPage(bizOrgCode, id, startTime, endTime, pageNum, pageSize);
+        Map<String, Object> list = supervisionVideoService.getPressurePumpPage(bizOrgCode, id, startTime, endTime, pageNum, pageSize, timeSort, stateSort);
         return CommonResponseUtil.success(list);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/ISupervisionVideoService.java

@@ -26,7 +26,7 @@ public interface ISupervisionVideoService extends IService<SupervisionVideo> {
 
     List<Map<String, Object>> selectPressureDetails(String bizOrgCode, String id, String startTime, String endTime);
 
-    Map<String, Object> getPressurePumpPage(String bizOrgCode, String id, String startTime, String endTime, String pageNum, String pageSize);
+    Map<String, Object> getPressurePumpPage(String bizOrgCode, String id, String startTime, String endTime, String pageNum, String pageSize, String timeSort, String stateSort);
 
     List<Map<String, Object>> selectAllPressureName(String bizOrgCode);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/SupervisionVideoServiceImpl.java

@@ -314,7 +314,7 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
     }
 
     @Override
-    public Map<String, Object> getPressurePumpPage(String bizOrgCode, String id, String startTime, String endTime, String pageNum, String pageSize) {
+    public Map<String, Object> getPressurePumpPage(String bizOrgCode, String id, String startTime, String endTime, String pageNum, String pageSize, String timeSort, String stateSort) {
         List<Map<String, Object>> pressurePumpInfo = fireFightingSystemMapper.selectAllPressurePumpInfoByBizOrgCode(bizOrgCode, id);
         List<Map<String, String>> resList = new ArrayList<>();
         List<Map<String, String>> finalResList = resList;
@@ -361,6 +361,18 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
         } else {
             resList = finalResList.stream().sorted((t1, t2) -> t2.get("time").compareTo(t1.get("time"))).collect(Collectors.toList());
         }
+        if (StringUtils.isNotEmpty(timeSort)) {
+            if ("0".equals(timeSort)) {
+                resList = finalResList.stream().sorted(Comparator.comparing(t -> t.get("time"))).collect(Collectors.toList());
+            }
+        }
+        if (StringUtils.isNotEmpty(stateSort)) {
+            if ("1".equals(stateSort)) {
+                resList = resList.stream().sorted((t1, t2) -> t2.get("value").compareTo(t1.get("value"))).collect(Collectors.toList());
+            } else {
+                resList = resList.stream().sorted(Comparator.comparing(t -> t.get("value"))).collect(Collectors.toList());
+            }
+        }
         int startIndex = (Integer.valueOf(pageNum) - 1) * Integer.valueOf(pageSize);
         int endIndex = Math.min(startIndex + Integer.valueOf(pageSize), resList.size());
         int pages = (finalResList.size() + Integer.valueOf(pageSize) - 1) / Integer.valueOf(pageSize);