数据用户查询接口修改

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/user/UserAnalysisController.java

@@ -83,7 +83,7 @@ public class UserAnalysisController {
     @PostMapping("incrtrend")
     public Result<List<UserIncrTrendResultDTO>> incrTrend(@RequestBody UserIncrTrendFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, UserIncrTrendFormDTO.AddUserInternalGroup.class);
-        List<UserIncrTrendResultDTO> userIncrTrendResultDTO = userService.incrTrend(formDTO);
+        List<UserIncrTrendResultDTO> userIncrTrendResultDTO = userService.incrTrendV2(formDTO);
         return new Result<List<UserIncrTrendResultDTO>>().ok(userIncrTrendResultDTO);
     }
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/UserAnalysisService.java

@@ -53,5 +53,15 @@ public interface UserAnalysisService {
      * @description 按日、按月查询注册用户数（参与用户数）增量折线图
      * @Date 2020/6/22 13:42
      **/
+    @Deprecated
     List<UserIncrTrendResultDTO> incrTrend(UserIncrTrendFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return com.epmet.user.result.UserIncrTrendResultDTO
+     * @author yinzuomei
+     * @description 按日、按月查询注册用户数（参与用户数）增量折线图
+     * @Date 2020/6/22 13:42
+     **/
+    List<UserIncrTrendResultDTO> incrTrendV2(UserIncrTrendFormDTO formDTO);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java

@@ -374,6 +374,60 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
         return dimList;
     }
 
+    @Override
+    public List<UserIncrTrendResultDTO> incrTrendV2(UserIncrTrendFormDTO formDTO) {
+        //获取用户所属机关id
+        String myAgencyId = this.getMyAgency();
+        List<UserIncrTrendResultDTO> resultList=new ArrayList<>();
+        List<UserIncrTrendResDTO> list=new ArrayList<>();
+        if (UserAnalysisConstant.REG_FLAG.equals(formDTO.getRegOrPatiFlag()) && UserAnalysisConstant.DAY_TYPE.equals(formDTO.getType())) {
+            //注册用户数、日
+            list=userAnalysisDao.selectRegDayIncr(myAgencyId);
+        } 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.getRegOrPatiFlag()) && UserAnalysisConstant.DAY_TYPE.equals(formDTO.getType())) {
+            //参与用户数、日
+            list=userAnalysisDao.selectParticipationUserDayIncr(myAgencyId);
+        } else if (UserAnalysisConstant.PARTI_FLAG.equals(formDTO.getRegOrPatiFlag()) && UserAnalysisConstant.MONTH_TYPE.equals(formDTO.getType())) {
+            //参与用户数、月
+            list=userAnalysisDao.selectParticipationUserMonthIncr(myAgencyId);
+        } else {
+            logger.error("参数错误");
+            return new ArrayList<>();
+        }
+        for(UserIncrTrendResDTO userIncrTrendResDTO:list){
+            String date="";
+            if(UserAnalysisConstant.DAY_TYPE.equals(formDTO.getType())){
+                date=DateUtils.getxAxisDatePattern(userIncrTrendResDTO.getDateIdOrMonthId(),".");
+            }else if(UserAnalysisConstant.MONTH_TYPE.equals(formDTO.getType())){
+                date=DateUtils.getxAxisDatePattern(userIncrTrendResDTO.getDateIdOrMonthId(),"/");
+            }
+            //居民、热心居民、党员总数，用于排序
+            UserIncrTrendResultDTO reg=new UserIncrTrendResultDTO();
+            reg.setDateOrMonthId(userIncrTrendResDTO.getDateIdOrMonthId());
+            reg.setDate(date);
+            reg.setType(UserAnalysisConstant.REGISTERED_RESI);
+            reg.setValue(userIncrTrendResDTO.getRegIncr());
+            resultList.add(reg);
+
+            UserIncrTrendResultDTO warm=new UserIncrTrendResultDTO();
+            warm.setDateOrMonthId(userIncrTrendResDTO.getDateIdOrMonthId());
+            warm.setDate(date);
+            warm.setType(UserAnalysisConstant.WARMHEARTED);
+            warm.setValue(userIncrTrendResDTO.getWarmIncr());
+            resultList.add(warm);
+
+            UserIncrTrendResultDTO party=new UserIncrTrendResultDTO();
+            party.setDateOrMonthId(userIncrTrendResDTO.getDateIdOrMonthId());
+            party.setDate(date);
+            party.setType(UserAnalysisConstant.PARTYMEMBER);
+            party.setValue(userIncrTrendResDTO.getPartymemberIncr());
+            resultList.add(party);
+        }
+        return resultList;
+    }
+
     private List<UserIncrTrendResultDTO> initUserIncrTrendResultDTO(String type) {
         List<UserIncrTrendResultDTO> list=new ArrayList<>();
         if(UserAnalysisConstant.DAY_TYPE.equals(type)){