feat(单位模块): 添加了单位逻辑注释

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

@@ -1308,17 +1308,27 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         DeviceLibrarySelectVo deviceLibrarySelectVo = new DeviceLibrarySelectVo();
         BeanUtils.copyProperties(queryTheWarehouseVo,deviceLibrarySelectVo);
         PredicateBuilder<DeviceLibrary> predicateBuilder = getPredicateBuilder(deviceLibrarySelectVo);
+
         StopWatch stopWatch = new StopWatch("条件查询结果集");
         stopWatch.start();
         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())).collect(Collectors.toList());
+
+        deviceLibraries = deviceLibraries.stream().filter(deviceLibrary -> !status.contains(deviceLibrary.getLifeStatus()) && deviceLibrary.getIsPart() == 0).collect(Collectors.toList());
         deviceLibraries.forEach(DeviceLibrary::setConfigName);
         stopWatch.stop();
         log.info("条件查询结果集时间为:{}",stopWatch.getTotalTimeSeconds());
+
+
         //拿到所有的装备id
+        StopWatch stopWatch2 = new StopWatch("获取装备id集合");
+        stopWatch2.start();
         List<Integer> deviceIds = deviceLibraries.stream().map(DeviceLibrary::getId).collect(Collectors.toList());
+        stopWatch2.stop();
+        log.info("获取装备id集合时间为:{}",stopWatch2.getTotalTimeSeconds());
+
+
         //3D位置的map
         StopWatch stopWatch1 = new StopWatch("查询和拼接");
         stopWatch1.start();
@@ -1330,7 +1340,11 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
 //        deviceLibraries = deviceLibraries.stream().filter(deviceLibrary -> integers.contains(deviceLibrary.getId()))
 //                .collect(Collectors.toList());
         List<AllVO> allVOS = new ArrayList<>();
+
+
         //开始遍历装备
+        StopWatch stopWatch3 = new StopWatch("开始遍历装备");
+        stopWatch3.start();
         deviceLibraries.forEach(deviceLibrary -> {
             AllVO allVO = new AllVO();
             //开始赋值
@@ -1342,6 +1356,9 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
             allVO.setDeviceLibraryPosition(deviceLibraryPosition);
             allVOS.add(allVO);
         });
+        stopWatch3.stop();
+        log.info("遍历装备时间为:{}",stopWatch3.getTotalTimeSeconds());
+
         //如果是出库 只需要地上的   不出库是全部的
         Integer out = queryTheWarehouseVo.getOut();
         List<AllVO> pageAllVo = new ArrayList<>();
@@ -1426,10 +1443,13 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
     public void importData() {
         List<DeviceLibrary> deviceLibraryList = deviceLibraryDao.findAll();
         List<DeviceLibraryPosition> deviceLibraryPositions = new ArrayList<>();
+        List<Integer> status = new ArrayList<>(Arrays.asList(5,10,11,12));
         deviceLibraryList.forEach(deviceLibrary -> {
-            DeviceLibraryPosition deviceLibraryPosition = new DeviceLibraryPosition();
-            deviceLibraryPosition.setDeviceId(deviceLibrary.getId());
-            deviceLibraryPositions.add(deviceLibraryPosition);
+            if (deviceLibrary.getIsPart()==0 || !status.contains(deviceLibrary.getLifeStatus())) {
+                DeviceLibraryPosition deviceLibraryPosition = new DeviceLibraryPosition();
+                deviceLibraryPosition.setDeviceId(deviceLibrary.getId());
+                deviceLibraryPositions.add(deviceLibraryPosition);
+            }
         });
         //批量保存到3D中
         deviceLibraryPositionService.batchDeviceLibraryPositions(deviceLibraryPositions);