From 75f89ab18520b1160bd1168402749687194120b9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Jun 2020 18:25:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=83=BD=E5=8A=9B-=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=9B=B8=E5=85=B3=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E6=8F=90=E4=BA=A4v3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...onstant.java => UserAnalysisConstant.java} | 2 +- .../com/epmet/{user => dto/form}/.gitignore | 0 .../form/user}/UserIncrTrendFormDTO.java | 2 +- .../form/user}/UserSubAgencyFormDTO.java | 2 +- .../form/user}/UserSubGridFormDTO.java | 2 +- .../form/user}/UserSummaryInfoFormDTO.java | 2 +- .../main/java/com/epmet/dto/result/.gitignore | 0 .../result/user}/UserIncrTrendResultDTO.java | 2 +- .../result/user}/UserSubAgencyResultDTO.java | 2 +- .../result/user}/UserSubGridResultDTO.java | 2 +- .../user}/UserSummaryInfoResultDTO.java | 2 +- .../user/UserAnalysisController.java | 16 ++++----- .../com/epmet/dao/user/UserAnalysisDao.java | 2 +- .../service/user/UserAnalysisService.java | 17 +++++----- .../user/impl/UserAnalysisServiceImpl.java | 34 +++++++++++-------- .../resources/mapper/user/UserAnalysisDao.xml | 5 +-- 16 files changed, 49 insertions(+), 43 deletions(-) rename epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/{DataReportModuleConstant.java => UserAnalysisConstant.java} (91%) rename epmet-module/data-report/data-report-client/src/main/java/com/epmet/{user => dto/form}/.gitignore (100%) rename epmet-module/data-report/data-report-client/src/main/java/com/epmet/{user/form => dto/form/user}/UserIncrTrendFormDTO.java (95%) rename epmet-module/data-report/data-report-client/src/main/java/com/epmet/{user/form => dto/form/user}/UserSubAgencyFormDTO.java (94%) rename epmet-module/data-report/data-report-client/src/main/java/com/epmet/{user/form => dto/form/user}/UserSubGridFormDTO.java (94%) rename epmet-module/data-report/data-report-client/src/main/java/com/epmet/{user/form => dto/form/user}/UserSummaryInfoFormDTO.java (94%) create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/.gitignore rename epmet-module/data-report/data-report-client/src/main/java/com/epmet/{user/result => dto/result/user}/UserIncrTrendResultDTO.java (94%) rename epmet-module/data-report/data-report-client/src/main/java/com/epmet/{user/result => dto/result/user}/UserSubAgencyResultDTO.java (94%) rename epmet-module/data-report/data-report-client/src/main/java/com/epmet/{user/result => dto/result/user}/UserSubGridResultDTO.java (94%) rename epmet-module/data-report/data-report-client/src/main/java/com/epmet/{user/result => dto/result/user}/UserSummaryInfoResultDTO.java (97%) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataReportModuleConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/UserAnalysisConstant.java similarity index 91% rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataReportModuleConstant.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/UserAnalysisConstant.java index 09a81ccbb4..9041875b52 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataReportModuleConstant.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/UserAnalysisConstant.java @@ -6,7 +6,7 @@ package com.epmet.constant; * @author yinzuomei@elink-cn.com * @date 2020/6/22 16:35 */ -public interface DataReportModuleConstant { +public interface UserAnalysisConstant { /** * reg：注册居民 parti：参与用户，如果值为null，默认为reg diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/.gitignore b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/.gitignore similarity index 100% rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/.gitignore rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/.gitignore diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/UserIncrTrendFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserIncrTrendFormDTO.java similarity index 95% rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/UserIncrTrendFormDTO.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserIncrTrendFormDTO.java index 3267d88ac7..f4496d0199 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/UserIncrTrendFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserIncrTrendFormDTO.java @@ -1,4 +1,4 @@ -package com.epmet.user.form; +package com.epmet.dto.form.user; import lombok.Data; diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/UserSubAgencyFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSubAgencyFormDTO.java similarity index 94% rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/UserSubAgencyFormDTO.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSubAgencyFormDTO.java index 1116bc33b0..5f7f22b089 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/UserSubAgencyFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSubAgencyFormDTO.java @@ -1,4 +1,4 @@ -package com.epmet.user.form; +package com.epmet.dto.form.user; import lombok.Data; diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/UserSubGridFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSubGridFormDTO.java similarity index 94% rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/UserSubGridFormDTO.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSubGridFormDTO.java index 6a19060ae5..81e54c8756 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/UserSubGridFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSubGridFormDTO.java @@ -1,4 +1,4 @@ -package com.epmet.user.form; +package com.epmet.dto.form.user; import lombok.Data; diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/UserSummaryInfoFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSummaryInfoFormDTO.java similarity index 94% rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/UserSummaryInfoFormDTO.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSummaryInfoFormDTO.java index 3a25b4ac24..9b8bed1c07 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/UserSummaryInfoFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSummaryInfoFormDTO.java @@ -1,4 +1,4 @@ -package com.epmet.user.form; +package com.epmet.dto.form.user; import lombok.Data; diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/.gitignore b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/.gitignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/UserIncrTrendResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserIncrTrendResultDTO.java similarity index 94% rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/UserIncrTrendResultDTO.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserIncrTrendResultDTO.java index 38436e3533..d36d7aba03 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/UserIncrTrendResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserIncrTrendResultDTO.java @@ -1,4 +1,4 @@ -package com.epmet.user.result; +package com.epmet.dto.result.user; import lombok.Data; diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/UserSubAgencyResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserSubAgencyResultDTO.java similarity index 94% rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/UserSubAgencyResultDTO.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserSubAgencyResultDTO.java index f1552b799c..38969b9199 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/UserSubAgencyResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserSubAgencyResultDTO.java @@ -1,4 +1,4 @@ -package com.epmet.user.result; +package com.epmet.dto.result.user; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/UserSubGridResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserSubGridResultDTO.java similarity index 94% rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/UserSubGridResultDTO.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserSubGridResultDTO.java index bf0df3cd4e..493f6ebc98 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/UserSubGridResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserSubGridResultDTO.java @@ -1,4 +1,4 @@ -package com.epmet.user.result; +package com.epmet.dto.result.user; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/UserSummaryInfoResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserSummaryInfoResultDTO.java similarity index 97% rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/UserSummaryInfoResultDTO.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserSummaryInfoResultDTO.java index f44d5ec054..ccbcb009ed 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/UserSummaryInfoResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserSummaryInfoResultDTO.java @@ -1,4 +1,4 @@ -package com.epmet.user.result; +package com.epmet.dto.result.user; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; 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 7ac47ba233..2855f60a7f 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 @@ -2,15 +2,15 @@ package com.epmet.controller.user; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.user.UserIncrTrendFormDTO; +import com.epmet.dto.form.user.UserSubAgencyFormDTO; +import com.epmet.dto.form.user.UserSubGridFormDTO; +import com.epmet.dto.form.user.UserSummaryInfoFormDTO; +import com.epmet.dto.result.user.UserIncrTrendResultDTO; +import com.epmet.dto.result.user.UserSubAgencyResultDTO; +import com.epmet.dto.result.user.UserSubGridResultDTO; +import com.epmet.dto.result.user.UserSummaryInfoResultDTO; import com.epmet.service.user.UserAnalysisService; -import com.epmet.user.form.UserIncrTrendFormDTO; -import com.epmet.user.form.UserSubAgencyFormDTO; -import com.epmet.user.form.UserSubGridFormDTO; -import com.epmet.user.form.UserSummaryInfoFormDTO; -import com.epmet.user.result.UserIncrTrendResultDTO; -import com.epmet.user.result.UserSubAgencyResultDTO; -import com.epmet.user.result.UserSubGridResultDTO; -import com.epmet.user.result.UserSummaryInfoResultDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; 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 e42caca3b9..80ac956bf4 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 @@ -1,7 +1,7 @@ package com.epmet.dao.user; -import com.epmet.user.result.UserSummaryInfoResultDTO; +import com.epmet.dto.result.user.UserSummaryInfoResultDTO; import org.apache.ibatis.annotations.Mapper; /** 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 b01bd97dd1..7f99be9033 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 @@ -1,13 +1,14 @@ package com.epmet.service.user; -import com.epmet.user.form.UserIncrTrendFormDTO; -import com.epmet.user.form.UserSubAgencyFormDTO; -import com.epmet.user.form.UserSubGridFormDTO; -import com.epmet.user.form.UserSummaryInfoFormDTO; -import com.epmet.user.result.UserIncrTrendResultDTO; -import com.epmet.user.result.UserSubAgencyResultDTO; -import com.epmet.user.result.UserSubGridResultDTO; -import com.epmet.user.result.UserSummaryInfoResultDTO; + +import com.epmet.dto.form.user.UserIncrTrendFormDTO; +import com.epmet.dto.form.user.UserSubAgencyFormDTO; +import com.epmet.dto.form.user.UserSubGridFormDTO; +import com.epmet.dto.form.user.UserSummaryInfoFormDTO; +import com.epmet.dto.result.user.UserIncrTrendResultDTO; +import com.epmet.dto.result.user.UserSubAgencyResultDTO; +import com.epmet.dto.result.user.UserSubGridResultDTO; +import com.epmet.dto.result.user.UserSummaryInfoResultDTO; /** * 组织能力用户相关接口 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 706a5e6d63..9291f7bd27 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 @@ -1,22 +1,23 @@ package com.epmet.service.user.impl; +import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.Result; -import com.epmet.constant.DataReportModuleConstant; +import com.epmet.constant.UserAnalysisConstant; import com.epmet.dao.user.UserAnalysisDao; import com.epmet.dto.form.LoginUserDetailsFormDTO; +import com.epmet.dto.form.user.UserIncrTrendFormDTO; +import com.epmet.dto.form.user.UserSubAgencyFormDTO; +import com.epmet.dto.form.user.UserSubGridFormDTO; +import com.epmet.dto.form.user.UserSummaryInfoFormDTO; import com.epmet.dto.result.LoginUserDetailsResultDTO; +import com.epmet.dto.result.user.UserIncrTrendResultDTO; +import com.epmet.dto.result.user.UserSubAgencyResultDTO; +import com.epmet.dto.result.user.UserSubGridResultDTO; +import com.epmet.dto.result.user.UserSummaryInfoResultDTO; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.user.UserAnalysisService; -import com.epmet.user.form.UserIncrTrendFormDTO; -import com.epmet.user.form.UserSubAgencyFormDTO; -import com.epmet.user.form.UserSubGridFormDTO; -import com.epmet.user.form.UserSummaryInfoFormDTO; -import com.epmet.user.result.UserIncrTrendResultDTO; -import com.epmet.user.result.UserSubAgencyResultDTO; -import com.epmet.user.result.UserSubGridResultDTO; -import com.epmet.user.result.UserSummaryInfoResultDTO; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,11 +54,11 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { loginUserDetailsFormDTO.setUserId(loginUserUtil.getLoginUserId()); Result result=epmetUserOpenFeignClient.getLoginUserDetails(loginUserDetailsFormDTO); if(!result.success()){ - throw new RenException(DataReportModuleConstant.QUERY_USER_AGENCY_FAILED); + throw new RenException(UserAnalysisConstant.QUERY_USER_AGENCY_FAILED); } if(result.success()){ if (null == result.getData() || StringUtils.isBlank(result.getData().getAgencyId())) { - throw new RenException(DataReportModuleConstant.QUERY_USER_AGENCY_FAILED); + throw new RenException(UserAnalysisConstant.QUERY_USER_AGENCY_FAILED); } } return result.getData().getAgencyId(); @@ -73,7 +74,7 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { public UserSummaryInfoResultDTO summaryInfo(UserSummaryInfoFormDTO formDTO) { UserSummaryInfoResultDTO userSummaryInfoResultDTO=new UserSummaryInfoResultDTO(); String myAgencyId=this.getMyAgency(); - if(DataReportModuleConstant.PARTI_FLAG.equals(formDTO.getRegOrPartiFlag())){ + if(UserAnalysisConstant.PARTI_FLAG.equals(formDTO.getRegOrPartiFlag())){ userSummaryInfoResultDTO=userAnalysisDao.selectRegUserSummaryInfo(myAgencyId); }else{ userSummaryInfoResultDTO=userAnalysisDao.selectParticipationUserSummaryInfo(myAgencyId); @@ -81,9 +82,12 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { if(StringUtils.isNotBlank(userSummaryInfoResultDTO.getCurrentDate())&&userSummaryInfoResultDTO.getCurrentDate().length()==8){ userSummaryInfoResultDTO.setCurrentDate(String.valueOf(new StringBuffer(userSummaryInfoResultDTO.getCurrentDate()).insert(4,".").insert(7,"."))); } - userSummaryInfoResultDTO.setPartymemberProportion(userSummaryInfoResultDTO.getPartymemberProportionValue().stripTrailingZeros().toPlainString()); - userSummaryInfoResultDTO.setWarmHeartedProportion(userSummaryInfoResultDTO.getWarmHeartedProportionValue().stripTrailingZeros().toPlainString()); - return userSummaryInfoResultDTO; + if(null!=userSummaryInfoResultDTO){ + userSummaryInfoResultDTO.setPartymemberProportion(userSummaryInfoResultDTO.getPartymemberProportionValue().stripTrailingZeros().toPlainString()); + userSummaryInfoResultDTO.setWarmHeartedProportion(userSummaryInfoResultDTO.getWarmHeartedProportionValue().stripTrailingZeros().toPlainString()); + } + logger.info(String.format("查询用户汇总信息返参%s",JSON.toJSONString(userSummaryInfoResultDTO))); + return userSummaryInfoResultDTO; } /** 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 a1bc581a7c..246c197fa1 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 @@ -3,7 +3,7 @@ - SELECT m.id, m.DATE_ID AS currentDate, @@ -24,7 +24,8 @@ - SELECT m.id, m.DATE_ID AS currentDate,