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

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/user/controller/UserController.java → 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

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/user/service/UserService.java → 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

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/user/service/impl/UserServiceImpl.java → 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<LoginUserDetailsResultDTO> 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;
     }
 
     /**