luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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
master
jianjun 4 years ago
parent
10bc2d327a e9ff18cd60
commit
84b92979ed
4 changed files with 101 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 82
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
  2. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcStatsResiWarnDao.java
  3. 19
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java
  4. 30
      epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

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

@ -27,6 +27,7 @@ import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -65,109 +66,111 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
* 查询主表 * 查询主表
* *
* @param icResiUserId * @param icResiUserId
* @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>> * @return java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
* @author yinzuomei * @author yinzuomei
* @date 2021/10/28 11:20 上午 * @date 2021/10/28 11:20 上午
*/ */
List<Map<String, Object>> selectListMapById(@Param("customerId") String customerId, List<Map<String, Object>> selectListMapById(@Param("customerId") String customerId,
@Param("icResiUserId")String icResiUserId); @Param("icResiUserId") String icResiUserId);
/** /**
* 根据ic_resi_user.id去查询各个子表记录，动态传入表名 * 根据ic_resi_user.id去查询各个子表记录，动态传入表名
* *
* @param icResiUserId * @param icResiUserId
* @param subTableName * @param subTableName
* @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>> * @return java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
* @author yinzuomei * @author yinzuomei
* @date 2021/10/28 11:19 上午 * @date 2021/10/28 11:19 上午
*/ */
List<Map<String, Object>> selectSubTableRecords(@Param("customerId")String customerId, List<Map<String, Object>> selectSubTableRecords(@Param("customerId") String customerId,
@Param("icResiUserId") String icResiUserId, @Param("icResiUserId") String icResiUserId,
@Param("subTableName") String subTableName); @Param("subTableName") String subTableName);
int updateToDel(String icResiUserId); int updateToDel(String icResiUserId);
int updateSubTableToDel(@Param("subTalbeName") String subTalbeName, @Param("icResiUserId")String icResiUserId); int updateSubTableToDel(@Param("subTalbeName") String subTalbeName, @Param("icResiUserId") String icResiUserId);
/** /**
* 接口名称 * 接口名称
* *
* @param customerId 客户id * @param customerId 客户id
* @param resultTableName 获取哪个表的数据？？？ * @param resultTableName 获取哪个表的数据？？？
* @param conditions 前端传入的查询入参 * @param conditions 前端传入的查询入参
* @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>> * @return java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
* @author yinzuomei * @author yinzuomei
* @date 2021/11/2 10:35 上午 * @date 2021/11/2 10:35 上午
*/ */
List<Map<String,Object>> dynamicQuery(@Param("customerId")String customerId, List<Map<String, Object>> dynamicQuery(@Param("customerId") String customerId,
@Param("resultTableName")String resultTableName, @Param("resultTableName") String resultTableName,
@Param("conditions") List<ResiUserQueryValueDTO> conditions, @Param("conditions") List<ResiUserQueryValueDTO> conditions,
@Param("subTables") List<String> subTables, @Param("subTables") List<String> subTables,
@Param("currentStaffAgencyId")String currentStaffAgencyId, @Param("currentStaffAgencyId") String currentStaffAgencyId,
@Param("staffOrgPath")String staffOrgPath); @Param("staffOrgPath") String staffOrgPath);
/** /**
* @Description 查询个人信息
* @param userId * @param userId
* @Description 查询个人信息
* @author zxc * @author zxc
* @date 2021/11/3 10:28 上午 * @date 2021/11/3 10:28 上午
*/ */
PersonDataResultDTO personData(@Param("userId") String userId); PersonDataResultDTO personData(@Param("userId") String userId);
/** /**
* @Description 根据名字，组织查询人
* @param name * @param name
* @param agencyId * @param agencyId
* @Description 根据名字，组织查询人
* @author zxc * @author zxc
* @date 2021/11/3 2:05 下午 * @date 2021/11/3 2:05 下午
*/ */
List<SearchByNameResultDTO> searchByName(@Param("name")String name, @Param("agencyId")String agencyId,@Param("pageNo")Integer pageNo); List<SearchByNameResultDTO> searchByName(@Param("name") String name, @Param("agencyId") String agencyId, @Param("pageNo") Integer pageNo);
Set<String> selectUserDemandCode(String icResiUserId); Set<String> selectUserDemandCode(String icResiUserId);
String selectCategoryNames(@Param("customerId") String customerId,@Param("codeSet") Set<String> codeSet);
String selectCategoryNames(@Param("customerId") String customerId, @Param("codeSet") Set<String> codeSet);
@MapKey("HOME_ID") @MapKey("HOME_ID")
Map<String, Map<String, String>> getHomeUserCategoryCount(@Param("buildId") String buildId); Map<String, Map<String, String>> getHomeUserCategoryCount(@Param("buildId") String buildId);
/** /**
* @Description 根据userId查询志愿者
* @param userId * @param userId
* @Description 根据userId查询志愿者
* @author zxc * @author zxc
* @date 2021/11/5 5:44 下午 * @date 2021/11/5 5:44 下午
*/ */
List<String> selectVolunteerByUserId(@Param("userId")String userId); List<String> selectVolunteerByUserId(@Param("userId") String userId);
/** /**
* @Description 查询人员类别
* @param columns * @param columns
* @Description 查询人员类别
* @author zxc * @author zxc
* @date 2021/11/8 1:50 下午 * @date 2021/11/8 1:50 下午
*/ */
Map<String,String> selectPersonType(@Param("columns")List<String> columns,@Param("customerId")String customerId, Map<String, String> selectPersonType(@Param("columns") List<String> columns, @Param("customerId") String customerId,
@Param("tableName")String tableName,@Param("userId")String userId); @Param("tableName") String tableName, @Param("userId") String userId);
/** /**
* @Author sun * @Author sun
* @Description 查询居民信息 * @Description 查询居民信息
**/ **/
IcResiUserDTO getResiUser(IcResiUserDTO dto); IcResiUserDTO getResiUser(IcResiUserDTO dto);
/** /**
*
* @param agencyId * @param agencyId
* @param gridId * @param gridId
* @param name * @param name
* @return * @return
*/ */
List<DemandUserResDTO> selectDemandUsers(@Param("agencyId") String agencyId, List<DemandUserResDTO> selectDemandUsers(@Param("agencyId") String agencyId,
@Param("gridId")String gridId, @Param("gridId") String gridId,
@Param("name")String name); @Param("name") String name);
IcResiUserDTO selectIdByIdCard(@Param("customerId") String customerId, IcResiUserDTO selectIdByIdCard(@Param("customerId") String customerId,
@Param("idNum")String idNum, @Param("idNum") String idNum,
@Param("icResiUserId")String icResiUserId); @Param("icResiUserId") String icResiUserId);
/** /**
* 获取居民名称，家属名称和id * 获取居民名称，家属名称和id
*
* @param isResiUserId * @param isResiUserId
* @return * @return
*/ */
@ -184,6 +187,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
/** /**
* 组织内党员年龄范围统计 * 组织内党员年龄范围统计
*
* @Param orgType * @Param orgType
* @Param orgId * @Param orgId
* @Return {@link List< OptionDataResultDTO>} * @Return {@link List< OptionDataResultDTO>}
@ -194,6 +198,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
/** /**
* 获取年龄范围内党员列表 * 获取年龄范围内党员列表
*
* @Param orgType * @Param orgType
* @Param orgId * @Param orgId
* @Param min * @Param min
@ -208,6 +213,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
/** /**
* 党员文化程度统计 * 党员文化程度统计
*
* @Param orgType * @Param orgType
* @Param orgId * @Param orgId
* @Return {@link List< OptionDataResultDTO>} * @Return {@link List< OptionDataResultDTO>}
@ -218,6 +224,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
/** /**
* 按教育程度获取党员列表 * 按教育程度获取党员列表
*
* @Param orgType * @Param orgType
* @Param orgId * @Param orgId
* @Param code * @Param code
@ -226,7 +233,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
* @Date 2021/12/10 17:24 * @Date 2021/12/10 17:24
*/ */
List<PartyMemberEducationResultDTO> getPartyMemberEducationList(@Param("orgType") String orgType, @Param("orgId") String orgId, List<PartyMemberEducationResultDTO> getPartyMemberEducationList(@Param("orgType") String orgType, @Param("orgId") String orgId,
@Param("code") String code); @Param("code") String code);
List<VolunteerDistributionResultDTO.Distribution> listIcResiInfosByUserIds(@Param("userIds") List<String> userIds); List<VolunteerDistributionResultDTO.Distribution> listIcResiInfosByUserIds(@Param("userIds") List<String> userIds);
@ -239,4 +246,19 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
List<String> icUserCustomerIds(); List<String> icUserCustomerIds();
List<Map<String, String>> getIcUserList(@Param("customerId") String customerId); 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);
} }

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

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

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

