feat(区域模块,统计模块): 新增根据类型查询区域

dev-statistical/src/main/java/com/tykj/dev/statistical/service/impl/StatisticalServiceImpl.java

@@ -29,6 +29,7 @@ import com.tykj.dev.device.user.subject.dao.UserDao;
 import com.tykj.dev.device.user.subject.entity.Area;
 import com.tykj.dev.device.user.subject.entity.Units;
 import com.tykj.dev.device.user.subject.entity.User;
+import com.tykj.dev.device.user.subject.service.AreaService;
 import com.tykj.dev.device.user.subject.service.UnitsService;
 import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.exception.ApiException;
@@ -506,6 +507,9 @@ public class StatisticalServiceImpl implements StatisticalService {
     /**
      * 获取工作台统计
      */
+
+    @Autowired
+    private AreaService areaService;
     @Override
     public WorkBench getWorkBenchStat() {
         Integer unit = userUtils.getCurrentUnitId();
@@ -514,6 +518,7 @@ public class StatisticalServiceImpl implements StatisticalService {
         DeviceLibrarySelectVo deviceLibrarySelectVo = new DeviceLibrarySelectVo();
 //        deviceLibrarySelectVo.setAreaId(areaCache.findByName("浙江省").getId());
         deviceLibrarySelectVo.setAreaId(areaCache.findByName("浙江省").getId());
+        deviceLibrarySelectVo.setAreaId(areaService.findByType(1).getId());
         workBench.setPackingNum(packingLibraryDao.findAllByIsRootAndPackingStatus(0,2).size());
         List<DeviceLibrary> deviceLibraries = deviceLibraryService.getCoreDevicePage(deviceLibrarySelectVo);
         workBench.setAllDeviceNum(deviceLibraries.size());

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

@@ -27,4 +27,6 @@ public interface AreaDao extends JpaRepository<Area, Integer>, JpaSpecificationE
     String findNameById(int id);
 
     List<Area> findAllByTypeInOrderByTypeAsc(List<Integer> types);
+
+    Area findByType(Integer type);
 }

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

@@ -36,4 +36,11 @@ public interface AreaService extends PublicService<Area> {
 
     Area findByIdTosuperiorArea(Integer areaId);
 
+    /**
+     * 根据类型查询区域
+     * @param type 1是省
+     * @return 区域对象
+     */
+    Area findByType(Integer type);
+
 }

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

@@ -136,6 +136,11 @@ public class AreaServiceImpl implements AreaService {
         return area;
     }
 
+    @Override
+    public Area findByType(Integer type) {
+        return areaDao.findByType(type);
+    }
+
     private List<Integer> areaId(List<Integer> ids,Integer areaId){
        List<Area> areas= areaDao.findAllByFatherId(areaId);
        ids.add(areaId);