组织能力-用户相关查询接口初始提交v3

epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataReportModuleConstant.java → 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

epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/UserIncrTrendFormDTO.java → 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;
 

epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/UserSubAgencyFormDTO.java → 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;
 

epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/UserSubGridFormDTO.java → 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;
 

epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/UserSummaryInfoFormDTO.java → 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;
 

epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/UserIncrTrendResultDTO.java → 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;
 

epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/UserSubAgencyResultDTO.java → 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;

epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/UserSubGridResultDTO.java → 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;

epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/UserSummaryInfoResultDTO.java → 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;

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;

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;
 
 /**

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;
 
 /**
  * 组织能力用户相关接口

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<LoginUserDetailsResultDTO> 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;
     }
 
     /**

epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.epmet.dao.user.UserAnalysisDao">
     <!--  查询注册用户汇总信息  -->
-    <select id="selectRegUserSummaryInfo" parameterType="java.lang.String" resultType="com.epmet.user.result.UserSummaryInfoResultDTO">
+    <select id="selectRegUserSummaryInfo" parameterType="java.lang.String" resultType="com.epmet.dto.result.user.UserSummaryInfoResultDTO">
         SELECT
             m.id,
             m.DATE_ID AS currentDate,
@@ -24,7 +24,8 @@
     </select>
 
     <!--   查询注册用户的汇总信息 -->
-    <select id="selectParticipationUserSummaryInfo" parameterType="java.lang.String" resultType="com.epmet.user.result.UserSummaryInfoResultDTO">
+    <select id="selectParticipationUserSummaryInfo" parameterType="java.lang.String"
+            resultType="com.epmet.dto.result.user.UserSummaryInfoResultDTO">
         SELECT
             m.id,
             m.DATE_ID AS currentDate,