@ -2,6 +2,7 @@ package com.epmet.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.exception.RenException;
import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
@ -27,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -194,6 +196,18 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
List<IcResiCategoryStatsConfigDTO> icResiCategoryStatsConfigDTOList = statsResult.getData(); List<IcResiCategoryStatsConfigDTO> icResiCategoryStatsConfigDTOList = statsResult.getData();
//获取tableName 和columnName //获取tableName 和columnName
List<IcStatsResiResultDTO> result = new ArrayList<>(); 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->{ icResiCategoryStatsConfigDTOList.forEach(item->{
IcStatsResiResultDTO resultDTO = new IcStatsResiResultDTO(); IcStatsResiResultDTO resultDTO = new IcStatsResiResultDTO();
resultDTO.setId(item.getId()); resultDTO.setId(item.getId());
@ -202,8 +216,9 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
resultDTO.setHouseShowIcon(item.getHouseShowIcon()); resultDTO.setHouseShowIcon(item.getHouseShowIcon());
resultDTO.setManagementIcon(item.getManagementIcon()); resultDTO.setManagementIcon(item.getManagementIcon());
//根据id ，level 获取count //根据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); result.add(resultDTO);
}); });
return result; return result;

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

@ -621,4 +621,34 @@
ORDER BY iru.created_time ASC ORDER BY iru.created_time ASC
</select> </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> </mapper>

Write Preview
Loading…
Cancel
Save