feat: 车载设备新增过滤条件

guzijian
1 parent 36b0e040
Showing 3 changed files with 24 additions and 20 deletions
src/main/java/com/genersoft/iot/vmp/vehicle/controller/VehicleController.java
src/main/java/com/genersoft/iot/vmp/vehicle/service/VehicleDeviceService.java
src/main/java/com/genersoft/iot/vmp/vehicle/service/impl/VehicleDeviceServiceImpl.java
@@ -18,8 +18,9 @@ public class VehicleController {
     @GetMapping("/query")
-    public VehicleVo queryVehicleList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize) {
-        return vehicleDeviceService.queryVehicleList(pageNo,pageSize);
+    public VehicleVo queryVehicleList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam(value = "online",required = false) String online,@RequestParam(value = "filterOld",required = false) Boolean filterOld) {
+        return vehicleDeviceService.queryVehicleList(pageNo,pageSize,online, filterOld);
     }
@@ -2,10 +2,8 @@ package com.genersoft.iot.vmp.vehicle.service;
 import com.genersoft.iot.vmp.vehicle.pojo.vo.VehicleVo;
-import java.util.List;
-
 public interface VehicleDeviceService {
-    VehicleVo queryVehicleList(Integer pageNo, Integer pageSize);
+    VehicleVo queryVehicleList(Integer pageNo, Integer pageSize, String online, Boolean filterOld);
     String onPlay(String deviceId, String channel);
 }
 \ No newline at end of file
@@ -5,6 +5,7 @@ import com.genersoft.iot.vmp.utils.redis.RedisTool;
 import com.genersoft.iot.vmp.vehicle.pojo.response.VehicleNvrDeviceRes;
 import com.genersoft.iot.vmp.vehicle.pojo.vo.VehicleVo;
 import com.genersoft.iot.vmp.vehicle.service.VehicleDeviceService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpMethod;
@@ -12,11 +13,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
+import java.util.*;
 import java.util.stream.Collectors;
 @Service
@@ -26,22 +23,15 @@ public class VehicleDeviceServiceImpl implements VehicleDeviceService {
     private RedisTool redisTool;
     @Override
-    public VehicleVo queryVehicleList(Integer pageNo, Integer pageSize) {
-        String key = "vehicle";
+    public VehicleVo queryVehicleList(Integer pageNo, Integer pageSize, String online, Boolean filterOld) {
+//        String key = "vehicle";
         VehicleNvrDeviceRes nvrDeviceRes = getVehicleNvrDeviceRes();
 //        if (nvrDeviceRes == null) {
 //
 //            redisTool.setCacheObject(key, nvrDeviceRes,30, TimeUnit.MINUTES);
 //        }
         List<VehicleNvrDeviceRes.ResData> list = nvrDeviceRes.getData();
-        int total = list.size();
-        int remainder = total % pageSize;
-        int currentPage = pageNo > 0 ? (pageNo - 1) * pageSize : pageNo * pageSize;
-        // 怕页码超出界限了 超出界限就通过currenPage (3 * 10) > total (25) ? currentPage (20) - (pageSize (10) - remainder (3)) : currentPage
-        int startPage = currentPage > total ? currentPage - (pageSize - remainder) : currentPage;
-        int endPage = Math.min(startPage + pageSize, total);
-        List<VehicleNvrDeviceRes.ResData> resData = list.subList(startPage, endPage);
-        for (VehicleNvrDeviceRes.ResData data : resData) {
+        for (VehicleNvrDeviceRes.ResData data : list) {
             // 模糊匹配
             if (data.getInsideCode().contains("离线")) {
                 data.setStatus("离线");
@@ -54,6 +44,21 @@ public class VehicleDeviceServiceImpl implements VehicleDeviceService {
                 data.setOldDevice(false);
             }
         }
+        if (StringUtils.isNotEmpty(online)) {
+            list = list.stream().filter(item->!item.getStatus().equals(online)).collect(Collectors.toList());
+        }
+        if (filterOld != null) {
+            list = list.stream().filter(item->item.getOldDevice().equals(filterOld)).collect(Collectors.toList());
+        }
+        int total = list.size();
+        int remainder = total % pageSize;
+        int currentPage = pageNo > 0 ? (pageNo - 1) * pageSize : pageNo * pageSize;
+        // 怕页码超出界限了 超出界限就通过currenPage (3 * 10) > total (25) ? currentPage (20) - (pageSize (10) - remainder (3)) : currentPage
+        int startPage = currentPage > total ? currentPage - (pageSize - remainder) : currentPage;
+        int endPage = Math.min(startPage + pageSize, total);
+        list.sort(Comparator.comparing(VehicleNvrDeviceRes.ResData::getOldDevice));
+        List<VehicleNvrDeviceRes.ResData> resData = list.subList(startPage, endPage);
+
         VehicleVo vo = new VehicleVo();
         vo.setList(resData);
         vo.setTotal(total);