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

优化🙂

master
zxc 4 years ago
parent
fc6e36d34d
commit
83e7dfc707
15 changed files with 690 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserGridDailyDTO.java
  2. 14
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserGridMonthlyDTO.java
  3. 14
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserGridDailyDTO.java
  4. 14
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserGridMonthlyDTO.java
  5. 12
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/result/UserStatisticalData.java
  6. 21
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/IncrAndTotalUserIdsResultDTO.java
  7. 20
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/IncrWithinTimeRangeResultDTO.java
  8. 22
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/PartyTotalAndIncrResultDTO.java
  9. 22
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/TotalAndIncrResultDTO.java
  10. 21
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/TotalUserIdsResultDTO.java
  11. 22
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/WarmTotalAndIncrResultDTO.java
  12. 59
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java
  13. 46
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/UserStatisticalServiceImpl.java
  14. 227
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
  15. 184
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml

14
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserGridDailyDTO.java
View File

@ -19,6 +19,8 @@ package com.epmet.dto.stats.user;
import java.io.Serializable;
import java.util.Date;
import com.epmet.commons.tools.constant.NumConstant;
import lombok.Data;
import java.math.BigDecimal;
@ -150,4 +152,16 @@ public class FactParticipationUserGridDailyDTO implements Serializable {
*/
private String delFlag;
public FactParticipationUserGridDailyDTO() {
this.regTotal = NumConstant.ZERO;
this.resiTotal = NumConstant.ZERO;
this.warmHeartedTotal = NumConstant.ZERO;
this.partymemberTotal = NumConstant.ZERO;
this.regIncr = NumConstant.ZERO;
this.warmIncr = NumConstant.ZERO;
this.partymemberIncr = NumConstant.ZERO;
this.resiProportion = NumConstant.ZERO_DECIMAL;
this.partymemberProportion = NumConstant.ZERO_DECIMAL;
this.warmHeartedProportion = NumConstant.ZERO_DECIMAL;
}
}

14
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserGridMonthlyDTO.java
View File

@ -19,6 +19,8 @@ package com.epmet.dto.stats.user;
import java.io.Serializable;
import java.util.Date;
import com.epmet.commons.tools.constant.NumConstant;
import lombok.Data;
import java.math.BigDecimal;
@ -149,4 +151,16 @@ public class FactParticipationUserGridMonthlyDTO implements Serializable {
*/
private String delFlag;
public FactParticipationUserGridMonthlyDTO() {
this.regTotal = NumConstant.ZERO;
this.resiTotal = NumConstant.ZERO;
this.warmHeartedTotal = NumConstant.ZERO;
this.partymemberTotal = NumConstant.ZERO;
this.regIncr = NumConstant.ZERO;
this.warmIncr = NumConstant.ZERO;
this.partymemberIncr = NumConstant.ZERO;
this.partymemberProportion = NumConstant.ZERO_DECIMAL;
this.resiProportion = NumConstant.ZERO_DECIMAL;
this.warmHeartedProportion = NumConstant.ZERO_DECIMAL;
}
}

14
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserGridDailyDTO.java
View File

@ -19,6 +19,8 @@ package com.epmet.dto.stats.user;
import java.io.Serializable;
import java.util.Date;
import com.epmet.commons.tools.constant.NumConstant;
import lombok.Data;
import java.math.BigDecimal;
@ -149,4 +151,16 @@ public class FactRegUserGridDailyDTO implements Serializable {
*/
private String delFlag;
public FactRegUserGridDailyDTO() {
this.regTotal = NumConstant.ZERO;
this.resiTotal = NumConstant.ZERO;
this.warmHeartedTotal = NumConstant.ZERO;
this.partymemberTotal = NumConstant.ZERO;
this.regIncr = NumConstant.ZERO;
this.warmIncr = NumConstant.ZERO;
this.partymemberIncr = NumConstant.ZERO;
this.resiProportion = NumConstant.ZERO_DECIMAL;
this.partymemberProportion = NumConstant.ZERO_DECIMAL;
this.warmHeartedProportion = NumConstant.ZERO_DECIMAL;
}
}

14
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserGridMonthlyDTO.java
View File

@ -19,6 +19,8 @@ package com.epmet.dto.stats.user;
import java.io.Serializable;
import java.util.Date;
import com.epmet.commons.tools.constant.NumConstant;
import lombok.Data;
import java.math.BigDecimal;
@ -149,4 +151,16 @@ public class FactRegUserGridMonthlyDTO implements Serializable {
*/
private String delFlag;
public FactRegUserGridMonthlyDTO() {
this.regTotal = NumConstant.ZERO;
this.resiTotal = NumConstant.ZERO;
this.warmHeartedTotal = NumConstant.ZERO;
this.partymemberTotal = NumConstant.ZERO;
this.regIncr = NumConstant.ZERO;
this.warmIncr = NumConstant.ZERO;
this.partymemberIncr = NumConstant.ZERO;
this.warmHeartedProportion = NumConstant.ZERO_DECIMAL;
this.resiProportion = NumConstant.ZERO_DECIMAL;
this.partymemberProportion = NumConstant.ZERO_DECIMAL;
}
}

12
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/result/UserStatisticalData.java
View File

