elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

dev_shibei_match
jianjun 5 years ago
parent
b813247c36 5dac5d3054
commit
e50268dc08
7 changed files with 71 additions and 10 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. 2
      epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
  2. 2
      epmet-module/data-report/data-report-server/pom.xml
  3. 2
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/user/UserAnalysisController.java
  4. 10
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/UserAnalysisService.java
  5. 54
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java
  6. 4
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/GroupConstant.java
  7. 7
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java

2
epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
data-report-server:
container_name: data-report-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.3
image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.5
ports:
- "8109:8109"
network_mode: host # 使用现有网络

2
epmet-module/data-report/data-report-server/pom.xml
View File

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.3</version>
<version>0.3.5</version>
<artifactId>data-report-server</artifactId>
<parent>

2
epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/user/UserAnalysisController.java
View File

@ -83,7 +83,7 @@ public class UserAnalysisController {
@PostMapping("incrtrend")
public Result<List<UserIncrTrendResultDTO>> incrTrend(@RequestBody UserIncrTrendFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, UserIncrTrendFormDTO.AddUserInternalGroup.class);
List<UserIncrTrendResultDTO> userIncrTrendResultDTO = userService.incrTrend(formDTO);
List<UserIncrTrendResultDTO> userIncrTrendResultDTO = userService.incrTrendV2(formDTO);
return new Result<List<UserIncrTrendResultDTO>>().ok(userIncrTrendResultDTO);
}

10
epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/UserAnalysisService.java
View File

@ -53,5 +53,15 @@ public interface UserAnalysisService {
* @description 按日、按月查询注册用户数（参与用户数）增量折线图
* @Date 2020/6/22 13:42
**/
@Deprecated
List<UserIncrTrendResultDTO> incrTrend(UserIncrTrendFormDTO formDTO);
/**
* @param formDTO
* @return com.epmet.user.result.UserIncrTrendResultDTO
* @author yinzuomei
* @description 按日、按月查询注册用户数（参与用户数）增量折线图
* @Date 2020/6/22 13:42
**/
List<UserIncrTrendResultDTO> incrTrendV2(UserIncrTrendFormDTO formDTO);
}

54
epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java
View File

