fix(配套模块,统计模块): 不同单位登录工作台显示的配套设备的数量

dev-matching/src/main/java/com/tykj/dev/device/matching/service/impl/MatchingDeviceLibraryServiceImpl.java

@@ -14,6 +14,7 @@ import com.tykj.dev.device.matching.service.MatchingDeviceLibraryService;
 import com.tykj.dev.device.matching.subject.domin.MatchingDeviceLibrary;
 import com.tykj.dev.device.matching.subject.vo.MatchingDeviceSelectVo;
 import com.tykj.dev.device.matching.subject.vo.RelationDeviceVo;
+import com.tykj.dev.device.user.subject.service.UnitsService;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.exception.ApiException;
@@ -163,7 +164,8 @@ public class MatchingDeviceLibraryServiceImpl implements MatchingDeviceLibrarySe
             }
         }
     }
-
+    @Autowired
+    private UnitsService unitsService;
     @Override
     public List<MatchingDeviceLibrary> getMatchingDevicePage(MatchingDeviceSelectVo matchingDeviceSelectVo) {
         PredicateBuilder<MatchingDeviceLibrary> predicateBuilder = getPredicate(matchingDeviceSelectVo);
@@ -187,8 +189,8 @@ public class MatchingDeviceLibraryServiceImpl implements MatchingDeviceLibrarySe
             //获取区域等级
             Integer selectLevel = userPublicService.getArea(selectAreaId).getType();
             //获取区域下所有单位名称
-//            List<String> units = userPublicService.findAllUnitNameByAreaId(selectAreaId);
-            List<Integer> units = userPublicService.findAllUnitIdByAreaId(selectAreaId);
+            List<String> units = userPublicService.findAllUnitNameByAreaId(selectAreaId);
+//            List<Integer> units = userPublicService.findAllUnitIdByAreaId(selectAreaId);
             //如果是市或县，筛选出创建单位在units中的设备
             if (selectLevel == 3 || selectLevel == 2) {
 //                List<MatchingDeviceLibrary> resultList = matchingDeviceLibraryDao.findAll(getPredicate(matchingDeviceSelectVo).build())
@@ -197,7 +199,7 @@ public class MatchingDeviceLibraryServiceImpl implements MatchingDeviceLibrarySe
 //                        .collect(Collectors.toList());
                 List<MatchingDeviceLibrary> resultList = matchingDeviceLibraryDao.findAll(getPredicate(matchingDeviceSelectVo).build())
                         .stream()
-                        .filter(matchingDeviceLibraryEntity -> units.contains(matchingDeviceLibraryEntity.getCreateUnitId()))
+                        .filter(matchingDeviceLibraryEntity -> units.contains(unitsService.findById(matchingDeviceLibraryEntity.getCreateUnitId()).getName()))
                         .collect(Collectors.toList());
 //                List<MatchingDeviceLibrary> resultList = matchingDeviceLibraryDao.findAll().stream()
 //                        .filter(matchingDeviceLibraryEntity -> units.contains(matchingDeviceLibraryEntity.getCreateUnit()))

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

@@ -9,7 +9,9 @@ import com.tykj.dev.device.library.service.DeviceLibraryService;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.library.subject.vo.DeviceLibrarySelectVo;
 import com.tykj.dev.device.matching.repository.MatchingDeviceLibraryDao;
+import com.tykj.dev.device.matching.service.MatchingDeviceLibraryService;
 import com.tykj.dev.device.matching.subject.domin.MatchingDeviceLibrary;
+import com.tykj.dev.device.matching.subject.vo.MatchingDeviceSelectVo;
 import com.tykj.dev.device.packing.repository.PackingLibraryDao;
 import com.tykj.dev.device.selfcheck.base.SelfCheckSchedulerTask;
 import com.tykj.dev.device.selfcheck.repository.SelfCheckBillDao;
@@ -511,6 +513,9 @@ public class StatisticalServiceImpl implements StatisticalService {
 
     @Autowired
     private AreaService areaService;
+
+    @Autowired
+    private MatchingDeviceLibraryService matchingDeviceLibraryService;
     @Override
     public WorkBench getWorkBenchStat() {
         Integer unit = userUtils.getCurrentUnitId();
@@ -524,10 +529,22 @@ public class StatisticalServiceImpl implements StatisticalService {
         workBench.setAllDeviceNum(deviceLibraries.size());
         workBench.setSelfDeviceNum(Long.valueOf(deviceLibraries.stream().filter(deviceLibrary ->
                 deviceLibrary.getOwnUnit().equals(unitName)).count()).intValue());
-        //查询当前登录单位的配套设备
-        List<MatchingDeviceLibrary> allByCreateUnitId = matchingDeviceLibraryDao.findAllByCreateUnitId(unit);
-        if (!allByCreateUnitId.isEmpty()){
-            workBench.setMatchingDeviceNum(allByCreateUnitId.size());
+        //查询当前登录单位的配套设备 以及下级所有单位
+
+//        List<MatchingDeviceLibrary> allByCreateUnitId = matchingDeviceLibraryDao.findAllByCreateUnitId(unit);
+//        if (!allByCreateUnitId.isEmpty()){
+//            workBench.setMatchingDeviceNum(allByCreateUnitId.size());
+//        }else {
+//            workBench.setMatchingDeviceNum(0);
+//        }
+        MatchingDeviceSelectVo matchingDeviceSelectVo = new MatchingDeviceSelectVo();
+        //通过单位id查询区域id
+        Integer currentUnitId = userUtils.getCurrentUnitId();
+        Units units = unitsService.findById(currentUnitId);
+        matchingDeviceSelectVo.setAreaId(units.getAreaId());
+        List<MatchingDeviceLibrary> matchingDevicePage = matchingDeviceLibraryService.getMatchingDevicePage(matchingDeviceSelectVo);
+        if (!matchingDevicePage.isEmpty()){
+            workBench.setMatchingDeviceNum(matchingDevicePage.size());
         }else {
             workBench.setMatchingDeviceNum(0);
         }