@ -5,6 +5,7 @@ import com.epmet.dto.stats.user.*;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
@ -71,4 +72,15 @@ public class UserStatisticalData implements Serializable {
* yyyyMM
*/
private String monthId;
public UserStatisticalData() {
this.partiAgencyDailyList = new ArrayList<>();
this.partiGridDailyList = new ArrayList<>();
this.partiAgencyMonthlyList = new ArrayList<>();
this.partiGridMonthlyList = new ArrayList<>();
this.regAgencyDailyList = new ArrayList<>();
this.regGridDailyList = new ArrayList<>();
this.regAgencyMonthlyList = new ArrayList<>();
this.regGridMonthlyList = new ArrayList<>();
}
}

21
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/IncrAndTotalUserIdsResultDTO.java
View File

@ -0,0 +1,21 @@
package com.epmet.dto.user.result;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Author zxc
* @DateTime 2021/7/27 10:41 上午
* @DESC
*/
@Data
public class IncrAndTotalUserIdsResultDTO implements Serializable {
private static final long serialVersionUID = 9116867002773352209L;
private String gridId;
private List<String> userIds;
}

20
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/IncrWithinTimeRangeResultDTO.java
View File

@ -0,0 +1,20 @@
package com.epmet.dto.user.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2021/7/28 10:58 上午
* @DESC 查询指定时间范围内注册/参与用户增量
*/
@Data
public class IncrWithinTimeRangeResultDTO implements Serializable {
private static final long serialVersionUID = 6199087464367184830L;
private String gridId;
private Integer userCount;
}

22
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/PartyTotalAndIncrResultDTO.java
View File

@ -0,0 +1,22 @@
package com.epmet.dto.user.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2021/7/27 4:53 下午
* @DESC
*/
@Data
public class PartyTotalAndIncrResultDTO implements Serializable {
private static final long serialVersionUID = 6546408164027047797L;
private String gridId;
private Integer incr;
private Integer total;
}

22
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/TotalAndIncrResultDTO.java
View File

@ -0,0 +1,22 @@
package com.epmet.dto.user.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2021/7/27 10:14 上午
* @DESC
*/
@Data
public class TotalAndIncrResultDTO implements Serializable {
private static final long serialVersionUID = -3184476610188193106L;
private Integer total = 0;
private Integer incr = 0;
private String gridId;
}

21
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/TotalUserIdsResultDTO.java
View File

@ -0,0 +1,21 @@
package com.epmet.dto.user.result;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Author zxc
* @DateTime 2021/7/27 10:57 上午
* @DESC
*/
@Data
public class TotalUserIdsResultDTO implements Serializable {
private static final long serialVersionUID = 8236061658552220549L;
private String gridId;
private List<String> userIds;
}

22
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/WarmTotalAndIncrResultDTO.java
View File

@ -0,0 +1,22 @@
package com.epmet.dto.user.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2021/7/27 1:30 下午
* @DESC
*/
@Data
public class WarmTotalAndIncrResultDTO implements Serializable {
private static final long serialVersionUID = -4864864583111279861L;
private String gridId;
private Integer total;
private Integer incr;
}

59
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java
View File

