fix(库房模块): 添加查询所有库房的service

dev-user/src/main/java/com/tykj/dev/device/user/subject/dao/UnitStoreLocationDao.java

@@ -10,6 +10,8 @@ import java.util.List;
 public interface UnitStoreLocationDao extends JpaRepository<UnitStoreLocation, Integer>, JpaSpecificationExecutor<UnitStoreLocation> {
     List<UnitStoreLocation> findAllByUnitIdAndTypeName(Integer unitId,String typeName);
 
+    List<UnitStoreLocation> findAllByTypeName(String typeName);
+
     List<UnitStoreLocation> findAllByIdIn(List<Integer> ids);
 
     boolean existsByStoreNameAndUnitId(String name,Integer unitId);

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/UnitStoreLocationService.java

@@ -17,8 +17,11 @@ import java.util.Set;
 public interface UnitStoreLocationService extends PublicService<UnitStoreLocation>{
     List<UnitStoreLocation> findAllByUnitIdAndTypeName(UnitStoreLocationVo unitStoreLocationVo);
 
+
     Map<Integer,String> findByUnitIdToDeviceMap(Integer unitId);
 
+    Map<Integer,String> findToDeviceMap();
+
     /**
      * 根据id查询名称
      * @param ids id集合

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UnitStoreLocationServiceImpl.java

@@ -35,11 +35,18 @@ public class UnitStoreLocationServiceImpl implements UnitStoreLocationService {
     }
 
     @Override
-    public Map<Integer, String> findByUnitIdToDeviceMap(Integer unitId) {
+    public Map<Integer,String> findByUnitIdToDeviceMap(Integer unitId) {
 
         return unitStoreLocationDao.findAllByUnitIdAndTypeName(unitId,"存放位置")
                 .stream()
-                .sorted(Comparator.comparing(UnitStoreLocation::getShowOrder))
+                .collect(Collectors.toMap(UnitStoreLocation::getId,UnitStoreLocation::getStoreName));
+    }
+
+    @Override
+    public Map<Integer, String> findToDeviceMap() {
+
+        return unitStoreLocationDao.findAllByTypeName("存放位置")
+                .stream()
                 .collect(Collectors.toMap(UnitStoreLocation::getId,UnitStoreLocation::getStoreName));
     }