fix(装备模块,盘存模块,3D模块): 1.入库的时候只渲染类型是密码机的装备(属于需求的变动)。 2.修改查询3D接口的数量。 …

dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryController.java

@@ -196,7 +196,9 @@ public class DeviceLibraryController {
         PredicateBuilder<DeviceLibrary> predicateBuilder = Specifications.and();
         predicateBuilder.eq("ownUnit", unit);
         predicateBuilder.eq(selfCheckVo.getStorageLocationId()!=null,"storageLocationId",selfCheckVo.getStorageLocationId());
-        List<DeviceLibrary> deviceLibraries = deviceLibraryDao.findAll(predicateBuilder.build());
+        List<Integer> status = new ArrayList<>(Arrays.asList(5,11,12));
+        List<DeviceLibrary> deviceLibraries = deviceLibraryDao.findAll(predicateBuilder.build())
+                .stream().filter(deviceLibrary -> !status.contains(deviceLibrary.getLifeStatus())).collect(Collectors.toList());
         deviceLibraries.forEach(DeviceLibrary::setConfigName);
         List<DeviceLibrary> deviceLibraryEntities = deviceLibraries.stream()
                 .filter(deviceLibrary -> deviceLibrary.getLocationUnit().equals(unit)&&(deviceLibrary.getLifeStatus()==2||deviceLibrary.getLifeStatus()==14))

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java

@@ -1315,7 +1315,8 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         List<DeviceLibrary> deviceLibraries = deviceLibraryDao.findAll(predicateBuilder.build());
         //报废 退役 销毁
         List<Integer> status = new ArrayList<>(Arrays.asList(5,10,11,12));
-        deviceLibraries = deviceLibraries.stream().filter(deviceLibrary -> !status.contains(deviceLibrary.getLifeStatus()) && deviceLibrary.getIsPart() == 0).collect(Collectors.toList());
+//        deviceLibraries = deviceLibraries.stream().filter(deviceLibrary -> !status.contains(deviceLibrary.getLifeStatus()) && deviceLibrary.getIsPart() == 0).collect(Collectors.toList());
+        deviceLibraries = deviceLibraries.stream().filter(deviceLibrary -> !status.contains(deviceLibrary.getLifeStatus()) && deviceLibrary.getType() == 1).collect(Collectors.toList());
         deviceLibraries.forEach(DeviceLibrary::setConfigName);
         stopWatch.stop();
         log.info("条件查询结果集时间为:{}",stopWatch.getTotalTimeSeconds());

dev-statistical/src/main/java/com/tykj/dev/statistical/service/impl/StatisticalServiceImpl.java

@@ -529,7 +529,9 @@ public class StatisticalServiceImpl implements StatisticalService {
         workBench.setPackingNum(packingLibraryDao.findAllByIsRootAndPackingStatus(0,2).size());
 //        List<DeviceLibrary> deviceLibraries = deviceLibraryService.getCoreDevicePage(deviceLibrarySelectVo);
         List<DeviceLibrary> deviceLibraries = deviceLibraryService.getDeviceByUnitNameAll(unit);
-        workBench.setAllDeviceNum(deviceLibraries.size());
+//        workBench.setAllDeviceNum(deviceLibraries.size());
+        workBench.setAllDeviceNum(deviceLibraries.stream().filter(deviceLibrary -> deviceLibrary.getLifeStatus()!=10)
+                .collect(Collectors.toList()).size());//把已销毁过滤掉
         workBench.setSelfDeviceNum(Long.valueOf(deviceLibraries.stream().filter(deviceLibrary ->
                 deviceLibrary.getOwnUnit().equals(unitName)).count()).intValue());
         //查询当前登录单位的配套设备 以及下级所有单位

dev-storage/src/main/java/com/tykj/dev/device/storage/controller/StorageBillController.java

@@ -916,8 +916,9 @@ public class StorageBillController {
         }
         log.info("saveDevices:{}",saveDevices.size());
         List<DeviceLibraryPosition> deviceLibraryPositions = new ArrayList<>();
-        //开始存储装备的3D
-        saveDevices = saveDevices.stream().filter(deviceLibrary -> deviceLibrary.getIsPart() == 0).collect(Collectors.toList());
+        //开始存储装备的3D 修改需求  只渲染类型是密码机的设备 密码机的类型为1
+//        saveDevices = saveDevices.stream().filter(deviceLibrary -> deviceLibrary.getIsPart() == 0).collect(Collectors.toList());
+        saveDevices = saveDevices.stream().filter(deviceLibrary -> deviceLibrary.getType() == 1).collect(Collectors.toList());
         saveDevices.forEach(deviceLibrary -> {
             DeviceLibraryPosition deviceLibraryPosition = new DeviceLibraryPosition();
             deviceLibraryPosition.setDeviceId(deviceLibrary.getId());