数据用户查询接口修改

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;
 }

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;
 }

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;
 }

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;
 }

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;
     /**
      * 注册居民数
      */

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<UserSummaryInfoResultDTO> summaryInfo(@RequestBody UserSummaryInfoFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO,UserSummaryInfoFormDTO.AddUserInternalGroup.class);
         UserSummaryInfoResultDTO userSummaryInfoResultDTO = userService.summaryInfo(formDTO);
         return new Result<UserSummaryInfoResultDTO>().ok(userSummaryInfoResultDTO);
     }
@@ -54,7 +54,7 @@ public class UserAnalysisController {
      **/
     @PostMapping("subagency")
     public Result<List<UserSubAgencyResultDTO>> subAgency(@RequestBody UserSubAgencyFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO,UserSubAgencyFormDTO.AddUserInternalGroup.class);
         List<UserSubAgencyResultDTO> userSubAgencyResultDTO = userService.subAgency(formDTO);
         return new Result<List<UserSubAgencyResultDTO>>().ok(userSubAgencyResultDTO);
     }
@@ -68,7 +68,7 @@ public class UserAnalysisController {
      **/
     @PostMapping("subgrid")
     public Result<List<UserSubGridResultDTO>> subGrid(@RequestBody UserSubGridFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO, UserSubGridFormDTO.AddUserInternalGroup.class);
         List<UserSubGridResultDTO> userSubGridResultDTO = userService.subGrid(formDTO);
         return new Result<List<UserSubGridResultDTO>>().ok(userSubGridResultDTO);
     }
@@ -82,7 +82,7 @@ public class UserAnalysisController {
      **/
     @PostMapping("incrtrend")
     public Result<List<UserIncrTrendResultDTO>> incrTrend(@RequestBody UserIncrTrendFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO, UserIncrTrendFormDTO.AddUserInternalGroup.class);
         List<UserIncrTrendResultDTO> userIncrTrendResultDTO = userService.incrTrend(formDTO);
         return new Result<List<UserIncrTrendResultDTO>>().ok(userIncrTrendResultDTO);
     }

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<com.epmet.dto.result.user.UserIncrTrendResDTO>
      * @param myAgencyId
      * @author yinzuomei
-     * @description
+     * @description 注册用户：机关、日增量折现图 近90天
      * @Date 2020/6/23 11:24
      **/
     List<UserIncrTrendResDTO> selectRegDayIncr(@Param("agencyId")String myAgencyId);
