From 532e5dcf1e1766933cf15a51be77fa0fdac0985c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 24 Jun 2020 15:04:42 +0800 Subject: [PATCH 1/4] datareport0.3.4 --- .../data-report-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml index aff27c6e10..a0810897a2 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml @@ -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.4 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 797ef55a62..9ffe6d34d7 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -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"> - 0.3.3 + 0.3.4 data-report-server From 7183e231dd6f3196ee8aee078406faff29ed11c8 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 24 Jun 2020 15:33:26 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml index a0810897a2..8f4a3b3254 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml @@ -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.4 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.5 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 9ffe6d34d7..a818e16cf5 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -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"> - 0.3.4 + 0.3.5 data-report-server From ecb18ca9c6087d47973f6a9690d7af9fe8094eb0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 24 Jun 2020 16:44:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/UserAnalysisController.java | 2 +- .../service/user/UserAnalysisService.java | 10 ++++ .../user/impl/UserAnalysisServiceImpl.java | 54 +++++++++++++++++++ 3 files changed, 65 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/user/UserAnalysisController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/user/UserAnalysisController.java index 3cfae5cf86..5f3cfaa290 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/user/UserAnalysisController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/user/UserAnalysisController.java @@ -83,7 +83,7 @@ public class UserAnalysisController { @PostMapping("incrtrend") public Result> incrTrend(@RequestBody UserIncrTrendFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, UserIncrTrendFormDTO.AddUserInternalGroup.class); - List userIncrTrendResultDTO = userService.incrTrend(formDTO); + List userIncrTrendResultDTO = userService.incrTrendV2(formDTO); return new Result>().ok(userIncrTrendResultDTO); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/UserAnalysisService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/UserAnalysisService.java index cdb05ec73b..6e0c796794 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/UserAnalysisService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/UserAnalysisService.java @@ -53,5 +53,15 @@ public interface UserAnalysisService { * @description 按日、按月查询注册用户数（参与用户数）增量折线图 * @Date 2020/6/22 13:42 **/ + @Deprecated List incrTrend(UserIncrTrendFormDTO formDTO); + + /** + * @param formDTO + * @return com.epmet.user.result.UserIncrTrendResultDTO + * @author yinzuomei + * @description 按日、按月查询注册用户数（参与用户数）增量折线图 + * @Date 2020/6/22 13:42 + **/ + List incrTrendV2(UserIncrTrendFormDTO formDTO); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java index 8a4e5924e9..9e02c60af2 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java @@ -374,6 +374,60 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { return dimList; } + @Override + public List incrTrendV2(UserIncrTrendFormDTO formDTO) { + //获取用户所属机关id + String myAgencyId = this.getMyAgency(); + List resultList=new ArrayList<>(); + List 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 initUserIncrTrendResultDTO(String type) { List list=new ArrayList<>(); if(UserAnalysisConstant.DAY_TYPE.equals(type)){ From 5dac5d3054b00a83a0503be5d139d485ffc4ea50 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Wed, 24 Jun 2020 16:54:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/constant/GroupConstant.java | 4 ++-- .../java/com/epmet/service/impl/StatsGroupServiceImpl.java | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/GroupConstant.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/GroupConstant.java index f7eccf24b1..410bb15cb2 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/GroupConstant.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/GroupConstant.java @@ -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为："; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java index 67647f3f32..b6c2ea8cf4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java @@ -67,14 +67,11 @@ public class StatsGroupServiceImpl implements StatsGroupService { customerIds.forEach(customerId -> { try { DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(date); - -// List gridsInfo = dimGridService.getGridListByCustomerId(customerId); List gridsInfo = customerGridService.getCustomerGridIdList(customerId, dimIdBean.getDateId()); - List 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 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); } }); }