fix(阅知模块,配套设备模块): 修改列装清空阅知，修改配套设备过滤

dev-matching/src/main/java/com/tykj/dev/device/matching/controller/MatchingDeviceController.java

@@ -719,7 +719,16 @@ public class MatchingDeviceController {
         Boolean hasStorageLocationDim  = deviceLibrarySelectVo.getRfidCardDim()!=null;
         SimpleDateFormat sdf =  new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" );
         List<DeviceLibrary> resultList = deviceLibraryService.getCoreDevicePage(deviceLibrarySelectVo);
-        resultList = resultList.stream().filter(deviceLibrary -> deviceLibrary.getIsPart() == 0).collect(Collectors.toList());
+        if (deviceLibrarySelectVo.getDeviceId() != null){
+            List<Integer> ids = new ArrayList<>(Collections.singletonList(deviceLibrarySelectVo.getDeviceId()));
+            resultList = resultList.stream()
+                    .filter(deviceLibrary -> deviceLibrary.getIsPart() == 0 && !ids.contains(deviceLibrary.getId()))
+                    .collect(Collectors.toList());
+        }else {
+            resultList = resultList.stream()
+                    .filter(deviceLibrary -> deviceLibrary.getIsPart() == 0)
+                    .collect(Collectors.toList());
+        }
         if (hasModelDim||hasLifeStatusDim||hasLocationUnitDim||hasNameDim||hasOwnUnitDim||hasSeqDim) {
             resultList = resultList.stream().filter(deviceLibrary -> {
                 Boolean containModelDim = !hasModelDim||deviceLibrary.getModel().contains(deviceLibrarySelectVo.getModelDim());

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

@@ -466,7 +466,10 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
             }
             //发送阅知信息
             List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId());
-            MessageBto messageBto = new MessageBto(0,1,"回收站清空列装",userIds,0);
+            //清空 列装回收站
+            String content = "清空 列装回收站：【型号："+packingLibraryDao.findAllByIdIn(ids).stream()
+                    .map(PackingLibrary::getModel).distinct().collect(Collectors.toList())+"】";
+            MessageBto messageBto = new MessageBto(0,1,content,userIds,0);
             messageBto.setRecord(StringSplitUtil.idListToString(ids));
             messageService.add(messageBto);
         }