@ -374,6 +374,60 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
return dimList;
}
@Override
public List<UserIncrTrendResultDTO> incrTrendV2(UserIncrTrendFormDTO formDTO) {
//获取用户所属机关id
String myAgencyId = this.getMyAgency();
List<UserIncrTrendResultDTO> resultList=new ArrayList<>();
List<UserIncrTrendResDTO> list=new ArrayList<>();
if (UserAnalysisConstant.REG_FLAG.equals(formDTO.getRegOrPatiFlag()) && UserAnalysisConstant.DAY_TYPE.equals(formDTO.getType())) {
//注册用户数、日
list=userAnalysisDao.selectRegDayIncr(myAgencyId);
} else if (UserAnalysisConstant.REG_FLAG.equals(formDTO.getRegOrPatiFlag()) && UserAnalysisConstant.MONTH_TYPE.equals(formDTO.getType())) {
//注册用户数、月
list=userAnalysisDao.selectRegMonthIncr(myAgencyId);
} else if (UserAnalysisConstant.PARTI_FLAG.equals(formDTO.getRegOrPatiFlag()) && UserAnalysisConstant.DAY_TYPE.equals(formDTO.getType())) {
//参与用户数、日
list=userAnalysisDao.selectParticipationUserDayIncr(myAgencyId);
} else if (UserAnalysisConstant.PARTI_FLAG.equals(formDTO.getRegOrPatiFlag()) && UserAnalysisConstant.MONTH_TYPE.equals(formDTO.getType())) {
//参与用户数、月
list=userAnalysisDao.selectParticipationUserMonthIncr(myAgencyId);
} else {
logger.error("参数错误");
return new ArrayList<>();
}
for(UserIncrTrendResDTO userIncrTrendResDTO:list){
String date="";
if(UserAnalysisConstant.DAY_TYPE.equals(formDTO.getType())){
date=DateUtils.getxAxisDatePattern(userIncrTrendResDTO.getDateIdOrMonthId(),".");
}else if(UserAnalysisConstant.MONTH_TYPE.equals(formDTO.getType())){
date=DateUtils.getxAxisDatePattern(userIncrTrendResDTO.getDateIdOrMonthId(),"/");
}
//居民、热心居民、党员总数，用于排序
UserIncrTrendResultDTO reg=new UserIncrTrendResultDTO();
reg.setDateOrMonthId(userIncrTrendResDTO.getDateIdOrMonthId());
reg.setDate(date);
reg.setType(UserAnalysisConstant.REGISTERED_RESI);
reg.setValue(userIncrTrendResDTO.getRegIncr());
resultList.add(reg);
UserIncrTrendResultDTO warm=new UserIncrTrendResultDTO();
warm.setDateOrMonthId(userIncrTrendResDTO.getDateIdOrMonthId());
warm.setDate(date);
warm.setType(UserAnalysisConstant.WARMHEARTED);
warm.setValue(userIncrTrendResDTO.getWarmIncr());
resultList.add(warm);
UserIncrTrendResultDTO party=new UserIncrTrendResultDTO();
party.setDateOrMonthId(userIncrTrendResDTO.getDateIdOrMonthId());
party.setDate(date);
party.setType(UserAnalysisConstant.PARTYMEMBER);
party.setValue(userIncrTrendResDTO.getPartymemberIncr());
resultList.add(party);
}
return resultList;
}
private List<UserIncrTrendResultDTO> initUserIncrTrendResultDTO(String type) {
List<UserIncrTrendResultDTO> list=new ArrayList<>();
if(UserAnalysisConstant.DAY_TYPE.equals(type)){

4
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/GroupConstant.java
View File

@ -29,8 +29,8 @@ public interface GroupConstant {
String CITY = "city";
String PROVINCE = "province";
String ERRORGRIDDAILY = "groupGridDaily ==>【网格小组统计出错了... 维度：网格-日】customerId为：";
String STATS_FAILED_GRID_DAILY = "方法：groupGridDaily ==>【网格小组统计出错了... 维度：网格-日】customerId为：";
String ERRORAGENCYDAILY = "groupAgencyDaily ==>【网格小组统计出错了... 维度：机关-日】customerId为：";
String STATS_FAILED_AGENCY_DAILY = "方法：groupAgencyDaily ==>【网格小组统计出错了... 维度：机关-日】customerId为：";
}

7
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
View File

@ -67,14 +67,11 @@ public class StatsGroupServiceImpl implements StatsGroupService {
customerIds.forEach(customerId -> {
try {
DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(date);
// List<DimGridEntity> gridsInfo = dimGridService.getGridListByCustomerId(customerId);
List<GridIdListByCustomerResultDTO> gridsInfo = customerGridService.getCustomerGridIdList(customerId, dimIdBean.getDateId());
List<GroupGridDailyResultDTO> resultDTOS = groupDataService.groupGridDaily(customerId,dimIdBean,gridsInfo);
factGroupGridDailyService.statisticsGroupGridDaily(resultDTOS,customerId);
} catch (Exception e) {
log.error(GroupConstant.ERRORGRIDDAILY+customerId,e);
log.error(GroupConstant.STATS_FAILED_GRID_DAILY+customerId,e);
}
});
}
@ -101,7 +98,7 @@ public class StatsGroupServiceImpl implements StatsGroupService {
List<AgencyGroupDailyResultDTO> agencyGroupDaily = this.getAgencyGroupDaily(customerAgencyInfos, dimIdBean, customerId);
factGroupAgencyDailyService.insertGroupAgencyDaily(agencyGroupDaily,customerId);
} catch (Exception e) {
log.error(GroupConstant.ERRORAGENCYDAILY+customerId,e);
log.error(GroupConstant.STATS_FAILED_AGENCY_DAILY+customerId,e);
}
});
}

Write Preview
Loading…
Cancel
Save