Merge remote-tracking branch 'origin/develop' into develop

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IndividualCategoryListResultDTO.java

@@ -1,6 +1,7 @@
 package com.epmet.dto.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -37,5 +38,8 @@ public class IndividualCategoryListResultDTO implements Serializable {
 
     private String id;
 
+    @JsonIgnore
+    private String warnConfigId;
+
     private Integer count = NumConstant.ZERO;
 }

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

@@ -9,13 +9,11 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcIndividualCategoryManageDao;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
+import com.epmet.dto.form.CategoryCountListFormDTO;
 import com.epmet.dto.form.EditIndividualCategoryFormDTO;
 import com.epmet.dto.form.IcResiCategoryStatsConfigFormDTO;
 import com.epmet.dto.form.StatsResiListFormDTO;
-import com.epmet.dto.result.IcStatsResiResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.IcStatsResiWarnBuildingResultDTO;
-import com.epmet.dto.result.IndividualCategoryAllListResultDTO;
-import com.epmet.dto.result.IndividualCategoryListResultDTO;
 import com.epmet.entity.IcIndividualCategoryManageEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
@@ -27,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 个人分类管理
@@ -54,27 +53,22 @@ public class IcIndividualCategoryManageServiceImpl extends BaseServiceImpl<IcInd
         if (null == staffInfo){
             throw new EpmetException(String.format("查询工作人员%s信息失败...",tokenDto.getUserId()));
         }
-        StatsResiListFormDTO formDTO = new StatsResiListFormDTO();
-        formDTO.setId(staffInfo.getAgencyId());
-        formDTO.setLevel("agency");
-        formDTO.setCustomerId(tokenDto.getCustomerId());
-        Result<List<IcStatsResiResultDTO>> list = userOpenFeignClient.getPersonCategoryList(formDTO);
-        if (!list.success()){
-            throw new EpmetException("查询人员分类下人数失败...");
-        }
-        List<IcStatsResiResultDTO> datas = list.getData();
         List<IndividualCategoryListResultDTO> result = baseDao.individualCategoryList(tokenDto.getUserId());
-        if (CollectionUtils.isNotEmpty(datas) && CollectionUtils.isNotEmpty(result)){
-            result.forEach( r -> datas.stream().filter( d -> d.getId().equals(r.getId())).forEach(d -> r.setCount(d.getCount())));
-            return result;
-        }
-        if (CollectionUtils.isEmpty(datas) && CollectionUtils.isNotEmpty(result)){
-            return result;
-        }
         if (CollectionUtils.isEmpty(result)){
             return new ArrayList<>();
         }
