代码提交 小程序-首页-网格员列表，小程序-我的-党员亮身份，小程序-我的-党员亮身份详情代码提交

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java

@@ -1,9 +1,15 @@
 package com.elink.esua.epdc.controller;
 
+import com.elink.esua.epdc.common.token.annotation.LoginUser;
+import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.form.EpdcAppGridOperatorFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO;
 import com.elink.esua.epdc.service.AdminService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -47,4 +53,16 @@ public class ApiAdminController {
     public Result<Object> getUserVimInfo(String userName, String idCard) {
         return adminService.getUserVimInfo(userName, idCard);
     }
+    /**
+     * 查询网格员列表
+     * @params [tokenDto, formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAppGridOperatorResultDTO>
+     * @author jyyzz
+     * @since 2021/8/28 18:43
+     */
+    @GetMapping("/sysUser/gridmanList")
+    public Result<EpdcAppGridManListResultDTO> getGridmanList(@LoginUser TokenDto tokenDto, @RequestBody EpdcAppGridOperatorFormDTO formDto){
+        ValidatorUtils.validateEntity(formDto);
+        return adminService.getGridmanList(tokenDto,formDto);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@@ -3,12 +3,14 @@ package com.elink.esua.epdc.controller;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.dto.form.*;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppIdentityDetailResultDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
 import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
 import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior;
@@ -364,4 +366,29 @@ public class ApiAppUserController {
         ValidatorUtils.validateEntity(formDTO);
         return appUserService.listUserGradesRanking(userDetail, formDTO);
     }
+
+    /**
+     * 小程序-我的-党员亮身份
+     * @params [userDetail, formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhangfenghe
+     * @since 2021/8/28 19:43
+     */
+    @PostMapping("partyMember/showIdentity")
+    public Result saveShowIdentity(@LoginUser UserDetail userDetail,@RequestBody EpdcAppShowIdentityFormDTO formDto){
+        ValidatorUtils.validateEntity(formDto);
+        return appUserService.saveShowIdentity(userDetail,formDto);
+    }
+
+    /**
+     * 小程序-我的-党员亮身份详细信息
+     * @params [userDetail]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAppIdentityDetailResultDTO>
+     * @author zhangfenghe
+     * @since 2021/8/28 20:19
+     */
+    @GetMapping("partyMember/dentityDetail")
+    public Result<EpdcAppIdentityDetailResultDTO> getDentityDetail(@LoginUser UserDetail userDetail){
+        return appUserService.getDentityDetail(userDetail);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -8,6 +8,8 @@ import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.SysUserDTO;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
+import com.elink.esua.epdc.dto.form.EpdcAppGridOperatorFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO;
 import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -157,4 +159,14 @@ public interface AdminFeignClient {
      */
     @GetMapping("sys/vaccinationinfo/epdc-app/query")
     Result<Object> getUserVimInfo(@RequestParam("userName") String userName, @RequestParam("idCard") String idCard);
+
+    /**
+     * 查询网格员列表
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAppGridOperatorResultDTO>
+     * @author zhangfenghe
+     * @since 2021/8/28 18:41
+     */
+    @GetMapping("admin/sysUser/gridmanList")
+    Result<EpdcAppGridManListResultDTO> getGridmanList(EpdcAppGridOperatorFormDTO formDto);
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -9,6 +9,8 @@ import com.elink.esua.epdc.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.dto.UserWxFormIdDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
+import com.elink.esua.epdc.dto.form.EpdcAppShowIdentityFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppIdentityDetailResultDTO;
 import com.elink.esua.epdc.feign.fallback.UserFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -437,4 +439,24 @@ public interface UserFeignClient {
      **/
     @GetMapping(value = "app-user/epdc-app/user/gradeRanking/list", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<EpdcAppUserGradeRankingResultDTO> selectListUserGradesRanking(EpdcAppUserGradeRankingFormDTO formDTO);
+
+    /**
+     * 小程序-我的-党员亮身份
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhangfenghe
+     * @since 2021/8/28 19:28
+     */
+    @PostMapping(value = "app-user/partyMember/showIdentity",consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result saveShowIdentity(EpdcAppShowIdentityFormDTO formDto);
+
+    /**
+     *小程序-我的-党员亮身份详细信息
+     * @params [userId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAppIdentityDetailResultDTO>
+     * @author jyyzz
+     * @since 2021/8/28 20:28
+     */
+    @GetMapping(value = "app-user/partyMember/dentityDetail",consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<EpdcAppIdentityDetailResultDTO>  getDentityDetail(Long userId);
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java

@@ -9,6 +9,8 @@ import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.SysUserDTO;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
+import com.elink.esua.epdc.dto.form.EpdcAppGridOperatorFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -82,4 +84,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result<Object> getUserVimInfo(String userName, String idCard) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getUserVimInfo", userName, idCard);
     }
+
+    @Override
+    public Result<EpdcAppGridManListResultDTO> getGridmanList(EpdcAppGridOperatorFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER,"getGridmanList",formDto);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -10,6 +10,8 @@ import com.elink.esua.epdc.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.dto.UserWxFormIdDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
+import com.elink.esua.epdc.dto.form.EpdcAppShowIdentityFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppIdentityDetailResultDTO;
 import com.elink.esua.epdc.feign.UserFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -212,4 +214,14 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result<EpdcAppUserGradeRankingResultDTO> selectListUserGradesRanking(EpdcAppUserGradeRankingFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "selectListUserGradesRanking", formDto);
     }
+
+    @Override
+    public Result saveShowIdentity(EpdcAppShowIdentityFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER,"saveShowIdentity",formDto);
+    }
+
+    @Override
+    public Result<EpdcAppIdentityDetailResultDTO> getDentityDetail(Long userId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER,"getDentityDetail",userId);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java

@@ -1,7 +1,9 @@
 package com.elink.esua.epdc.service;
 
+import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.DeptOption;
+import com.elink.esua.epdc.dto.form.EpdcAppGridOperatorFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppWorkLogUserResult;
 import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO;
 
@@ -61,4 +63,13 @@ public interface AdminService {
      * @date 2021/5/8 15:29
      */
     Result<Object> getUserVimInfo(String userName, String idCard);
+
+    /**
+     * 查询网格员列表
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAppGridOperatorResultDTO>
+     * @author zhangfenghe
+     * @since 2021/8/28 18:41
+     */
+    Result<EpdcAppGridManListResultDTO> getGridmanList(TokenDto tokenDto, EpdcAppGridOperatorFormDTO formDto);
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java

@@ -1,12 +1,14 @@
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.dto.form.*;
 import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppIdentityDetailResultDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
 import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
 
@@ -301,4 +303,24 @@ public interface AppUserService {
      * @Date 10:59 2020-06-24
      **/
     Result<EpdcAppUserGradeRankingResultDTO> listUserGradesRanking(TokenDto userDetail, EpdcAppUserGradeRankingFormDTO formDTO);
+
+
+    /**
+     * 小程序-我的-党员亮身份
+     * @params [userDetail, formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhangfenghe
+     * @since 2021/8/28 19:43
+     */
+    Result saveShowIdentity(UserDetail userDetail,EpdcAppShowIdentityFormDTO forDto);
+
+    /**
+     * 小程序-我的-党员亮身份详细信息
+     * @params [userDetail]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAppIdentityDetailResultDTO>
+     * @author zhangfenghe
+     * @since 2021/8/28 20:19
+     */
+    Result<EpdcAppIdentityDetailResultDTO> getDentityDetail(UserDetail userDetail);
+
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java

@@ -1,5 +1,6 @@
 package com.elink.esua.epdc.service.impl;
 
+import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
@@ -9,6 +10,8 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.DeptOption;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.form.EpdcAppGridOperatorFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppWorkLogUserResult;
 import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
@@ -119,4 +122,12 @@ public class AdminServiceImpl implements AdminService {
 
         return adminFeignClient.getUserVimInfo(userName, idCard);
     }
+
+    @Override
+    public Result<EpdcAppGridManListResultDTO> getGridmanList(TokenDto tokenDto, EpdcAppGridOperatorFormDTO formDto) {
+        if(null == tokenDto){
+          return  new Result<EpdcAppGridManListResultDTO>().error("获取Token信息失败");
+        }
+        return adminFeignClient.getGridmanList(formDto);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -16,6 +16,7 @@ import com.elink.esua.epdc.commons.tools.enums.UserTagEnum;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.*;
 import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.enums.GroupUserStateEnum;
@@ -29,6 +30,7 @@ import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO;
 import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO;
 import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppIdentityDetailResultDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
 import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
 import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
@@ -1408,4 +1410,23 @@ public class AppUserServiceImpl implements AppUserService {
         }
         return userFeignClient.selectListUserGradesRanking(formDTO);
     }
+
+    @Override
+    public Result saveShowIdentity(UserDetail userDetail,EpdcAppShowIdentityFormDTO formDto) {
+        if (null == userDetail) {
+            return new Result().error("获取用户信息失败");
+        }
+        formDto.setUserId(formDto.getUserId());
+        return userFeignClient.saveShowIdentity(formDto);
+    }
+
+    @Override
+    public Result<EpdcAppIdentityDetailResultDTO> getDentityDetail(UserDetail userDetail) {
+        if (null == userDetail) {
+            return new Result<EpdcAppIdentityDetailResultDTO>().error("获取用户信息失败");
+        }
+        return userFeignClient.getDentityDetail(userDetail.getId());
+    }
+
+
 }

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit 33ef1954fba06d5c5d3b7b348a7453344268960d
+Subproject commit 1b9f0fa7529fc1601f10d50dde8d5e5cbcf004f7

epdc-cloud-commons-yushan

@@ -1 +1 @@
-Subproject commit 235f56d5ea756317efe54c5e0d4be0ac45e09155
+Subproject commit 31d32c81a8018a5c93745bcca1a538cc0bf59e13

epdc-cloud-parent-yushan

@@ -1 +1 @@
-Subproject commit db9213163f8005cba05ad21334bebb72484174b7
+Subproject commit 6c53fd985cbaae46046a44a2d84f1eb9bff86a9d