方法改回

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcIndividualCategoryManageServiceImpl.java

@@ -57,16 +57,20 @@ public class IcIndividualCategoryManageServiceImpl extends BaseServiceImpl<IcInd
         if (CollectionUtils.isEmpty(result)){
             return new ArrayList<>();
         }
-        CategoryCountListFormDTO formDTO = new CategoryCountListFormDTO();
-        formDTO.setConfigList(result.stream().map(m -> m.getWarnConfigId()).collect(Collectors.toList()));
-        formDTO.setOrgId(staffInfo.getAgencyId());
-        Result<List<CategoryCountListResultDTO>> list = userOpenFeignClient.getPersonCategoryList(formDTO);
+        StatsResiListFormDTO formDTO = new StatsResiListFormDTO();
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setLevel("agency");
+        formDTO.setId(staffInfo.getAgencyId());
+        Result<List<IcStatsResiResultDTO>> list = userOpenFeignClient.getPersonCategoryList(formDTO);
         if (!list.success()){
             throw new EpmetException("查询人员分类下人数失败...");
         }
-        List<CategoryCountListResultDTO> datas = list.getData();
+        List<IcStatsResiResultDTO> datas = list.getData();
+        if (CollectionUtils.isEmpty(datas)){
+            return result;
+        }
         if (CollectionUtils.isNotEmpty(datas)){
-            result.forEach( r -> datas.stream().filter( d -> d.getConfigId().equals(r.getWarnConfigId())).forEach(d -> r.setCount(d.getCount())));
+            result.forEach( r -> datas.stream().filter( d -> d.getId().equals(r.getId())).forEach(d -> r.setCount(d.getCount())));
         }
         return result;
     }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -710,6 +710,6 @@ public interface EpmetUserOpenFeignClient {
     Result<RegisterRelationDTO> resiRelationInfo(@RequestParam("userId")String userId);
 
     @PostMapping("/epmetuser/statsresiwarn/list2")
-    Result<List<CategoryCountListResultDTO>> getPersonCategoryList(@RequestBody CategoryCountListFormDTO formDTO);
+    Result<List<IcStatsResiResultDTO>> getPersonCategoryList(@RequestBody StatsResiListFormDTO formDTO);
 
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -524,7 +524,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     }
 
     @Override
-    public Result<List<CategoryCountListResultDTO>> getPersonCategoryList(CategoryCountListFormDTO formDTO) {
+    public Result<List<IcStatsResiResultDTO>> getPersonCategoryList(StatsResiListFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getPersonCategoryList", formDTO);
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsResiWarnController.java

@@ -76,8 +76,8 @@ public class StatsResiWarnController {
      * @date 2022/1/20 2:11 下午
      */
     @PostMapping("list2")
-    public Result<List<CategoryCountListResultDTO>> list2(@RequestBody CategoryCountListFormDTO formDTO){
-        return new Result<List<CategoryCountListResultDTO>>().ok(statsResiWarnService.list2(formDTO));
+    public Result<List<IcStatsResiResultDTO>> list2(@RequestBody StatsResiListFormDTO formDTO){
+        return new Result<List<IcStatsResiResultDTO>>().ok(statsResiWarnService.list2(formDTO));
     }
 
     @PostMapping("buildingwarnlist")

epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsResiWarnService.java

@@ -41,7 +41,7 @@ public interface StatsResiWarnService{
 
     List<IcStatsResiResultDTO> list(String customerId,String id, String level);
 
-    List<CategoryCountListResultDTO> list2(CategoryCountListFormDTO formDTO);
+    List<IcStatsResiResultDTO> list2(StatsResiListFormDTO formDTO);
 
     void resiWarn(String customerId);
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java

@@ -197,15 +197,8 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
     }
 
     @Override
-    public List<CategoryCountListResultDTO> list2(CategoryCountListFormDTO formDTO) {
-        if (CollectionUtils.isEmpty(formDTO.getConfigList())){
-            return new ArrayList<>();
-        }
-        List<PersonWarnLeftPieDTO> result = icStatsResiWarnDao.selectCategoryCount(formDTO.getConfigList(), formDTO.getOrgId());
-        if (CollectionUtils.isEmpty(result)){
-            return new ArrayList<>();
-        }
-        return ConvertUtils.sourceToTarget(result,CategoryCountListResultDTO.class);
+    public List<IcStatsResiResultDTO> list2(StatsResiListFormDTO formDTO) {
+        return list(formDTO.getCustomerId(), formDTO.getId(), formDTO.getLevel());
     }
 
     /**