fix(3d模块): 修改3D装备为null

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

@@ -1340,7 +1340,8 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         //报废 退役 销毁 丢失
         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.getType() == 1).collect(Collectors.toList());
+        deviceLibraries = deviceLibraries.stream().filter(deviceLibrary -> !status.contains(deviceLibrary.getLifeStatus())
+                && deviceLibrary.getType() == 1 && deviceLibrary.getIsPart() == 0).collect(Collectors.toList());
         deviceLibraries.forEach(DeviceLibrary::setConfigName);
         stopWatch.stop();
         log.info("条件查询结果集时间为:{}",stopWatch.getTotalTimeSeconds());
@@ -1539,7 +1540,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         List<DeviceLibraryPosition> deviceLibraryPositions = new ArrayList<>();
         List<Integer> status = new ArrayList<>(Arrays.asList(5,10,11,12));
         deviceLibraryList.forEach(deviceLibrary -> {
-            if (deviceLibrary.getIsPart()==0 && !status.contains(deviceLibrary.getLifeStatus())) {
+            if (deviceLibrary.getIsPart()==0 && !status.contains(deviceLibrary.getLifeStatus())&& deviceLibrary.getType() == 1) {
                 DeviceLibraryPosition deviceLibraryPosition = new DeviceLibraryPosition();
                 deviceLibraryPosition.setDeviceId(deviceLibrary.getId());
                 deviceLibraryPositions.add(deviceLibraryPosition);