feat(清退模块): 已清退查询统计接口更新

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/ModelNameGroup.java

@@ -24,14 +24,21 @@ public class ModelNameGroup {
      */
     private String model;
 
+
     /**
-     * 类型
+     * 名称
      */
     private String name;
 
+
+    /**
+     * 形态
+     */
+    private String type;
+
     /**
      * 装备id集合
      */
-    private List<Integer> ids;
+    private List<Integer> devicesId;
 
 }

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/PagingVo.java

@@ -23,6 +23,8 @@ public class PagingVo {
 
     private List<DeviceLibrary> data;
 
+    private List<ModelNameGroup> modelNameGroups;
+
     private Set<String> models;
 
     private Set<String> names;

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java

@@ -284,15 +284,15 @@ public class RepelQueryServiceImpl implements RepelQueryService {
         deviceLibraries.forEach(
                 deviceLibrary -> {
                     List<Integer> ids=new ArrayList<>();
-                    String key=deviceLibrary.getModel()+deviceLibrary.getName();
+                    String key=deviceLibrary.getModel()+deviceLibrary.getName()+deviceLibrary.getTypeName();
                     if (!modelNameGroupMap.containsKey(key)){
                         ids.add(deviceLibrary.getId());
-                        modelNameGroupMap.put(key,new ModelNameGroup(deviceLibrary.getModel(),deviceLibrary.getName(),ids));
+                        modelNameGroupMap.put(key,new ModelNameGroup(deviceLibrary.getModel(),deviceLibrary.getName(),deviceLibrary.getTypeName(),ids));
                     }else {
                         ModelNameGroup modelNameGroup=modelNameGroupMap.get(key);
-                        ids=modelNameGroupMap.get(key).getIds();
+                        ids=modelNameGroupMap.get(key).getDevicesId() ;
                         ids.add(deviceLibrary.getId());
-                        modelNameGroup.setIds(ids);
+                        modelNameGroup.setDevicesId(ids);
                         modelNameGroupMap.put(key,modelNameGroup);
                     }
                 }
@@ -552,15 +552,17 @@ public class RepelQueryServiceImpl implements RepelQueryService {
         List<Integer> ids= repelDetailService.findYearAndUnitToDeviceList(new Date(repelManagementVo.getTime()),new Date(repelManagementVo.getEndTime()),repelManagementVo.getUnitId());
         if (ids!=null&&ids.size()!=0) {
             predicateBuilder.in("id", ids.toArray());
-            deviceLibraries = deviceLibraryDao.findAll(predicateBuilder.build());
+            deviceLibraries = deviceLibraryDao.findAll(predicateBuilder.build()).stream().map(DeviceLibrary::setConfigName).collect(Collectors.toList());
         }
-        Page<DeviceLibrary> page = PageUtil.getPerPage(repelManagementVo.getPage(), repelManagementVo.getSize(), deviceLibraries, repelManagementVo.getPageable());
+
+        List<ModelNameGroup> modelNameGroups = toModelNameGroup(deviceLibraries);
+        Page<ModelNameGroup> page = PageUtil.getPerPage(repelManagementVo.getPage(), repelManagementVo.getSize(), modelNameGroups, repelManagementVo.getPageable());
 
         return PagingVo.builder()
-                .data(page.getContent().stream().map(DeviceLibrary::setConfigName).collect(Collectors.toList())).page(repelManagementVo.getPage())
+                .modelNameGroups(page.getContent()).page(repelManagementVo.getPage())
                 .size(repelManagementVo.getSize()).total((int)page.getTotalElements())
-                .models(deviceLibraries.stream().map(DeviceLibrary::getModel).collect(Collectors.toSet()))
-                .names(deviceLibraries.stream().map(DeviceLibrary::getName).collect(Collectors.toSet()))
+                .models(modelNameGroups.stream().map(ModelNameGroup::getModel).collect(Collectors.toSet()))
+                .names(modelNameGroups.stream().map(ModelNameGroup::getName).collect(Collectors.toSet()))
                 .build();
     }