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

# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcStatsResiWarnDao.java
#	epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -27,6 +27,7 @@ import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -107,39 +108,40 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                            @Param("staffOrgPath") String staffOrgPath);
 
     /**
-     * @Description  查询个人信息
      * @param userId
+     * @Description 查询个人信息
      * @author zxc
      * @date 2021/11/3 10:28 上午
      */
     PersonDataResultDTO personData(@Param("userId") String userId);
 
     /**
-     * @Description  根据名字，组织查询人
      * @param name
      * @param agencyId
+     * @Description 根据名字，组织查询人
      * @author zxc
      * @date 2021/11/3 2:05 下午
      */
     List<SearchByNameResultDTO> searchByName(@Param("name") String name, @Param("agencyId") String agencyId, @Param("pageNo") Integer pageNo);
 
     Set<String> selectUserDemandCode(String icResiUserId);
+
     String selectCategoryNames(@Param("customerId") String customerId, @Param("codeSet") Set<String> codeSet);
 
     @MapKey("HOME_ID")
     Map<String, Map<String, String>> getHomeUserCategoryCount(@Param("buildId") String buildId);
 
     /**
-     * @Description  根据userId查询志愿者
      * @param userId
+     * @Description 根据userId查询志愿者
      * @author zxc
      * @date 2021/11/5 5:44 下午
      */
     List<String> selectVolunteerByUserId(@Param("userId") String userId);
 
     /**
-     * @Description  查询人员类别
      * @param columns
+     * @Description 查询人员类别
      * @author zxc
      * @date 2021/11/8 1:50 下午
      */
@@ -151,8 +153,8 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      * @Description 查询居民信息
      **/
     IcResiUserDTO getResiUser(IcResiUserDTO dto);
+
     /**
-     *
      * @param agencyId
      * @param gridId
      * @param name
@@ -168,6 +170,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
 
     /**
      * 获取居民名称，家属名称和id
+     *
      * @param isResiUserId
      * @return
      */
@@ -184,6 +187,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
 
     /**
      * 组织内党员年龄范围统计
+     *
      * @Param orgType
      * @Param orgId
      * @Return {@link List< OptionDataResultDTO>}
@@ -194,6 +198,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
 
     /**
      * 获取年龄范围内党员列表
+     *
      * @Param orgType
      * @Param orgId
      * @Param min
@@ -208,6 +213,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
 
     /**
      * 党员文化程度统计
+     *
      * @Param orgType
      * @Param orgId
      * @Return {@link List< OptionDataResultDTO>}
@@ -218,6 +224,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
 
     /**
      * 按教育程度获取党员列表
+     *
      * @Param orgType
      * @Param orgId
      * @Param code
@@ -239,4 +246,19 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
     List<String> icUserCustomerIds();
 
     List<Map<String, String>> getIcUserList(@Param("customerId") String customerId);
+
+    /**
+     * desc: 获取数据分析列中的 各类居民数据
+     *
+     * @param customerId
+     * @param tableName
+     * @param columnList
+     * @param id 非必填 leve有值时 必填
+     * @param level 非必填
+     * @return java.util.Map<java.lang.String,java.math.BigDecimal> 字段名：数量
+     * @author LiuJanJun
+     * @date 2022/2/12 3:03 下午
+     */
+    Map<String, BigDecimal> getDataAnalyseCount(@Param("customerId") String customerId, @Param("tableName") String tableName,
+                                                @Param("columnList") List<String> columnList, @Param("id") String id, @Param("level") String level);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcStatsResiWarnDao.java

@@ -48,7 +48,7 @@ public interface IcStatsResiWarnDao extends BaseDao<IcStatsResiWarnEntity> {
                                                  @Param("buildingIdList") List<String> buildingIdList,
                                                  @Param("tableName") String tableName,
                                                  @Param("columnName") String columnName);
-
+    @Deprecated
     Integer countListByLevelAndCol(
             @Param("customerId") String customerId,
             @Param("tableName") String tableName,

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

@@ -2,6 +2,7 @@ package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -27,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -194,6 +196,18 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
         List<IcResiCategoryStatsConfigDTO> icResiCategoryStatsConfigDTOList = statsResult.getData();
         //获取tableName 和columnName
         List<IcStatsResiResultDTO> result = new ArrayList<>();
+        //tableName List<columnName>
+        Map<String,List<String>> paramMap = new HashMap<>();
+        icResiCategoryStatsConfigDTOList.forEach(config->{
+            List<String> list = paramMap.getOrDefault(config.getTableName(), new ArrayList<>());
+            list.add(config.getColumnName());
+            paramMap.put(config.getTableName(),list);
+        });
+        Map<String,Map<String, BigDecimal>> tableColumnCountMap = new HashMap<>();
+        paramMap.forEach((tableName,columnList) ->{
+            Map<String, BigDecimal> countMap = icResiUserDao.getDataAnalyseCount(customerId,tableName,columnList, id,level);
+            tableColumnCountMap.put(tableName,countMap);
+        });
         icResiCategoryStatsConfigDTOList.forEach(item->{
             IcStatsResiResultDTO resultDTO = new IcStatsResiResultDTO();
             resultDTO.setId(item.getId());
@@ -202,8 +216,9 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
             resultDTO.setHouseShowIcon(item.getHouseShowIcon());
             resultDTO.setManagementIcon(item.getManagementIcon());
             //根据id ，level 获取count
-            Integer count = icStatsResiWarnDao.countListByLevelAndCol(customerId,item.getTableName(),item.getColumnName(),id,level);
+            //Integer count = icStatsResiWarnDao.countListByLevelAndCol(customerId,item.getTableName(),item.getColumnName(),id,level);
-            resultDTO.setCount(count);
+            Map<String, BigDecimal> orDefault = tableColumnCountMap.getOrDefault(item.getTableName(), new HashMap<>());
+            resultDTO.setCount(orDefault.getOrDefault(item.getColumnName(), NumConstant.ZERO_DECIMAL).intValue());
             result.add(resultDTO);
         });
         return result;

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

@@ -621,4 +621,34 @@
         ORDER BY iru.created_time ASC
     </select>
 
+    <select id="getDataAnalyseCount" resultType="java.util.Map">
+        SELECT
+        <foreach collection="columnList" item="item" separator=",">
+            sum(case ${item} when '1' then 1 else 0 end) ${item}
+        </foreach>
+        FROM ic_resi_user
+        WHERE 1=1
+        <if test="level != null and level != ''">
+             <if test="level=='agency'">
+                AND (CONCAT(PIDS, ':', agency_id) like  CONCAT(#{id},':%'))
+            </if>
+            <if test="level=='grid'">
+                AND GRID_ID = #{id}
+            </if>
+            <if test="level=='neighborHood'">
+                AND VILLAGE_ID = #{id}
+            </if>
+            <if test="level=='building'">
+                AND BUILD_ID = #{id}
+            </if>
+        </if>
+        AND CUSTOMER_ID = #{customerId}
+        AND DEL_FLAG = 0
+        AND `STATUS` = '0'
+        <if test="tableName!='ic_resi_user'">
+            and ID in (
+            select IC_RESI_USER  from  ${tableName} where ${columnName} = '1' and  CUSTOMER_ID = #{customerId} and DEL_FLAG = '0'
+            )
+        </if>
+    </select>
 </mapper>