From 046627570868fa4c6e45c45616246dd2c06853ee Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Jun 2020 18:13:52 +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=A4v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/UserAnalysisController.java} | 8 ++--- .../user/UserAnalysisService.java} | 4 +-- .../user/impl/UserAnalysisServiceImpl.java} | 30 ++++++++++++++----- 3 files changed, 28 insertions(+), 14 deletions(-) rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{module/user/controller/UserController.java => controller/user/UserAnalysisController.java} (95%) rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{module/user/service/UserService.java => service/user/UserAnalysisService.java} (95%) rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/{module/user/service/impl/UserServiceImpl.java => service/user/impl/UserAnalysisServiceImpl.java} (68%) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/user/controller/UserController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/user/UserAnalysisController.java similarity index 95% rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/user/controller/UserController.java rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/user/UserAnalysisController.java index 795d3cd8b9..7ac47ba233 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/user/controller/UserController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/user/UserAnalysisController.java @@ -1,8 +1,8 @@ -package com.epmet.module.user.controller; +package com.epmet.controller.user; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.module.user.service.UserService; +import com.epmet.service.user.UserAnalysisService; import com.epmet.user.form.UserIncrTrendFormDTO; import com.epmet.user.form.UserSubAgencyFormDTO; import com.epmet.user.form.UserSubGridFormDTO; @@ -25,9 +25,9 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("user") -public class UserController { +public class UserAnalysisController { @Autowired - private UserService userService; + private UserAnalysisService userService; /** * @param formDTO diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/user/service/UserService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/UserAnalysisService.java similarity index 95% rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/user/service/UserService.java rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/UserAnalysisService.java index 4d0f812b72..b01bd97dd1 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/user/service/UserService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/UserAnalysisService.java @@ -1,4 +1,4 @@ -package com.epmet.module.user.service; +package com.epmet.service.user; import com.epmet.user.form.UserIncrTrendFormDTO; import com.epmet.user.form.UserSubAgencyFormDTO; @@ -15,7 +15,7 @@ import com.epmet.user.result.UserSummaryInfoResultDTO; * @author yinzuomei@elink-cn.com * @date 2020/6/22 13:23 */ -public interface UserService { +public interface UserAnalysisService { /** * @param formDTO * @return com.epmet.user.result.UserSummaryInfoResultDTO diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/user/service/impl/UserServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java similarity index 68% rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/user/service/impl/UserServiceImpl.java rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java index c155265090..706a5e6d63 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/user/service/impl/UserServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java @@ -1,12 +1,14 @@ -package com.epmet.module.user.service.impl; +package com.epmet.service.user.impl; 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.dao.user.UserAnalysisDao; import com.epmet.dto.form.LoginUserDetailsFormDTO; import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.feign.EpmetUserOpenFeignClient; -import com.epmet.module.user.service.UserService; +import com.epmet.service.user.UserAnalysisService; import com.epmet.user.form.UserIncrTrendFormDTO; import com.epmet.user.form.UserSubAgencyFormDTO; import com.epmet.user.form.UserSubGridFormDTO; @@ -28,12 +30,14 @@ import org.springframework.stereotype.Service; * @date 2020/6/22 13:23 */ @Service -public class UserServiceImpl implements UserService { - private static final Logger logger = LoggerFactory.getLogger(UserServiceImpl.class); +public class UserAnalysisServiceImpl implements UserAnalysisService { + private static final Logger logger = LoggerFactory.getLogger(UserAnalysisServiceImpl.class); @Autowired private LoginUserUtil loginUserUtil; @Autowired private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + @Autowired + private UserAnalysisDao userAnalysisDao; /** * @return java.lang.String @@ -49,11 +53,11 @@ public class UserServiceImpl implements UserService { loginUserDetailsFormDTO.setUserId(loginUserUtil.getLoginUserId()); Result result=epmetUserOpenFeignClient.getLoginUserDetails(loginUserDetailsFormDTO); if(!result.success()){ - throw new RenException("查询用户所属组织信息失败"); + throw new RenException(DataReportModuleConstant.QUERY_USER_AGENCY_FAILED); } if(result.success()){ if (null == result.getData() || StringUtils.isBlank(result.getData().getAgencyId())) { - throw new RenException("查询用户所属组织信息失败"); + throw new RenException(DataReportModuleConstant.QUERY_USER_AGENCY_FAILED); } } return result.getData().getAgencyId(); @@ -67,9 +71,19 @@ public class UserServiceImpl implements UserService { **/ @Override public UserSummaryInfoResultDTO summaryInfo(UserSummaryInfoFormDTO formDTO) { + UserSummaryInfoResultDTO userSummaryInfoResultDTO=new UserSummaryInfoResultDTO(); String myAgencyId=this.getMyAgency(); - //TODO - return null; + if(DataReportModuleConstant.PARTI_FLAG.equals(formDTO.getRegOrPartiFlag())){ + userSummaryInfoResultDTO=userAnalysisDao.selectRegUserSummaryInfo(myAgencyId); + }else{ + userSummaryInfoResultDTO=userAnalysisDao.selectParticipationUserSummaryInfo(myAgencyId); + } + 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; } /**