添加设备相关

fill-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java

@@ -150,7 +150,6 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
             Result<MatterDatumEntity> result = this.service.find(query, pageInfo, context);
             //内存分页
             List<MatterDatumEntity> pagination = MemoryPagination.pagination(result.getList(), query.getPage(), query.getSize());
-
             List<MatterDatumInfo> collect = pagination.stream().map(item -> {
                 MatterDatumInfo matterDatumInfo = new MatterDatumInfo();
                 matterDatumInfo.setMaterialId(item.getId());
@@ -158,15 +157,30 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
                 return matterDatumInfo;
             }).collect(Collectors.toList());
 
-            if(!ObjectUtils.isEmpty(query.getDeviceCode())){
-                Set<Long> matterSet = deviceMatterDatumService.find(new DeviceMatterDatumQuery().deviceCode(query.getDeviceCode())).stream().map(item -> item.getMatterId()).collect(Collectors.toSet());
+            if (!ObjectUtils.isEmpty(query.getDeviceCode())) {
+                DeviceMatterDatumQuery deviceMatterDatumQuery = new DeviceMatterDatumQuery().deviceCode(query.getDeviceCode());
+                List<Long> matterIdList = deviceMatterDatumService.find(deviceMatterDatumQuery, pageInfo, context).getList().stream().map(item -> item.getMatterId()).collect(Collectors.toList());
+
+                MatterDatumQuery matterDatumQuery = new MatterDatumQuery();
+                matterDatumQuery.setMatterIdList(matterIdList);
+
+                Result<MatterDatumEntity> matterDatumEntityResult = this.service.find(matterDatumQuery, pageInfo, context);
+                pagination = MemoryPagination.pagination(matterDatumEntityResult.getList(), query.getPage(), query.getSize());
+                collect = pagination.stream().map(item -> {
+                    MatterDatumInfo matterDatumInfo = new MatterDatumInfo();
+                    matterDatumInfo.setMaterialId(item.getId());
+                    BeanUtils.copyProperties(item, matterDatumInfo, BeanUtil.getNullPropertyNames(item));
+                    return matterDatumInfo;
+                }).collect(Collectors.toList());
+
+/*                Set<Long> matterSet = deviceMatterDatumService.find(deviceMatterDatumQuery).stream().map(item -> item.getMatterId()).collect(Collectors.toSet());
                 Iterator<MatterDatumInfo> iterator = collect.iterator();
                 while (iterator.hasNext()) {
                     MatterDatumInfo next =  iterator.next();
                     if(!matterSet.contains(next.getMatterId())){
                         iterator.remove();
                     }
-                }
+                }*/
             }
             model.put(KEY_RESULT_DATA, collect);
             model.put(PAGEINFO_KEY, result.getPageInfo());