@ -5,11 +5,7 @@ import com.epmet.dto.extract.form.StaffPatrolStatsFormDTO;
import com.epmet.dto.extract.result.UserPartyResultDTO;
import com.epmet.dto.screen.ScreenProjectDataDTO;
import com.epmet.dto.stats.form.GmUploadEventFormDTO;
import com.epmet.dto.user.result.CommonTotalAndIncCountResultDTO;
import com.epmet.dto.user.result.StaffRoleInfoDTO;
import com.epmet.dto.user.result.CustomerStaffDTO;
import com.epmet.dto.user.result.StaffPatrolRecordResult;
import com.epmet.dto.user.result.StatsStaffPatrolRecordDailyDTO;
import com.epmet.dto.user.result.*;
import com.epmet.entity.evaluationindex.screen.ScreenPartyUserRankDataEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -36,6 +32,16 @@ public interface UserDao {
**/
CommonTotalAndIncCountResultDTO selectResiTotalAndIncrByLevel(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set<String> gridIds, @Param("targetDate") Date targetDate);
/**
* @Description 查询注册用户的总量与增量【新方法】
* @Param regOrPartiFlag
* @Param gridIds
* @Param targetDate
* @author zxc
* @date 2021/7/27 10:20 上午
*/
List<TotalAndIncrResultDTO> selectResiTotalAndIncrByGridIds(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set<String> gridIds, @Param("targetDate") Date targetDate,@Param("startDate")Date startDate);
/**
* @param
* @return
@ -45,6 +51,15 @@ public interface UserDao {
**/
CommonTotalAndIncCountResultDTO selectPartyTotalAndIncr(@Param("userIds") List<String> userIds, @Param("incrUserIds") List<String> incrUserIds, @Param("targetDate") Date targetDate);
/**
* @Description 查询党员的总量与增量【新方法】
* @Param targetDate
* @Param regOrPartiFlag
* @author zxc
* @date 2021/7/27 5:08 下午
*/
List<PartyTotalAndIncrResultDTO> selectPartyTotalAndIncrNew(@Param("targetDate") Date targetDate,@Param("regOrPartiFlag") String regOrPartiFlag,@Param("startDate") Date startDate);
/**
* @param
* @return
@ -54,6 +69,18 @@ public interface UserDao {
**/
CommonTotalAndIncCountResultDTO selectWarmTotalAndIncr(@Param("userIds") List<String> userIds, @Param("incrUserIds") List<String> incrUserIds, @Param("gridIds") Set<String> gridIds, @Param("targetDate") Date targetDate);
/**
* @Description 查询热心居民的总量与增量【新方法】
* @Param userIds 总注册用户
* @Param incrUserIds 增长注册用户
* @Param gridIds 网格IDS
* @Param targetDate dateId eg：2021-07-27
* @author zxc
* @date 2021/7/27 1:31 下午
*/
List<WarmTotalAndIncrResultDTO> selectWarmTotalAndIncrByGrids(@Param("userIds") List<String> userIds, @Param("incrUserIds") List<String> incrUserIds, @Param("gridIds") Set<String> gridIds,
@Param("targetDate") Date targetDate,@Param("startDate") Date startDate);
/**
* @param
* @return
@ -63,6 +90,17 @@ public interface UserDao {
**/
List<String> selectIncrUserIds(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set<String> gridIds, @Param("targetDate") Date targetDate);
/**
* @Description 查询指定网格范围下单位时间内新增的注册用户Id【新方法】
* @Param regOrPartiFlag
* @Param gridIds
* @Param targetDate
* @author zxc
* @date 2021/7/27 10:41 上午
*/
List<IncrAndTotalUserIdsResultDTO> selectIncrUserIdsByGrids(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set<String> gridIds, @Param("targetDate") Date targetDate,
@Param("selectType") String selectType,@Param("startDate")Date startDate);
/**
* @param
* @return
@ -90,6 +128,17 @@ public interface UserDao {
**/
Integer selectResiIncrWithinTimeRange(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set<String> gridIds, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
/**
* @Description 查询指定时间范围内注册/参与用户增量【新方法】
* @Param regOrPartiFlag
* @Param gridIds
* @Param startDate
* @Param endDate
* @author zxc
* @date 2021/7/28 11:00 上午
*/
List<IncrWithinTimeRangeResultDTO> selectIncrWithinTimeRangeByGrids(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set<String> gridIds, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
/**
* @param
* @return

46
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/UserStatisticalServiceImpl.java
View File

@ -3,8 +3,10 @@ package com.epmet.service.stats.user.impl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.dao.stats.user.*;
import com.epmet.dto.stats.user.*;
import com.epmet.dto.stats.user.result.UserStatisticalData;
import com.epmet.service.stats.user.UserStatisticalService;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -12,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* @Description
* @ClassName UserStatisticalServiceImpl
@ -61,55 +65,77 @@ public class UserStatisticalServiceImpl implements UserStatisticalService {
if(null != data.getPartiAgencyDailyList() && data.getPartiAgencyDailyList().size() > NumConstant.ZERO){
participationUserAgencyDailyDao.deleteByParams(data.getDateId(),data.getCustomerId());
participationUserAgencyDailyDao.insertBatch(data.getPartiAgencyDailyList());
List<List<FactParticipationUserAgencyDailyDTO>> partition = ListUtils.partition(data.getPartiAgencyDailyList(), NumConstant.ONE_HUNDRED);
partition.forEach(p -> {
participationUserAgencyDailyDao.insertBatch(p);
});
}
if(null != data.getPartiAgencyMonthlyList() && data.getPartiAgencyMonthlyList().size() > NumConstant.ZERO){
participationUserAgencyMonthlyDao.deleteByParams(data.getMonthId(),data.getCustomerId());
participationUserAgencyMonthlyDao.insertBatch(data.getPartiAgencyMonthlyList());
List<List<FactParticipationUserAgencyMonthlyDTO>> partition = ListUtils.partition(data.getPartiAgencyMonthlyList(), NumConstant.ONE_HUNDRED);
partition.forEach(p -> {
participationUserAgencyMonthlyDao.insertBatch(p);
});
}
if(null != data.getPartiGridMonthlyList() && data.getPartiGridMonthlyList().size() > NumConstant.ZERO){
participationUserGridMonthlyDao.deleteByParams(data.getMonthId(),data.getCustomerId());
participationUserGridMonthlyDao.insertBatch(data.getPartiGridMonthlyList());
List<List<FactParticipationUserGridMonthlyDTO>> partition = ListUtils.partition(data.getPartiGridMonthlyList(), NumConstant.ONE_HUNDRED);
partition.forEach(p -> {
participationUserGridMonthlyDao.insertBatch(p);
});
}
if(null != data.getPartiGridDailyList() && data.getPartiGridDailyList().size() > NumConstant.ZERO){
participationUserGridDailyDao.deleteByParams(data.getDateId(),data.getCustomerId());
participationUserGridDailyDao.insertBatch(data.getPartiGridDailyList());
List<List<FactParticipationUserGridDailyDTO>> partition = ListUtils.partition(data.getPartiGridDailyList(), NumConstant.ONE_HUNDRED);
partition.forEach(p -> {
participationUserGridDailyDao.insertBatch(p);
});
}
if(null != data.getRegAgencyDailyList() && data.getRegAgencyDailyList().size() > NumConstant.ZERO){
regUserAgencyDailyDao.deleteByParams(data.getDateId(),data.getCustomerId());
regUserAgencyDailyDao.insertBatch(data.getRegAgencyDailyList());
List<List<FactRegUserAgencyDailyDTO>> partition = ListUtils.partition(data.getRegAgencyDailyList(), NumConstant.ONE_HUNDRED);
partition.forEach(p -> {
regUserAgencyDailyDao.insertBatch(p);
});
}
if(null != data.getRegAgencyMonthlyList() && data.getRegAgencyMonthlyList().size() > NumConstant.ZERO){
regUserAgencyMonthlyDao.deleteByParams(data.getMonthId(),data.getCustomerId());
regUserAgencyMonthlyDao.insertBatch(data.getRegAgencyMonthlyList());
List<List<FactRegUserAgencyMonthlyDTO>> partition = ListUtils.partition(data.getRegAgencyMonthlyList(), NumConstant.ONE_HUNDRED);
partition.forEach(p -> {
regUserAgencyMonthlyDao.insertBatch(p);
});
}
if(null != data.getRegGridDailyList() && data.getRegGridDailyList().size() > NumConstant.ZERO){
regUserGridDailyDao.deleteByParams(data.getDateId(),data.getCustomerId());
regUserGridDailyDao.insertBatch(data.getRegGridDailyList());
List<List<FactRegUserGridDailyDTO>> partition = ListUtils.partition(data.getRegGridDailyList(), NumConstant.ONE_HUNDRED);
partition.forEach(p -> {
regUserGridDailyDao.insertBatch(p);
});
}
if(null != data.getRegGridMonthlyList() && data.getRegGridMonthlyList().size() > NumConstant.ZERO){
regUserGridMonthlyDao.deleteByParams(data.getMonthId(),data.getCustomerId());
regUserGridMonthlyDao.insertBatch(data.getRegGridMonthlyList());
List<List<FactRegUserGridMonthlyDTO>> partition = ListUtils.partition(data.getRegGridMonthlyList(), NumConstant.ONE_HUNDRED);
partition.forEach(p -> {
regUserGridMonthlyDao.insertBatch(p);
});
}

227
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
View File

@ -17,11 +17,7 @@ import com.epmet.dto.screen.ScreenProjectDataDTO;
import com.epmet.dto.stats.form.GmUploadEventFormDTO;
import com.epmet.dto.stats.user.*;
import com.epmet.dto.stats.user.result.UserStatisticalData;
import com.epmet.dto.user.result.CommonTotalAndIncCountResultDTO;
import com.epmet.dto.user.result.StaffRoleInfoDTO;
import com.epmet.dto.user.result.CustomerStaffDTO;
import com.epmet.dto.user.result.StaffPatrolRecordResult;
import com.epmet.dto.user.result.StatsStaffPatrolRecordDailyDTO;
import com.epmet.dto.user.result.*;
import com.epmet.entity.evaluationindex.screen.ScreenPartyUserRankDataEntity;
import com.epmet.service.user.UserService;
import com.epmet.util.DimIdGenerator;
@ -120,14 +116,16 @@ public class UserServiceImpl implements UserService {
if(null != agencyMap && agencyMap.size() > NumConstant.ZERO){
agencyMap.forEach((agencyId,v) -> {
if(null != v && v.size() > NumConstant.ZERO){
queryUserData(ModuleConstant.DIM_BELONGING_GRID,
/*queryUserData(ModuleConstant.DIM_BELONGING_GRID,
agencyId,
// v.get(NumConstant.ZERO).getPid(),
v.get(NumConstant.ZERO).getCustomerId(),
new HashSet<>(v.get(NumConstant.ZERO).getGridIds()),
targetDate,
dataPacket,
timeDimension);
timeDimension);*/
traverseGridUserDispose(agencyId,v.get(NumConstant.ZERO).getCustomerId(),new HashSet<>(v.get(NumConstant.ZERO).getGridIds())
,targetDate,dataPacket,timeDimension);
}
});
}
@ -709,6 +707,221 @@ public class UserServiceImpl implements UserService {
}
/**
* @Description
* @Param agencyId 组织ID
* @Param customerId 客户ID
* @Param gridIds 网格IDS
* @Param targetDate dateId 日期 eg：2021-07-27
* @Param dataPacket 数据包
* @Param timeDimension 日期维度
* @author zxc
* @date 2021/7/27 9:53 上午
*/
void traverseGridUserDispose(String agencyId,String customerId, Set<String> gridIds, Date targetDate, UserStatisticalData dataPacket, DimIdGenerator.DimIdBean timeDimension){
if (CollectionUtils.isEmpty(gridIds)){
return;
}
dataPacket.setCustomerId(customerId);
//计算百分比使用，保留小数点后两位
NumberFormat numberFormat = NumberFormat.getInstance();
numberFormat.setMaximumFractionDigits(NumConstant.SIX);
Calendar calendar =Calendar.getInstance();
//求出T-1
calendar.setTime(new Date());
calendar.add(Calendar.DATE, NumConstant.ONE_NEG);
//指定日期 OR T-1
calendar.setTime(calendar.getTime());
//求出这个月的第一天
calendar.set(Calendar.DAY_OF_MONTH, NumConstant.ONE);
calendar.set(Calendar.HOUR_OF_DAY, NumConstant.ZERO);
calendar.set(Calendar.MINUTE, NumConstant.ZERO);
calendar.set(Calendar.SECOND, NumConstant.ZERO);
//1.计算机关下注册用户一个时间单位内的累计与增长
List<TotalAndIncrResultDTO> regData = userDao.selectResiTotalAndIncrByGridIds(ModuleConstant.REG_OR_PARTI_FLAG_REG, gridIds, targetDate,calendar.getTime());
//2.查询注册用户的Id列表
// 增长
List<IncrAndTotalUserIdsResultDTO> incrRegUsers = userDao.selectIncrUserIdsByGrids(ModuleConstant.REG_OR_PARTI_FLAG_REG, gridIds, targetDate,"incr",calendar.getTime());
List<String> incrUserIds = new ArrayList<>();
if (!CollectionUtils.isEmpty(incrRegUsers)){
incrRegUsers.forEach(i -> {
if (!CollectionUtils.isEmpty(i.getUserIds())){
incrUserIds.addAll(i.getUserIds());
}
});
}
// 全部
List<IncrAndTotalUserIdsResultDTO> totalRegUsers = userDao.selectIncrUserIdsByGrids(ModuleConstant.REG_OR_PARTI_FLAG_REG, gridIds, targetDate,"total",calendar.getTime());
List<String> totalUserIds = new ArrayList<>();
if (!CollectionUtils.isEmpty(totalRegUsers)){
totalRegUsers.forEach(t -> {
if (!CollectionUtils.isEmpty(t.getUserIds())){
totalUserIds.addAll(t.getUserIds());
}
});
}
//3.查询机关下一个时间单位内热心居民的累计与增量(注册用户)
List<WarmTotalAndIncrResultDTO> warmRegData = userDao.selectWarmTotalAndIncrByGrids(totalUserIds, incrUserIds, gridIds, targetDate,calendar.getTime());
//4.查询机关下一个时间单位内党员的累计与增量(注册用户)
List<PartyTotalAndIncrResultDTO> partyRegData = userDao.selectPartyTotalAndIncrNew(targetDate, ModuleConstant.REG_OR_PARTI_FLAG_REG,calendar.getTime());
//参与用户
//1.计算机关下参与用户一个时间单位内的累计与增长
List<TotalAndIncrResultDTO> partiData = userDao.selectResiTotalAndIncrByGridIds(ModuleConstant.REG_OR_PARTI_FLAG_PARTI, gridIds, targetDate,calendar.getTime());
//2.查询参与用户的Id列表[增长]
List<IncrAndTotalUserIdsResultDTO> incrPartiUsers = userDao.selectIncrUserIdsByGrids(ModuleConstant.REG_OR_PARTI_FLAG_PARTI, gridIds, targetDate, "incr",calendar.getTime());
List<String> incrPartiUserIds = new ArrayList<>();
if (!CollectionUtils.isEmpty(incrPartiUsers)){
incrPartiUsers.forEach(i -> {
if (!CollectionUtils.isEmpty(i.getUserIds())){
incrPartiUserIds.addAll(i.getUserIds());
}
});
}
// 查询参与用户的Id列表[全部]
List<IncrAndTotalUserIdsResultDTO> totalPartiUsers = userDao.selectIncrUserIdsByGrids(ModuleConstant.REG_OR_PARTI_FLAG_PARTI, gridIds, targetDate, "total",calendar.getTime());
List<String> totalPartiUserIds = new ArrayList<>();
if (!CollectionUtils.isEmpty(totalPartiUsers)){
totalPartiUsers.forEach(t -> {
if (!CollectionUtils.isEmpty(t.getUserIds())){
totalPartiUserIds.addAll(t.getUserIds());
}
});
}
//3.查询机关下一个时间单位内热心居民的累计与增量(参与用户)
List<WarmTotalAndIncrResultDTO> warmPartiData = userDao.selectWarmTotalAndIncrByGrids(totalPartiUserIds, incrPartiUserIds, gridIds, targetDate,calendar.getTime());
//4.查询机关下一个时间单位内党员的累计与增量(参与用户)
List<PartyTotalAndIncrResultDTO> partyPartiData = userDao.selectPartyTotalAndIncrNew(targetDate, ModuleConstant.REG_OR_PARTI_FLAG_PARTI,calendar.getTime());
/** ==================== *开始组装数据* ==================== **/
gridIds.forEach(gridId -> {
//注册用户网格级别
FactRegUserGridDailyDTO regGridD = new FactRegUserGridDailyDTO();
regGridD.setCustomerId(customerId);
regGridD.setGridId(gridId);
regGridD.setAgencyId(agencyId);
regGridD.setDateId(timeDimension.getDateId());
regGridD.setWeekId(timeDimension.getWeekId());
regGridD.setYearId(timeDimension.getYearId());
regGridD.setCreatedBy(ModuleConstant.CREATED_BY_STATISTICAL_ROBOT);
regGridD.setResiProportion(new BigDecimal(NumConstant.ONE));
//参与用户网格级别
FactParticipationUserGridDailyDTO partiGridD = new FactParticipationUserGridDailyDTO();
partiGridD.setCustomerId(customerId);
partiGridD.setGridId(gridId);
partiGridD.setAgencyId(agencyId);
partiGridD.setDateId(timeDimension.getDateId());
partiGridD.setWeekId(timeDimension.getWeekId());
partiGridD.setYearId(timeDimension.getYearId());
partiGridD.setCreatedBy(ModuleConstant.CREATED_BY_STATISTICAL_ROBOT);
partiGridD.setResiProportion(new BigDecimal(NumConstant.ONE));
FactRegUserGridMonthlyDTO regGridM = new FactRegUserGridMonthlyDTO();
regGridM.setCustomerId(customerId);
regGridM.setGridId(gridId);
regGridM.setAgencyId(agencyId);
regGridM.setMonthId(timeDimension.getMonthId());
regGridM.setQuarterId(timeDimension.getQuarterId());
regGridM.setYearId(timeDimension.getYearId());
regGridM.setPartymemberProportion(regGridD.getPartymemberProportion());
regGridM.setWarmHeartedProportion(regGridD.getWarmHeartedProportion());
regGridM.setCreatedBy(ModuleConstant.CREATED_BY_STATISTICAL_ROBOT);
regGridM.setResiProportion(new BigDecimal(NumConstant.ONE));
FactParticipationUserGridMonthlyDTO partiGridM = new FactParticipationUserGridMonthlyDTO();
partiGridM.setCustomerId(customerId);
partiGridM.setGridId(gridId);
partiGridM.setAgencyId(agencyId);
partiGridM.setMonthId(timeDimension.getMonthId());
partiGridM.setQuarterId(timeDimension.getQuarterId());
partiGridM.setYearId(timeDimension.getYearId());
partiGridM.setCreatedBy(ModuleConstant.CREATED_BY_STATISTICAL_ROBOT);
partiGridM.setResiProportion(new BigDecimal(NumConstant.ONE));
if (!CollectionUtils.isEmpty(regData)){
for (TotalAndIncrResultDTO r : regData) {
if (gridId.equals(r.getGridId())){
regGridD.setResiTotal(r.getTotal());
regGridD.setRegTotal(r.getTotal());
regGridD.setRegIncr(r.getIncr());
regGridM.setRegTotal(r.getTotal());
regGridM.setResiTotal(r.getTotal());
regGridM.setRegIncr(r.getIncr());
break;
}
}
}
if (!CollectionUtils.isEmpty(warmRegData)){
for (WarmTotalAndIncrResultDTO w : warmRegData) {
if (gridId.equals(w.getGridId())){
regGridD.setWarmHeartedTotal(w.getTotal());
regGridD.setWarmIncr(w.getIncr());
regGridM.setWarmHeartedTotal(w.getTotal());
regGridM.setWarmIncr(w.getIncr());
break;
}
}
}
if (!CollectionUtils.isEmpty(partiData)){
for (TotalAndIncrResultDTO p : partiData) {
if (gridId.equals(p.getGridId())){
partiGridD.setResiTotal(p.getTotal());
partiGridD.setRegTotal(p.getTotal());
partiGridD.setRegIncr(p.getIncr());
partiGridM.setRegTotal(p.getTotal());
partiGridM.setResiTotal(p.getTotal());
partiGridM.setRegIncr(p.getIncr());
break;
}
}
}
if (!CollectionUtils.isEmpty(partyRegData)){
for (PartyTotalAndIncrResultDTO p : partyRegData) {
if (gridId.equals(p.getGridId())){
regGridD.setPartymemberTotal(p.getTotal());
regGridD.setPartymemberIncr(p.getIncr());
regGridM.setPartymemberTotal(p.getTotal());
regGridM.setPartymemberIncr(p.getIncr());
regGridM.setPartymemberTotal(p.getTotal());
regGridM.setPartymemberIncr(p.getIncr());
break;
}
}
}
if (!CollectionUtils.isEmpty(warmPartiData)){
for (WarmTotalAndIncrResultDTO w : warmPartiData) {
if (gridId.equals(w.getGridId())){
partiGridD.setWarmHeartedTotal(w.getTotal());
partiGridD.setWarmIncr(w.getIncr());
partiGridM.setWarmHeartedTotal(w.getTotal());
partiGridM.setWarmIncr(w.getIncr());
break;
}
}
}
if (!CollectionUtils.isEmpty(partyPartiData)){
for (PartyTotalAndIncrResultDTO p : partyPartiData) {
if (gridId.equals(p.getGridId())){
partiGridD.setPartymemberTotal(p.getTotal());
partiGridD.setPartymemberIncr(p.getIncr());
partiGridM.setPartymemberTotal(p.getTotal());
partiGridM.setPartymemberIncr(p.getIncr());
break;
}
}
}
regGridD.setPartymemberProportion(regGridD.getRegTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float)regGridD.getPartymemberTotal()/(float)regGridD.getRegTotal())));
regGridD.setWarmHeartedProportion(regGridD.getRegTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float)regGridD.getWarmHeartedTotal()/(float)regGridD.getRegTotal())));
partiGridD.setPartymemberProportion(partiGridD.getPartymemberTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float)partiGridD.getPartymemberTotal()/(float)partiGridD.getRegTotal() )));
partiGridD.setWarmHeartedProportion(partiGridD.getPartymemberTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float)partiGridD.getWarmHeartedTotal()/(float)partiGridD.getRegTotal() )));
regGridM.setPartymemberProportion(regGridD.getPartymemberProportion());
regGridM.setWarmHeartedProportion(regGridD.getWarmHeartedProportion());
partiGridM.setPartymemberProportion(partiGridD.getPartymemberProportion());
partiGridM.setWarmHeartedProportion(partiGridD.getWarmHeartedProportion());
dataPacket.getRegGridDailyList().add(regGridD);
dataPacket.getPartiGridDailyList().add(partiGridD);
dataPacket.getRegGridMonthlyList().add(regGridM);
dataPacket.getPartiGridMonthlyList().add(partiGridM);
});
}
/**
* @return java.util.List<java.lang.String>

184
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
View File

@ -627,6 +627,190 @@
AND DATE_FORMAT( r.ACTRUAL_END_TIME, '%Y%m%d' ) = #{dateId}
</select>
<!-- 查询注册用户的总量与增量【新方法】 -->
<select id="selectResiTotalAndIncrByGridIds" resultType="com.epmet.dto.user.result.TotalAndIncrResultDTO">
SELECT
IFNULL(count( DISTINCT rr.USER_ID ),0) AS total,
rr.GRID_ID,
IFNULL(t.userCount,0) AS incr
FROM REGISTER_RELATION rr
LEFT JOIN (
SELECT
IFNULL(count(DISTINCT USER_ID),0) AS userCount,
GRID_ID
FROM
REGISTER_RELATION
WHERE
DEL_FLAG = '0'
<if test='regOrPartiFlag == "parti" '>
AND ((FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1') OR (FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1'))
</if>
<if test='regOrPartiFlag == "reg" '>
AND FIRST_REGISTER = '1'
</if>
<foreach collection="gridIds" item="gridId" index="index" open="AND ( " separator=" OR " close=")">
GRID_ID = #{gridId}
</foreach>
AND DATE_FORMAT(CREATED_TIME,"%Y-%m-%d") BETWEEN DATE_FORMAT(#{startDate},"%Y-%m-%d") AND DATE_FORMAT(
IF(null != #{targetDate} OR '' !=#{targetDate},#{targetDate},DATE_SUB(CURDATE(), INTERVAL 1 DAY ))
,"%Y-%m-%d")
GROUP BY GRID_ID
) t ON ( t.grid_id = rr.GRID_ID )
WHERE
rr.DEL_FLAG = '0'
<if test='regOrPartiFlag == "parti" '>
AND ((rr.FIRST_REGISTER = '1' AND rr.REGISTER = '1' AND rr.PARTICIPATION = '1') OR (rr.FIRST_REGISTER = '0' AND rr.REGISTER = '0' AND rr.PARTICIPATION = '1'))
</if>
<if test='regOrPartiFlag == "reg" '>
AND rr.FIRST_REGISTER = '1'
</if>
<foreach collection="gridIds" item="gridId" index="index" open="AND ( " separator=" OR " close=")">
rr.GRID_ID = #{gridId}
</foreach>
AND DATE_FORMAT(rr.CREATED_TIME,"%Y-%m-%d") <![CDATA[<=]]> IF(null != #{targetDate} OR '' !=#{targetDate},DATE_FORMAT(#{targetDate},"%Y-%m-%d"),DATE_FORMAT( DATE_SUB( CURDATE( ), INTERVAL 1 DAY ),"%Y-%m-%d"))
GROUP BY GRID_ID
</select>
<resultMap id="selectIncrUserIdsByGridsMap" type="com.epmet.dto.user.result.IncrAndTotalUserIdsResultDTO">
<result property="gridId" column="gridId"/>
<collection property="userIds" ofType="java.lang.String">
<result column="userIds"/>
</collection>
</resultMap>
<!-- 查询指定网格范围下单位时间内新增的注册用户Id【新方法】 -->
<select id="selectIncrUserIdsByGrids" resultMap="selectIncrUserIdsByGridsMap">
SELECT
DISTINCT(USER_ID) AS userIds,
GRID_ID
FROM
REGISTER_RELATION
WHERE
DEL_FLAG = '0'
<if test='regOrPartiFlag == "parti" '>
AND ((FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1') OR (FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1'))
</if>
<if test='regOrPartiFlag == "reg" '>
AND FIRST_REGISTER = '1'
</if>
<foreach collection="gridIds" item="gridId" index="index" open="AND ( " separator=" OR " close=")">
GRID_ID = #{gridId}
</foreach>
<if test='selectType == "incr" '>
AND DATE_FORMAT(CREATED_TIME,"%Y-%m-%d") BETWEEN DATE_FORMAT(#{startDate},"%Y-%m-%d") AND
DATE_FORMAT(IF(null != #{targetDate} OR '' !=#{targetDate},#{targetDate},DATE_SUB(CURDATE(),INTERVAL 1 DAY)),"%Y-%m-%d")
</if>
<if test='selectType == "total" '>
AND DATE_FORMAT(CREATED_TIME,"%Y-%m-%d") <![CDATA[<=]]> IF(null != #{targetDate} OR '' !=#{targetDate},DATE_FORMAT(#{targetDate},"%Y-%m-%d"),DATE_FORMAT( DATE_SUB( CURDATE( ), INTERVAL 1 DAY ),"%Y-%m-%d"))
</if>
GROUP BY GRID_ID
</select>
<!-- 查询热心居民的总量与增量【新方法】 -->
<select id="selectWarmTotalAndIncrByGrids" resultType="com.epmet.dto.user.result.WarmTotalAndIncrResultDTO">
SELECT
IFNULL(COUNT(DISTINCT ur.USER_ID),0) AS total,
ur.GRID_ID,
IFNULL(t.userCount,0) AS incr
FROM USER_ROLE ur
LEFT JOIN EPMET_ROLE erole ON ( ur.ROLE_ID = erole.ID AND erole.DEL_FLAG = '0' )
LEFT JOIN (
SELECT
COUNT( DISTINCT ur.USER_ID ) AS userCount,
ur.GRID_ID
FROM USER_ROLE ur
LEFT JOIN EPMET_ROLE erole ON (ur.ROLE_ID = erole.ID AND erole.DEL_FLAG = '0')
WHERE ur.DEL_FLAG = '0'
<if test="null != incrUserIds and incrUserIds.size() > 0 ">
<foreach collection="incrUserIds" item="incrUserId" index="index" open="AND ( " separator=" OR " close=")">
ur.USER_ID = #{incrUserId}
</foreach>
</if>
<foreach collection="gridIds" item="gridId" index="index" open="AND ( " separator=" OR " close=")">
ur.GRID_ID = #{gridId}
</foreach>
AND DATE_FORMAT(ur.CREATED_TIME,"%Y-%m-%d") BETWEEN DATE_FORMAT(#{startDate},"%Y-%m-%d") AND
DATE_FORMAT(IF(null != #{targetDate} OR '' !=#{targetDate},#{targetDate},DATE_SUB(CURDATE(),INTERVAL 1 DAY)),"%Y-%m-%d")
AND erole.ROLE_NAME = '热心居民'
GROUP BY ur.GRID_ID
) t ON ( t.GRID_ID = ur.GRID_ID )
WHERE ur.DEL_FLAG = '0'
<if test="incrUserIds.size() > 0 and null != incrUserIds ">
<foreach collection="incrUserIds" item="incrUserId" index="index" open="AND ( " separator=" OR " close=")">
ur.USER_ID = #{incrUserId}
</foreach>
</if>
<foreach collection="gridIds" item="gridId" index="index" open="AND ( " separator=" OR " close=")">
ur.GRID_ID = #{gridId}
</foreach>
AND DATE_FORMAT(ur.CREATED_TIME,"%Y-%m-%d") <![CDATA[<=]]> IF(null != #{targetDate} OR '' !=#{targetDate},DATE_FORMAT(#{targetDate},"%Y-%m-%d"),DATE_FORMAT( DATE_SUB( CURDATE( ), INTERVAL 1 DAY ),"%Y-%m-%d"))
AND erole.ROLE_NAME = '热心居民'
GROUP BY ur.GRID_ID
</select>
<!-- 查询党员的总量与增量【新方法】 -->
<select id="selectPartyTotalAndIncrNew" resultType="com.epmet.dto.user.result.PartyTotalAndIncrResultDTO">
SELECT
IFNULL(count(urole.USER_ID),0) AS total,
rr.GRID_ID,
IFNULL(t.userCount,0) AS incr
FROM USER_ROLE urole
LEFT JOIN EPMET_ROLE erole ON (urole.ROLE_ID = erole.ID AND erole.DEL_FLAG = '0')
LEFT JOIN register_relation rr ON (rr.USER_ID = urole.USER_ID)
LEFT JOIN (
SELECT
count(urole.USER_ID) AS userCount,
rr.GRID_ID
FROM USER_ROLE urole
LEFT JOIN EPMET_ROLE erole ON (urole.ROLE_ID = erole.ID AND erole.DEL_FLAG = '0')
LEFT JOIN register_relation rr ON (rr.USER_ID = urole.USER_ID)
WHERE
urole.DEL_FLAG = '0'
AND erole.ROLE_NAME = '党员'
AND DATE_FORMAT(rr.CREATED_TIME,"%Y-%m-%d") BETWEEN DATE_FORMAT(#{startDate},"%Y-%m-%d") AND
DATE_FORMAT(IF(null != #{targetDate} OR '' !=#{targetDate},#{targetDate},DATE_SUB(CURDATE(),INTERVAL 1 DAY)),"%Y-%m-%d")
<if test='regOrPartiFlag == "parti" '>
AND ((rr.FIRST_REGISTER = '1' AND rr.REGISTER = '1' AND rr.PARTICIPATION = '1') OR (rr.FIRST_REGISTER = '0' AND rr.REGISTER = '0' AND rr.PARTICIPATION = '1'))
</if>
<if test='regOrPartiFlag == "reg" '>
AND rr.FIRST_REGISTER = '1'
</if>
GROUP BY rr.GRID_ID
) t ON (t.GRID_ID = rr.GRID_ID)
WHERE
urole.DEL_FLAG = '0'
AND DATE_FORMAT(rr.CREATED_TIME,"%Y-%m-%d") <![CDATA[<=]]> DATE_FORMAT( IF(null != #{targetDate} OR '' != #{targetDate},#{targetDate}, DATE_SUB(CURDATE(),INTERVAL 1 DAY)),'%Y-%m-%d')
<if test='regOrPartiFlag == "parti" '>
AND ((rr.FIRST_REGISTER = '1' AND rr.REGISTER = '1' AND rr.PARTICIPATION = '1') OR (rr.FIRST_REGISTER = '0' AND rr.REGISTER = '0' AND rr.PARTICIPATION = '1'))
</if>
<if test='regOrPartiFlag == "reg" '>
AND rr.FIRST_REGISTER = '1'
</if>
AND erole.ROLE_NAME = '党员'
GROUP BY rr.GRID_ID
</select>
<!-- 查询指定时间范围内注册/参与用户增量【新方法】 -->
<select id="selectIncrWithinTimeRangeByGrids" resultType="com.epmet.dto.user.result.IncrWithinTimeRangeResultDTO">
SELECT
IFNULL(COUNT( distinct USER_ID),0) AS userCount,
GRID_ID
FROM register_relation
WHERE
DEL_FLAG = '0'
<if test='regOrPartiFlag == "parti" '>
AND ((FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1') OR (FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1'))
</if>
<if test='regOrPartiFlag == "reg" '>
AND FIRST_REGISTER = '1'
</if>
<foreach collection="gridIds" item="gridId" index="index" open="AND ( " separator=" OR " close=")">
GRID_ID = #{gridId}
</foreach>
AND CREATED_TIME <![CDATA[>=]]> DATE_FORMAT(#{startDate},"%Y-%m-%d")
AND CREATED_TIME <![CDATA[<=]]> DATE_FORMAT(#{endDate},"%Y-%m-%d")
GROUP BY GRID_ID
</select>
<delete id="delGmUploadEvent">
DELETE
FROM

Write Preview
Loading…
Cancel
Save