【清退提交】 直属单位相关代码

dev-sendback/src/main/java/com/tykj/dev/device/sendback/controller/RepelQueryController.java

@@ -2,6 +2,7 @@ package com.tykj.dev.device.sendback.controller;
 
 import com.tykj.dev.config.swagger.AutoDocument;
 import com.tykj.dev.device.sendback.entity.vo.DeviceIdLIstVo;
+import com.tykj.dev.device.sendback.entity.vo.ModelAndTypeVo;
 import com.tykj.dev.device.sendback.service.RepelQueryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -111,4 +112,15 @@ public class RepelQueryController {
     public ResponseEntity provinceDirectlyUnderSelectedDev( @PathVariable Integer taskId, @PathVariable Integer unitId){
         return ResponseEntity.ok(repelQueryService.provinceDirectlyUnderSelectedDev(taskId,unitId));
     }
+
+
+    /**
+     * 清退管理 选择装备列表的接口
+     */
+    @PostMapping(value ="/findRepelListModelNameGroup")
+    @ApiOperation(value = "清退管理 选择装备列表的接口", notes = "清退管理 选择装备列表的接口")
+    public ResponseEntity findRepelListModelNameGroup(@RequestBody ModelAndTypeVo modelAndTypeVo){
+        return ResponseEntity.ok(repelQueryService.findRepelListModelNameGroup(modelAndTypeVo));
+    }
+
 }

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

@@ -27,7 +27,7 @@ public class ModelNameGroup {
     /**
      * 类型
      */
-    private String name;
+    private Integer name;
 
     /**
      * 装备id集合

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

@@ -49,7 +49,7 @@ public interface RepelQueryService {
     /**
      * 待清退页面查询统计查询接口
      */
-    List<ModelNameGroup> findRepelListModelNameGroup(ModelAndTypeVo modelAndTypeVo);
+    List<DevRepelVo> findRepelListModelNameGroup(ModelAndTypeVo modelAndTypeVo);
 
     /**
      * 已清退列表

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

@@ -92,7 +92,6 @@ public class RepelQueryServiceImpl implements RepelQueryService {
 
     @Override
     public List<ModelNameGroup> toRepelList(Integer unitId) {
-        Map<String,ModelNameGroup> modelNameGroupMap=new HashMap<>();
         Units units=  unitsService.findById(unitId);
         return toModelNameGroup(deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15));
     }
@@ -105,7 +104,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
                     String key=deviceLibrary.getModel()+deviceLibrary.getName();
                     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.getType(),ids));
                     }else {
                         ModelNameGroup modelNameGroup=modelNameGroupMap.get(key);
                         ids=modelNameGroupMap.get(key).getIds();
@@ -119,28 +118,24 @@ public class RepelQueryServiceImpl implements RepelQueryService {
     }
 
     @Override
-    public List<ModelNameGroup> findRepelListModelNameGroup(ModelAndTypeVo modelAndTypeVo) {
-        Map<String,ModelNameGroup> modelNameGroupMap=new HashMap<>();
+    public List<DevRepelVo> findRepelListModelNameGroup(ModelAndTypeVo modelAndTypeVo) {
         Units units=  unitsService.findById(modelAndTypeVo.getUnitId());
-        deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary -> modelAndTypeVo.getModel()!=null&&deviceLibrary.getModel().equals(modelAndTypeVo.getModel()))
-                .filter(deviceLibrary -> modelAndTypeVo.getType()!=null&& deviceLibrary.getLifeStatus().equals(modelAndTypeVo.getType())).forEach(
-                        deviceLibrary -> {
-                            List<Integer> ids=new ArrayList<>();
-                            String key=deviceLibrary.getModel()+deviceLibrary.getName();
-                           if (!modelNameGroupMap.containsKey(key)){
-                               ids.add(deviceLibrary.getId());
-                               modelNameGroupMap.put(key,new ModelNameGroup(deviceLibrary.getModel(),deviceLibrary.getName(),ids));
+        if (modelAndTypeVo.getModel()==null&&modelAndTypeVo.getType()==null){
+          return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream()
+                  .map(this::devRepelVo).collect(Collectors.toList());
+        }else if (modelAndTypeVo.getModel()!=null&&modelAndTypeVo.getType()==null){
+            return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary -> deviceLibrary.getModel().equals(modelAndTypeVo.getModel()))
+                    .map(this::devRepelVo).collect(Collectors.toList());
+        }else if (modelAndTypeVo.getModel()==null&&modelAndTypeVo.getType()!=null){
+            return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream()
+                    .filter(deviceLibrary -> deviceLibrary.getType().equals(modelAndTypeVo.getType()))
+                    .map(this::devRepelVo).collect(Collectors.toList());
         }else {
-                               ModelNameGroup modelNameGroup=modelNameGroupMap.get(key);
-                               ids=modelNameGroupMap.get(key).getIds();
-                               ids.add(deviceLibrary.getId());
-                               modelNameGroup.setIds(ids);
-                               modelNameGroupMap.put(key,modelNameGroup);
+          return  deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary -> deviceLibrary.getModel().equals(modelAndTypeVo.getModel()))
+                    .filter(deviceLibrary -> deviceLibrary.getType().equals(modelAndTypeVo.getType()))
+                   .map(this::devRepelVo).collect(Collectors.toList());
         }
     }
-        );
-        return modelNameGroupMap.values().stream().sorted(Comparator.comparing(ModelNameGroup::getModel)).collect(Collectors.toList());
-    }