@@ -110,7 +110,7 @@ public interface UserAnalysisDao {
      * @return java.util.List<com.epmet.dto.result.user.UserIncrTrendResDTO>
      * @param myAgencyId
      * @author yinzuomei
-     * @description
+     * @description 注册用户：机关、月增量折线图 近12个月包含当前月
      * @Date 2020/6/23 11:24
      **/
     List<UserIncrTrendResDTO> selectRegMonthIncr(@Param("agencyId")String myAgencyId);
@@ -119,7 +119,7 @@ public interface UserAnalysisDao {
      * @return java.util.List<com.epmet.dto.result.user.UserIncrTrendResDTO>
      * @param myAgencyId
      * @author yinzuomei
-     * @description
+     * @description 参与用户：机关、日增量折线图 近90天
      * @Date 2020/6/23 11:24
      **/
     List<UserIncrTrendResDTO> selectParticipationUserDayIncr(@Param("agencyId")String myAgencyId);
@@ -128,7 +128,7 @@ public interface UserAnalysisDao {
      * @return java.util.List<com.epmet.dto.result.user.UserIncrTrendResDTO>
      * @param myAgencyId
      * @author yinzuomei
-     * @description
+     * @description 参与用户：机关、月增量插线图  近12个月 包含当前月
      * @Date 2020/6/23 11:24
      **/
     List<UserIncrTrendResDTO> selectParticipationUserMonthIncr(@Param("agencyId") String myAgencyId);

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<UserIncrTrendResDTO> 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 {

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 @@
     <select id="selectParticipationSubAgencyRes" parameterType="map"
             resultType="com.epmet.dto.result.user.UserSubAgencyResDTO">
         SELECT
-            m.AGENCY_ID,
+            DA.ID AS AGENCY_ID,
             da.AGENCY_NAME,
             m.REG_TOTAL,
             M.RESI_TOTAL,
             M.WARM_HEARTED_TOTAL,
             M.PARTYMEMBER_TOTAL
         FROM
-            fact_participation_user_agency_daily m
-            LEFT JOIN dim_agency da
-            ON ( m.AGENCY_ID = da.ID
-                AND da.PID =#{agencyId}
-                AND da.DEL_FLAG = '0' )
-        WHERE
-            m.DEL_FLAG = '0'
+            dim_agency da
+            LEFT JOIN fact_participation_user_agency_daily m
+            ON ( da.ID=m.AGENCY_ID
+                and m.DEL_FLAG = '0'
                 and m.DATE_ID=#{dateId}
+                )
+        WHERE da.DEL_FLAG = '0'
+            AND da.PID =#{agencyId}
             order by m.REG_TOTAL desc
     </select>
 
     <!--  注册用户：子级机关用户分析，按日（date_id）查询  -->
     <select id="selectRegSubAgencyRes" parameterType="map" resultType="com.epmet.dto.result.user.UserSubAgencyResDTO">
         SELECT
-            m.AGENCY_ID,
+            DA.ID AS AGENCY_ID,
             da.AGENCY_NAME,
             m.REG_TOTAL,
             M.RESI_TOTAL,
             M.WARM_HEARTED_TOTAL,
             M.PARTYMEMBER_TOTAL
         FROM
-            fact_reg_user_agency_daily m
-            LEFT JOIN dim_agency da
-            ON ( m.AGENCY_ID = da.ID
-                AND da.PID =#{agencyId}
-                AND da.DEL_FLAG = '0' )
-        WHERE
-            m.DEL_FLAG = '0'
+            dim_agency da
+            LEFT JOIN fact_reg_user_agency_daily m
+            ON (  da.ID=m.AGENCY_ID
+                and m.DEL_FLAG = '0'
                 and m.DATE_ID=#{dateId}
+                )
+        WHERE da.DEL_FLAG = '0'
+            AND da.PID =#{agencyId}
             order by m.REG_TOTAL desc
     </select>
 
@@ -147,7 +149,7 @@
             AND m.AGENCY_ID = #{agencyId}
     </select>
 
-    <!--    -->
+    <!--  注册用户：机关、日增量折现图 近90天  -->
     <select id="selectRegDayIncr" parameterType="java.lang.String"
             resultType="com.epmet.dto.result.user.UserIncrTrendResDTO">
         SELECT
@@ -159,12 +161,12 @@
             fact_reg_user_agency_daily m
         WHERE
             m.DEL_FLAG = '0'
-            AND m.AGENCY_ID =#{myAgencyId}
+            AND m.AGENCY_ID =#{agencyId}
         ORDER BY
             m.DATE_ID DESC
             LIMIT 90
     </select>
-    <!--    -->
+    <!--  注册用户：机关、月增量折线图 近12个月包含当前月  -->
     <select id="selectRegMonthIncr" parameterType="java.lang.String"
             resultType="com.epmet.dto.result.user.UserIncrTrendResDTO">
         SELECT
@@ -176,13 +178,13 @@
             fact_reg_user_agency_monthly m
         WHERE
             m.DEL_FLAG = '0'
-            AND m.AGENCY_ID =#{myAgencyId}
+            AND m.AGENCY_ID =#{agencyId}
         ORDER BY
             m.MONTH_ID DESC
             LIMIT 12
     </select>
 
-    <!--    -->
+    <!--  参与用户：机关、日增量折线图 近90天  -->
     <select id="selectParticipationUserDayIncr" parameterType="java.lang.String"
             resultType="com.epmet.dto.result.user.UserIncrTrendResDTO">
         SELECT
@@ -194,12 +196,12 @@
             fact_participation_user_agency_daily m
         WHERE
             m.DEL_FLAG = '0'
-            AND m.AGENCY_ID =#{myAgencyId}
+            AND m.AGENCY_ID =#{agencyId}
         ORDER BY
             m.DATE_ID DESC
             LIMIT 90
     </select>
-    <!--    -->
+    <!--  参与用户：机关、月增量插线图  近12个月 包含当前月-->
     <select id="selectParticipationUserMonthIncr" parameterType="java.lang.String"
             resultType="com.epmet.dto.result.user.UserIncrTrendResDTO">
         SELECT
@@ -211,7 +213,7 @@
             fact_participation_user_agency_monthly m
         WHERE
             m.DEL_FLAG = '0'
-            AND m.AGENCY_ID =#{myAgencyId}
+            AND m.AGENCY_ID =#{agencyId}
         ORDER BY
             m.MONTH_ID DESC
             LIMIT 12