-        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);
+        if (!list.success()){
+            throw new EpmetException("查询人员分类下人数失败...");
+        }
+        List<CategoryCountListResultDTO> datas = list.getData();
+        if (CollectionUtils.isNotEmpty(datas)){
+            result.forEach( r -> datas.stream().filter( d -> d.getConfigId().equals(r.getId())).forEach(d -> r.setCount(d.getCount())));
+        }
+        return result;
     }
 
     /**

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcIndividualCategoryManageDao.xml

@@ -15,9 +15,11 @@
             sc.LABEL,
             sc.MANAGEMENT_ICON,
             sc.COLUMN_NAME,
-            sc.id AS id
+            sc.id AS id,
+            wc.ID AS warnConfigId
         FROM ic_individual_category_manage cm
         INNER JOIN ic_resi_category_stats_config sc ON (sc.ID = cm.COLUMN_ID AND sc.DEL_FLAG = '0' AND `STATUS` = 'show')
+        INNER JOIN ic_resi_category_warn_config wc ON (sc.COLUMN_NAME = wc.COLUMN_NAME AND wc.DEL_FLAG = '0' AND wc.CUSTOMER_ID = sc.CUSTOMER_ID)
         WHERE cm.DEL_FLAG = 0
           AND cm.USER_ID = #{userId}
     </select>

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CategoryCountListFormDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/1/21 1:43 下午
+ * @DESC
+ */
+@Data
+public class CategoryCountListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1563081091285509142L;
+
+    private List<String> configList;
+
+    private String orgId;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CategoryCountListResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/1/21 1:44 下午
+ * @DESC
+ */
+@Data
+public class CategoryCountListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -8441192101441016588L;
+
+    private String configId;
+
+    private Integer count;
+}

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<IcStatsResiResultDTO>> getPersonCategoryList(@RequestBody StatsResiListFormDTO formDTO);
+    Result<List<CategoryCountListResultDTO>> getPersonCategoryList(@RequestBody CategoryCountListFormDTO 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<IcStatsResiResultDTO>> getPersonCategoryList(StatsResiListFormDTO formDTO) {
+    public Result<List<CategoryCountListResultDTO>> getPersonCategoryList(CategoryCountListFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getPersonCategoryList", formDTO);
     }
 }

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

@@ -22,9 +22,11 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.CategoryCountListFormDTO;
 import com.epmet.dto.form.StatsResiListFormDTO;
 import com.epmet.dto.form.StatsResiWarnCountFormDTO;
 import com.epmet.dto.form.StatsResiWarnFormDTO;
+import com.epmet.dto.result.CategoryCountListResultDTO;
 import com.epmet.dto.result.IcStatsResiResultDTO;
 import com.epmet.dto.result.IcStatsResiWarnBuildingResultDTO;
 import com.epmet.dto.result.IcStatsResiWarnUserResultDTO;
@@ -74,9 +76,8 @@ public class StatsResiWarnController {
      * @date 2022/1/20 2:11 下午
      */
     @PostMapping("list2")
-    public Result<List<IcStatsResiResultDTO>> list2(@RequestBody StatsResiListFormDTO formDTO){
+    public Result<List<CategoryCountListResultDTO>> list2(@RequestBody CategoryCountListFormDTO formDTO){
-        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<CategoryCountListResultDTO>>().ok(statsResiWarnService.list2(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

@@ -17,7 +17,9 @@
 
 package com.epmet.service;
 
+import com.epmet.dto.form.CategoryCountListFormDTO;
 import com.epmet.dto.form.StatsResiListFormDTO;
+import com.epmet.dto.result.CategoryCountListResultDTO;
 import com.epmet.dto.result.IcStatsResiResultDTO;
 import com.epmet.dto.result.IcStatsResiWarnBuildingResultDTO;
 import com.epmet.dto.result.IcStatsResiWarnUserResultDTO;
@@ -39,7 +41,7 @@ public interface StatsResiWarnService{
 
     List<IcStatsResiResultDTO> list(String customerId,String id, String level);
 
-    List<IcStatsResiResultDTO> list2(StatsResiListFormDTO formDTO);
+    List<CategoryCountListResultDTO> list2(CategoryCountListFormDTO formDTO);
 
     void resiWarn(String customerId);
 

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

@@ -9,6 +9,8 @@ import com.epmet.dao.IcResiUserDao;
 import com.epmet.dao.IcStatsResiWarnDao;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.IcResiCategoryWarnConfigDTO;
+import com.epmet.dto.PersonWarnLeftPieDTO;
+import com.epmet.dto.form.CategoryCountListFormDTO;
 import com.epmet.dto.form.IcResiCategoryStatsConfigFormDTO;
 import com.epmet.dto.form.StatsResiListFormDTO;
 import com.epmet.dto.result.*;
@@ -195,8 +197,15 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
     }
 
     @Override
-    public List<IcStatsResiResultDTO> list2(StatsResiListFormDTO formDTO) {
+    public List<CategoryCountListResultDTO> list2(CategoryCountListFormDTO formDTO) {
-        return this.list(formDTO.getCustomerId(), formDTO.getId(), formDTO.getLevel());
+        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);
     }
 
     /**

epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml

@@ -136,7 +136,7 @@
     <select id="selectCategoryCount" resultType="com.epmet.dto.PersonWarnLeftPieDTO">
         SELECT
             CONFIG_ID,
-            COUNT(COUNT) AS count
+            SUM(COUNT) AS count
         FROM ic_stats_resi_warn
         WHERE DEL_FLAG = '0'
           AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%')