From 21bcf090f93f75f981244bdffa515136d743a4a7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 24 Jun 2020 09:55:50 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml index 9a3d12d95d..f49b9ac74d 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.1 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.2 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 8bd8f152a9..defb93920d 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.1 + 0.3.2 data-statistical com.epmet diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index c56d2e0cfd..d30743101a 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.9 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.10 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 295e3985c4..46a64a1a4d 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.9 + 0.3.10 com.epmet epmet-job From 512687903465293d48b6145db1df68b49742a71f Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 24 Jun 2020 12:11:10 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/issue/impl/IssueServiceImpl.java | 82 +++++++++++++------ .../main/resources/mapper/issue/IssueDao.xml | 2 +- .../java/com/epmet/DataStatsApplication.java | 2 + 3 files changed, 61 insertions(+), 25 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java index 4271cbe29e..207a7f9c30 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java @@ -2,6 +2,7 @@ package com.epmet.service.issue.impl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.dao.issue.IssueDao; import com.epmet.dto.form.LoginUserDetailsFormDTO; import com.epmet.dto.result.LoginUserDetailsResultDTO; @@ -17,6 +18,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.text.DecimalFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -35,15 +37,29 @@ public class IssueServiceImpl implements IssueService { IssueSummaryInfoResultDTO result = new IssueSummaryInfoResultDTO(); String agencyId = getAgencyId(tokenDto); IssueDataDTO data = issueDao.selectAgencyInfo(agencyId); - result.setAgencyId(agencyId); - result.setDateName(data.getDateName()); - result.setIssueTotal(data.getIssueTotal()); - result.setVotingTotal(data.getVotingTotal()); - result.setShiftProjectTotal(data.getShiftProjectTotal()); - result.setClosedTotal(data.getClosedTotal()); - result.setVotingRatio(toRatio(data.getVotingPercent())); - result.setShiftProjectRatio(toRatio(data.getShiftProjectPercent())); - result.setClosedRatio(toRatio(data.getClosedPercent())); + if (null == data) { + //获取当前日期前一天 + Date date = DateUtils.getBeforeDay(new Date()); + result.setAgencyId(agencyId); + result.setDateName(DateUtils.format(date, "yyyy.MM.dd")); + result.setIssueTotal(NumConstant.ZERO); + result.setVotingTotal(NumConstant.ZERO); + result.setShiftProjectTotal(NumConstant.ZERO); + result.setClosedTotal(NumConstant.ZERO); + result.setVotingRatio("0%"); + result.setShiftProjectRatio("0%"); + result.setClosedRatio("0%"); + } else { + result.setAgencyId(agencyId); + result.setDateName(data.getDateName()); + result.setIssueTotal(data.getIssueTotal()); + result.setVotingTotal(data.getVotingTotal()); + result.setShiftProjectTotal(data.getShiftProjectTotal()); + result.setClosedTotal(data.getClosedTotal()); + result.setVotingRatio(toRatio(data.getVotingPercent())); + result.setShiftProjectRatio(toRatio(data.getShiftProjectPercent())); + result.setClosedRatio(toRatio(data.getClosedPercent())); + } return result; } @@ -52,21 +68,39 @@ public class IssueServiceImpl implements IssueService { List list = new ArrayList<>(); String agencyId = getAgencyId(tokenDto); IssueDataDTO data = issueDao.selectAgencyInfo(agencyId); - IssueSummaryPieResultDTO voting = new IssueSummaryPieResultDTO(); - voting.setName(IssueConstant.VOTING_NAME); - voting.setValue(data.getVotingTotal()); - voting.setRatio(toRatio(data.getVotingPercent())); - list.add(voting); - IssueSummaryPieResultDTO shift = new IssueSummaryPieResultDTO(); - shift.setName(IssueConstant.SHIFT_NAME); - shift.setValue(data.getShiftProjectTotal()); - shift.setRatio(toRatio(data.getShiftProjectPercent())); - list.add(shift); - IssueSummaryPieResultDTO closed = new IssueSummaryPieResultDTO(); - closed.setName(IssueConstant.CLOSED_NAME); - closed.setValue(data.getClosedTotal()); - closed.setRatio(toRatio(data.getClosedPercent())); - list.add(closed); + if (null == data) { + IssueSummaryPieResultDTO voting = new IssueSummaryPieResultDTO(); + voting.setName(IssueConstant.VOTING_NAME); + voting.setValue(NumConstant.ZERO); + voting.setRatio("0%"); + list.add(voting); + IssueSummaryPieResultDTO shift = new IssueSummaryPieResultDTO(); + shift.setName(IssueConstant.SHIFT_NAME); + shift.setValue(NumConstant.ZERO); + shift.setRatio("0%"); + list.add(shift); + IssueSummaryPieResultDTO closed = new IssueSummaryPieResultDTO(); + closed.setName(IssueConstant.CLOSED_NAME); + closed.setValue(NumConstant.ZERO); + closed.setRatio("0%"); + list.add(closed); + } else { + IssueSummaryPieResultDTO voting = new IssueSummaryPieResultDTO(); + voting.setName(IssueConstant.VOTING_NAME); + voting.setValue(data.getVotingTotal()); + voting.setRatio(toRatio(data.getVotingPercent())); + list.add(voting); + IssueSummaryPieResultDTO shift = new IssueSummaryPieResultDTO(); + shift.setName(IssueConstant.SHIFT_NAME); + shift.setValue(data.getShiftProjectTotal()); + shift.setRatio(toRatio(data.getShiftProjectPercent())); + list.add(shift); + IssueSummaryPieResultDTO closed = new IssueSummaryPieResultDTO(); + closed.setName(IssueConstant.CLOSED_NAME); + closed.setValue(data.getClosedTotal()); + closed.setRatio(toRatio(data.getClosedPercent())); + list.add(closed); + } return list; } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml index bb9e3b4747..468f4c7a89 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml @@ -13,7 +13,7 @@ CLOSED_TOTAL, CLOSED_PERCENT, MAX(DATE_ID) AS DATE_ID, - DATE_FORMAT(DATE_ID, '%Y.%m.%d') AS DATE_NAME + DATE_FORMAT(MAX(DATE_ID), '%Y.%m.%d') AS DATE_NAME FROM fact_issue_agency_daily fiad WHERE DEL_FLAG = '0' diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java index 7da757a418..ad4e2110fa 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java @@ -3,8 +3,10 @@ package com.epmet; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.scheduling.annotation.EnableAsync; @SpringBootApplication (exclude = {DataSourceAutoConfiguration.class}) +@EnableAsync public class DataStatsApplication { public static void main(String[] args) { From d68e45c608f1308131173cfc2954322b9600132d Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 24 Jun 2020 12:15:48 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/issue/constant/IssueConstant.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/issue/constant/IssueConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/issue/constant/IssueConstant.java index 88d4f44c78..52488ea582 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/issue/constant/IssueConstant.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/issue/constant/IssueConstant.java @@ -6,8 +6,8 @@ package com.epmet.issue.constant; * @date 2020/6/22 14:07 */ public interface IssueConstant { - String MONTH = "month"; - String DATE = "date"; + String MONTH = "monthly"; + String DATE = "daily"; String VOTING_NAME = "表决中"; String SHIFT_NAME = "已转项目"; String CLOSED_NAME = "已关闭"; From 1c0f29595efd3acb8ce191fae5ff4cfbe7d340e5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 24 Jun 2020 12:31:26 +0800 Subject: [PATCH 4/7] =?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 --- .../dto/form/user/UserIncrTrendFormDTO.java | 9 ++- .../dto/form/user/UserSubAgencyFormDTO.java | 7 +- .../dto/form/user/UserSubGridFormDTO.java | 8 ++- .../dto/form/user/UserSummaryInfoFormDTO.java | 5 +- .../result/user/UserSummaryInfoResultDTO.java | 2 +- .../user/UserAnalysisController.java | 8 +-- .../com/epmet/dao/user/UserAnalysisDao.java | 8 +-- .../user/impl/UserAnalysisServiceImpl.java | 17 +++-- .../resources/mapper/user/UserAnalysisDao.xml | 64 ++++++++++--------- 9 files changed, 72 insertions(+), 56 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserIncrTrendFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserIncrTrendFormDTO.java index f4496d0199..7f888a0b0d 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserIncrTrendFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserIncrTrendFormDTO.java @@ -13,15 +13,18 @@ import java.io.Serializable; */ @Data public class UserIncrTrendFormDTO implements Serializable { + public interface AddUserInternalGroup { + } + /** * reg：注册居民 parti：参与用户，如果值为null，默认为reg */ - @NotBlank(message = "regOrPartiFlag不能为空") - private String regOrPartiFlag; + @NotBlank(message = "regOrPatiFlag不能为空", groups = {AddUserInternalGroup.class}) + private String regOrPatiFlag; /** * day：日维度 | month：月维度 | (周、季、年)… */ - @NotBlank(message = "type不能为空") + @NotBlank(message = "type不能为空", groups = {AddUserInternalGroup.class}) private String type; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSubAgencyFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSubAgencyFormDTO.java index 43d089e01a..0532ac521a 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSubAgencyFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSubAgencyFormDTO.java @@ -14,12 +14,15 @@ import java.io.Serializable; @Data public class UserSubAgencyFormDTO implements Serializable { private static final long serialVersionUID = -4558978951554887536L; + public interface AddUserInternalGroup { + } + /** * reg：注册居民 parti：参与用户，如果值为null，默认为reg */ - @NotBlank(message = "regOrPartiFlag不能为空") + @NotBlank(message = "regOrPartiFlag不能为空",groups = {AddUserInternalGroup.class}) private String regOrPartiFlag; - @NotBlank(message = "查询日期不能为空") + @NotBlank(message = "查询日期不能为空",groups = {AddUserInternalGroup.class}) private String dateId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSubGridFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSubGridFormDTO.java index c9bc20b734..f0f8303642 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSubGridFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSubGridFormDTO.java @@ -14,12 +14,16 @@ import java.io.Serializable; @Data public class UserSubGridFormDTO implements Serializable { private static final long serialVersionUID = -1815903503939673149L; + + public interface AddUserInternalGroup { + } + /** * reg：注册居民 parti：参与用户，如果值为null，默认为reg */ - @NotBlank(message = "regOrPartiFlag不能为空") + @NotBlank(message = "regOrPartiFlag不能为空", groups = {AddUserInternalGroup.class}) private String regOrPartiFlag; - @NotBlank(message = "查询日期不能为空") + @NotBlank(message = "查询日期不能为空", groups = {AddUserInternalGroup.class}) private String dateId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSummaryInfoFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSummaryInfoFormDTO.java index 9b8bed1c07..047d909ee2 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSummaryInfoFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSummaryInfoFormDTO.java @@ -14,10 +14,11 @@ import java.io.Serializable; @Data public class UserSummaryInfoFormDTO implements Serializable { private static final long serialVersionUID = -1802471335671321322L; - + public interface AddUserInternalGroup { + } /** * reg：注册居民 parti：参与用户，如果值为null，默认为reg */ - @NotBlank(message = "regOrPartiFlag不能为空") + @NotBlank(message = "regOrPartiFlag不能为空",groups = {AddUserInternalGroup.class}) private String regOrPartiFlag; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserSummaryInfoResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserSummaryInfoResultDTO.java index ccbcb009ed..a72096446c 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserSummaryInfoResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserSummaryInfoResultDTO.java @@ -19,7 +19,7 @@ public class UserSummaryInfoResultDTO implements Serializable { * 数据更新至yyyy.MM.dd */ private String currentDate; - + private String dateId; /** * 注册居民数 */ 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 da00a281d0..3cfae5cf86 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 @@ -40,7 +40,7 @@ public class UserAnalysisController { **/ @PostMapping("summaryinfo") public Result summaryInfo(@RequestBody UserSummaryInfoFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); + ValidatorUtils.validateEntity(formDTO,UserSummaryInfoFormDTO.AddUserInternalGroup.class); UserSummaryInfoResultDTO userSummaryInfoResultDTO = userService.summaryInfo(formDTO); return new Result().ok(userSummaryInfoResultDTO); } @@ -54,7 +54,7 @@ public class UserAnalysisController { **/ @PostMapping("subagency") public Result> subAgency(@RequestBody UserSubAgencyFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); + ValidatorUtils.validateEntity(formDTO,UserSubAgencyFormDTO.AddUserInternalGroup.class); List userSubAgencyResultDTO = userService.subAgency(formDTO); return new Result>().ok(userSubAgencyResultDTO); } @@ -68,7 +68,7 @@ public class UserAnalysisController { **/ @PostMapping("subgrid") public Result> subGrid(@RequestBody UserSubGridFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); + ValidatorUtils.validateEntity(formDTO, UserSubGridFormDTO.AddUserInternalGroup.class); List userSubGridResultDTO = userService.subGrid(formDTO); return new Result>().ok(userSubGridResultDTO); } @@ -82,7 +82,7 @@ public class UserAnalysisController { **/ @PostMapping("incrtrend") public Result> incrTrend(@RequestBody UserIncrTrendFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); + ValidatorUtils.validateEntity(formDTO, UserIncrTrendFormDTO.AddUserInternalGroup.class); List userIncrTrendResultDTO = userService.incrTrend(formDTO); return new Result>().ok(userIncrTrendResultDTO); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/user/UserAnalysisDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/user/UserAnalysisDao.java index feba486e41..7b72652ea8 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/user/UserAnalysisDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/user/UserAnalysisDao.java @@ -101,7 +101,7 @@ public interface UserAnalysisDao { * @return java.util.List * @param myAgencyId * @author yinzuomei - * @description + * @description 注册用户：机关、日增量折现图 近90天 * @Date 2020/6/23 11:24 **/ List selectRegDayIncr(@Param("agencyId")String myAgencyId); @@ -110,7 +110,7 @@ public interface UserAnalysisDao { * @return java.util.List * @param myAgencyId * @author yinzuomei - * @description + * @description 注册用户：机关、月增量折线图 近12个月包含当前月 * @Date 2020/6/23 11:24 **/ List selectRegMonthIncr(@Param("agencyId")String myAgencyId); @@ -119,7 +119,7 @@ public interface UserAnalysisDao { * @return java.util.List * @param myAgencyId * @author yinzuomei - * @description + * @description 参与用户：机关、日增量折线图 近90天 * @Date 2020/6/23 11:24 **/ List selectParticipationUserDayIncr(@Param("agencyId")String myAgencyId); @@ -128,7 +128,7 @@ public interface UserAnalysisDao { * @return java.util.List * @param myAgencyId * @author yinzuomei - * @description + * @description 参与用户：机关、月增量插线图 近12个月 包含当前月 * @Date 2020/6/23 11:24 **/ List selectParticipationUserMonthIncr(@Param("agencyId") String myAgencyId); 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 655b6febae..677668e0c5 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 @@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Comparator; import java.util.List; @@ -46,7 +47,7 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @Autowired private UserAnalysisDao userAnalysisDao; - + DecimalFormat decimalFormat = new DecimalFormat("0.00"); /** * @return java.lang.String * @param @@ -91,8 +92,10 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { if(null!=userSummaryInfoResultDTO){ userSummaryInfoResultDTO.setCurrentDate(DateUtils.getxAxisDatePattern(userSummaryInfoResultDTO.getCurrentDate(),".")); //提取出工具类 - userSummaryInfoResultDTO.setPartymemberProportion(userSummaryInfoResultDTO.getPartymemberProportionValue().stripTrailingZeros().toPlainString()); - userSummaryInfoResultDTO.setWarmHeartedProportion(userSummaryInfoResultDTO.getWarmHeartedProportionValue().stripTrailingZeros().toPlainString()); + String partyMemberProStr=decimalFormat.format(userSummaryInfoResultDTO.getPartymemberProportionValue()); + userSummaryInfoResultDTO.setPartymemberProportion(partyMemberProStr.concat("%")); + String warmProStr=decimalFormat.format(userSummaryInfoResultDTO.getWarmHeartedProportionValue()); + userSummaryInfoResultDTO.setWarmHeartedProportion(warmProStr.concat("%")); } logger.info(String.format("查询用户汇总信息返参%s",JSON.toJSONString(userSummaryInfoResultDTO))); return userSummaryInfoResultDTO; @@ -303,16 +306,16 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { return new ArrayList<>(); } List list=new ArrayList<>(); - if (UserAnalysisConstant.REG_FLAG.equals(formDTO.getRegOrPartiFlag()) && UserAnalysisConstant.DAY_TYPE.equals(formDTO.getType())) { + if (UserAnalysisConstant.REG_FLAG.equals(formDTO.getRegOrPatiFlag()) && UserAnalysisConstant.DAY_TYPE.equals(formDTO.getType())) { //注册用户数、日 list=userAnalysisDao.selectRegDayIncr(myAgencyId); - } else if (UserAnalysisConstant.REG_FLAG.equals(formDTO.getRegOrPartiFlag()) && UserAnalysisConstant.MONTH_TYPE.equals(formDTO.getType())) { + } 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.getRegOrPartiFlag()) && UserAnalysisConstant.DAY_TYPE.equals(formDTO.getType())) { + } 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.getRegOrPartiFlag()) && UserAnalysisConstant.MONTH_TYPE.equals(formDTO.getType())) { + } else if (UserAnalysisConstant.PARTI_FLAG.equals(formDTO.getRegOrPatiFlag()) && UserAnalysisConstant.MONTH_TYPE.equals(formDTO.getType())) { //参与用户数、月 list=userAnalysisDao.selectParticipationUserMonthIncr(myAgencyId); } else { diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml index 408cf17e61..6f559931fb 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml @@ -33,12 +33,13 @@ SELECT m.id, m.DATE_ID AS currentDate, + m.DATE_ID AS dateId, m.REG_TOTAL AS regTotal, 0 AS partiTotal, m.PARTYMEMBER_TOTAL AS partymemberTotal, - m.PARTYMEMBER_PROPORTION*100 AS partymemberProportion, + m.PARTYMEMBER_PROPORTION*100 AS partymemberProportionValue, m.WARM_HEARTED_TOTAL AS warmHeartedTotal, - m.WARM_HEARTED_PROPORTION*100 AS warmHeartedProportion + m.WARM_HEARTED_PROPORTION*100 AS warmHeartedProportionValue FROM fact_reg_user_agency_daily m WHERE @@ -55,12 +56,13 @@ SELECT m.id, m.DATE_ID AS currentDate, + m.DATE_ID AS dateId, m.REG_TOTAL AS regTotal, 0 AS partiTotal, m.PARTYMEMBER_TOTAL AS partymemberTotal, - m.PARTYMEMBER_PROPORTION*100 AS partymemberProportion, + m.PARTYMEMBER_PROPORTION*100 AS partymemberProportionValue, m.WARM_HEARTED_TOTAL AS warmHeartedTotal, - m.WARM_HEARTED_PROPORTION*100 AS warmHeartedProportion + m.WARM_HEARTED_PROPORTION*100 AS warmHeartedProportionValue FROM fact_participation_user_agency_daily m WHERE @@ -75,42 +77,42 @@ @@ -147,7 +149,7 @@ AND m.AGENCY_ID = #{agencyId} - + - + - + - +