feat(单位模块): 添加了单位名称替换单位简称的工具类

dev-misc/src/main/java/com/tykj/dev/misc/utils/DeviceModelSort.java

 package com.tykj.dev.misc.utils;
 
+import com.tykj.dev.misc.exception.ApiException;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -26,6 +27,19 @@ public class DeviceModelSort {
 
     public static Map<String, Integer> mapUnitSort;
 
+    public static Map<String,String> mapUnitNameToDisName;
+
+
+    /**
+     * 根据单位名称换单位的简称
+     */
+    public static String unitNameToDisName(String unitName){
+        if (mapUnitNameToDisName.containsKey(unitName)){
+            return mapUnitNameToDisName.get(unitName);
+        }else {
+            throw new ApiException("没有找到对应的单位名称替换简称："+unitName);
+        }
+    }
 
     /**
      * 列装型号排序方法

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

@@ -212,6 +212,15 @@ public class UnitsServiceImpl implements UnitsService {
         return list;
     }
 
+    @Override
+    public List<Units> findBySubordinateUnit(Integer unitsId) {
+        Units units =  unitsDao.findById(unitsId).get();
+        List<Integer> areaIds = areaDao.findAllByFatherId(units.getAreaId()).stream().map(Area::getId).collect(Collectors.toList());
+        List<Units> list= unitsDao.findAllByAreaIdIn(areaIds);
+        list.add(units);
+        return list;
+    }
+
     @Override
     public UnitsPage selectPage(Integer page, Integer size) {
         Pageable pageable = PageRequest.of(page, size, Sort.Direction.ASC, "level");
@@ -408,6 +417,7 @@ public class UnitsServiceImpl implements UnitsService {
     @Override
     public void addUnitSortMap() {
        DeviceModelSort.mapUnitSort=unitsDao.findAll().stream().collect(Collectors.toMap(Units::getName,Units::getShowOrder));
+       DeviceModelSort.mapUnitNameToDisName=unitsDao.findAll().stream().collect(Collectors.toMap(Units::getName,Units::getUnitDesc));
     }