feat(列装模块): 列装解绑，当解绑的是装备只显示列装目录，当解绑的装备是附件的时候显示列装目录和装备目录

dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingController.java

@@ -981,7 +981,8 @@ public class PackingController {
     @ApiOperation(value = "查询可选择的列装")
     @PostMapping("/selectPacking")
     public ResponseEntity selectPacking(@RequestBody SelectPackingVo selectPackingVo){
-        List<PackingLibrary> resultList = packingLibraryService.getAllSelectPacking(selectPackingVo.getPackingIds());
+//        List<PackingLibrary> resultList = packingLibraryService.getAllSelectPacking(selectPackingVo.getPackingIds());
+        List<PackingLibrary> resultList = packingLibraryService.getAllSelectPacking(selectPackingVo);
 
         //进行过滤 退装的目录下面 回收站
 //        List<Integer> statuses = new ArrayList<>(Arrays.asList(3, 4));
@@ -1003,8 +1004,9 @@ public class PackingController {
 //            }
 //        });
 //        List<PackingLibrary> packingLibraries = resultList.stream().filter(packingLibrary -> packingLibrary.getIsRoot() == 0).collect(Collectors.toList());
+
         Page<PackingLibrary> perPage = PageUtil.getPerPage(selectPackingVo.getPage(),
-                selectPackingVo.getSize(), resultList, selectPackingVo.getPageable());
+                    selectPackingVo.getSize(), resultList, selectPackingVo.getPageable());
         Map<String, Object> map = new HashMap<>();
         map.put("page",perPage);
         return ResponseEntity.ok(map);

dev-packing/src/main/java/com/tykj/dev/device/packing/service/PackingLibraryService.java

@@ -236,6 +236,7 @@ public interface PackingLibraryService{
      * 查询可以被绑定的列装
      */
     List<PackingLibrary> getAllSelectPacking(List<Integer> packingIds);
+    List<PackingLibrary> getAllSelectPacking(SelectPackingVo selectPackingVo);
 
     /**
      * @param ids 列装库主键Id

dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java

@@ -1001,7 +1001,8 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
         packingLibraryEntities.forEach(PackingLibrary::setConfigName);
         //查询列装
 //        List<PackingLibrary> libraries = packingLibraryDao.findAllByIdIn(packingIds);
-        packingLibraryEntities = packingLibraryEntities.stream().filter(packingLibrary -> !packingIds.contains(packingLibrary.getId())).collect(Collectors.toList());
+        packingLibraryEntities = packingLibraryEntities.stream().filter(packingLibrary ->
+                !packingIds.contains(packingLibrary.getId())).collect(Collectors.toList());
 //        packingLibraryEntities.removeAll(libraries);
         Map<Integer, PackingLibrary> nodeCollect =
                 packingLibraryEntities.stream().collect(Collectors.toMap(PackingLibrary::getId, packingLibraryEntity -> packingLibraryEntity));
@@ -1013,6 +1014,42 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
         ).stream().sorted(Comparator.comparing(PackingLibrary::getModel)).collect(Collectors.toList());
     }
 
+    @Override
+    public List<PackingLibrary> getAllSelectPacking(SelectPackingVo selectPackingVo) {
+        List<PackingLibrary> packingLibraryEntities =
+                packingLibraryDao.findAll(getSelectSpecification22(new PackingLibrarySelectVo()));
+        packingLibraryEntities.forEach(PackingLibrary::setConfigName);
+        //查询列装
+        List<Integer> packingIds = selectPackingVo.getPackingIds();
+//        List<PackingLibrary> libraries = packingLibraryDao.findAllByIdIn(packingIds);
+        packingLibraryEntities = packingLibraryEntities.stream().filter(packingLibrary ->
+                !packingIds.contains(packingLibrary.getId())).collect(Collectors.toList());
+
+        if(selectPackingVo.getIsPart() == 0){
+            //代表是装备  只显示目录
+            packingLibraryEntities = packingLibraryEntities.stream().filter(packingLibrary -> packingLibrary.getIsRoot() == 1).collect(Collectors.toList());
+            return packingLibraryEntities;
+        }else {
+            //附件  显示装备
+//            packingLibraryEntities = packingLibraryEntities.stream()
+//                    .filter(packingLibrary -> packingLibrary.getIsRoot() == 1)
+//                    .filter(packingLibrary -> packingLibrary.getIsPart() == 0)
+//                    .collect(Collectors.toList());
+            packingLibraryEntities = packingLibraryEntities.stream()
+                    .filter(packingLibrary -> packingLibrary.getIsRoot() == 1 || packingLibrary.getIsPart() == 0)
+                    .collect(Collectors.toList());
+        }
+        Map<Integer, PackingLibrary> nodeCollect =
+                packingLibraryEntities.stream().collect(Collectors.toMap(PackingLibrary::getId, packingLibraryEntity -> packingLibraryEntity));
+
+        return GetTreeUtils.parseTreeFromDown(
+                packingLibraryEntities,
+                PackingLibrary::getId,
+                packingLibraryEntity -> Optional.ofNullable(nodeCollect.get(packingLibraryEntity.getPartParentId())),
+                PackingLibrary::addChildNode
+        ).stream().sorted(Comparator.comparing(PackingLibrary::getModel)).collect(Collectors.toList());
+    }
+
     @Override
     public List<PackingLibrary> findByIds(List<Integer> ids) {
         return packingLibraryDao.findAllByIdIn(ids);