fix(3D模块): 修改了查询接口，在返回数据中添加了形态以及所属单位字段

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.wenhao.jpa.PredicateBuilder;
 import com.github.wenhao.jpa.Specifications;
 import com.tykj.dev.device.library.repository.DeviceLibraryPositionDao;
+import com.tykj.dev.device.library.service.DeviceLibraryCacheService;
 import com.tykj.dev.device.library.service.DeviceLibraryPositionService;
 import com.tykj.dev.device.library.service.DeviceLibraryService;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
@@ -23,6 +24,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -35,6 +37,9 @@ public class DeviceLibraryPositionServiceImpl implements DeviceLibraryPositionSe
     @Autowired
     private DeviceLibraryPositionDao deviceLibraryPositionDao;
 
+    @Autowired
+    private DeviceLibraryCacheService deviceLibraryCacheService;
+
     @Override
     public void addDeviceLibraryPosition(DeviceLibraryPosition deviceLibraryPosition) {
         deviceLibraryPositionDao.save(deviceLibraryPosition);
@@ -103,6 +108,9 @@ public class DeviceLibraryPositionServiceImpl implements DeviceLibraryPositionSe
     @Override
     public Map<String,Object> fnConditionQuery(QueryTheWarehouseVo queryTheWarehouseVo) {
         Map<String,Object> map = new HashMap<>();
+
+        Map<Integer, DeviceLibrary> deviceIdMap = deviceLibraryCacheService.getAllDeviceLibraryList().stream().collect(Collectors.toMap(DeviceLibrary::getId, Function.identity()));
+
         PredicateBuilder<DeviceLibraryPosition> builder = createBuilder(queryTheWarehouseVo);
         List<DeviceLibraryPosition> deviceLibraryPositions = deviceLibraryPositionDao.findAll(builder.build());
         Page<DeviceLibraryPosition> page = PageUtil.getPerPage(queryTheWarehouseVo.getPage(),
@@ -117,6 +125,13 @@ public class DeviceLibraryPositionServiceImpl implements DeviceLibraryPositionSe
                         JacksonUtil.readValue(deviceLibraryPosition.getRotation(), new TypeReference<RotationVo>() {}));
             }
         }
+        page.forEach(deviceLibraryPosition -> {
+            if (deviceIdMap.containsKey(deviceLibraryPosition.getDeviceId())) {
+                DeviceLibrary deviceLibrary= deviceIdMap.get(deviceLibraryPosition.getDeviceId()).setConfigName();
+                deviceLibraryPosition.setOwnUnitName(deviceLibrary.getOwnUnit());
+                deviceLibraryPosition.setTypeName(deviceLibrary.getTypeName());
+            }
+        });
         List<String> models =
                 deviceLibraryPositions.stream().map(DeviceLibraryPosition::getModel).distinct().collect(Collectors.toList());
         List<String> names =

dev-library/src/main/java/com/tykj/dev/device/library/subject/domin/DeviceLibraryPosition.java

@@ -144,4 +144,12 @@ public class DeviceLibraryPosition implements Serializable {
     @Transient
     private RotationVo rotationVo;
 
+    @ApiModelProperty("所属单位")
+    @Transient
+    private String ownUnitName;
+
+    @ApiModelProperty("形态")
+    @Transient
+    private String typeName;
+
 }