From e19eeca61478fc7c086861bc644658f5c55b93dc Mon Sep 17 00:00:00 2001 From: liuchuang Date: Mon, 11 Nov 2019 14:48:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AE=8C=E5=96=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=90=8E=E6=9B=B4=E6=96=B0=E7=A4=BE=E7=BE=A4=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=85=9A=E5=91=98=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/feign/GroupFeignClient.java | 14 +++++++++- .../fallback/GroupFeignClientFallback.java | 5 ++++ .../epdc/service/impl/AppUserServiceImpl.java | 11 ++++++++ .../form/GroupUserPartyMemberFormDTO.java | 27 +++++++++++++++++++ .../controller/AppUserGroupController.java | 16 +++++++++++ .../modules/group/dao/UserGroupDao.java | 12 +++++++++ .../group/service/UserGroupService.java | 12 +++++++++ .../service/impl/UserGroupServiceImpl.java | 12 ++++++--- .../resources/mapper/group/UserGroupDao.xml | 4 +++ 9 files changed, 108 insertions(+), 5 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupUserPartyMemberFormDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java index 49ae87729..b79f9e3a6 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java @@ -190,6 +190,18 @@ public interface GroupFeignClient { * @author liuchuang * @since 2019/11/11 14:04 */ - @PostMapping(value = "group/epdc-app/usergroup/applyForGroup", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "group/epdc-app/group/applyForGroup", consumes = MediaType.APPLICATION_JSON_VALUE) Result applyForGroup(GroupApplyFormDTO formDto); + + /** + * + * 更新社群用户党员标识 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/11 14:32 + */ + @PostMapping(value = "group/epdc-app/usergroup/partyMember", consumes = MediaType.APPLICATION_JSON_VALUE) + Result updateUserPartyMember(GroupUserPartyMemberFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java index c8030e464..42754e74d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java @@ -89,4 +89,9 @@ public class GroupFeignClientFallback implements GroupFeignClient { public Result applyForGroup(GroupApplyFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "applyForGroup", formDto); } + + @Override + public Result updateUserPartyMember(GroupUserPartyMemberFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "updateUserPartyMember", formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 59defbbbf..b194fb544 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -20,11 +20,13 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; import com.elink.esua.epdc.dto.form.*; +import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO; import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO; import com.elink.esua.epdc.enums.*; import com.elink.esua.epdc.feign.AdminFeignClient; +import com.elink.esua.epdc.feign.GroupFeignClient; import com.elink.esua.epdc.feign.UserFeignClient; import com.elink.esua.epdc.jwt.JwtTokenProperties; import com.elink.esua.epdc.jwt.JwtTokenUtils; @@ -80,6 +82,9 @@ public class AppUserServiceImpl implements AppUserService { @Autowired private RedisUtils redisUtils; + @Autowired + private GroupFeignClient groupFeignClient; + private static String USER_FACE = "https://epdc.elinkchina.com.cn/esua-epdc/static/default/default_user_face.png"; @@ -705,6 +710,12 @@ public class AppUserServiceImpl implements AppUserService { tokenDto.setPartyFlag(user.getPartyFlag()); EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(tokenDto, userGrid.getGrid(), userDto.getState()); + // 更新社群用户党员标识 + GroupUserPartyMemberFormDTO formDto = new GroupUserPartyMemberFormDTO(); + formDto.setUserId(user.getId()); + formDto.setPartyMember(user.getPartyFlag()); + groupFeignClient.updateUserPartyMember(formDto); + return new Result().ok(authorizationDto); } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupUserPartyMemberFormDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupUserPartyMemberFormDTO.java new file mode 100644 index 000000000..e7a2d240d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupUserPartyMemberFormDTO.java @@ -0,0 +1,27 @@ +package com.elink.esua.epdc.dto.group.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2019/11/11 14:24 + */ +@Data +public class GroupUserPartyMemberFormDTO implements Serializable { + private static final long serialVersionUID = 6172069865037633276L; + + /** + * 用户ID + */ + @NotBlank(message = "用户ID不能为空") + private String userId; + + /** + * 党员标识 0：否，1：是 + */ + @NotBlank(message = "党员标识不能为空") + private String partyMember; +} diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppUserGroupController.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppUserGroupController.java index b84d68642..63f7cb5a6 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppUserGroupController.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppUserGroupController.java @@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO; import com.elink.esua.epdc.dto.group.form.GroupAddUserFormDTO; +import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO; import com.elink.esua.epdc.dto.group.form.GroupUserReviewFormDTO; import com.elink.esua.epdc.modules.group.service.UserGroupService; import org.springframework.beans.factory.annotation.Autowired; @@ -70,4 +71,19 @@ public class AppUserGroupController { public Result reviewApply(@RequestBody GroupUserReviewFormDTO formDto) { return userGroupService.modifyGroupUsers(formDto); } + + /** + * + * 更新社群用户党员标识 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/11 14:32 + */ + @PostMapping("partyMember") + public Result updateUserPartyMember(@RequestBody GroupUserPartyMemberFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return userGroupService.modifyGroupUsersPartyMember(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/UserGroupDao.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/UserGroupDao.java index d7a3b4573..f4a963428 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/UserGroupDao.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/UserGroupDao.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.group.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.group.UserGroupDTO; +import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO; import com.elink.esua.epdc.dto.group.form.GroupUserRemoveOrQuitFormDTO; import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO; import com.elink.esua.epdc.modules.group.entity.UserGroupEntity; @@ -101,5 +102,16 @@ public interface UserGroupDao extends BaseDao { * @since 2019/10/23 15:04 */ List selectListOfGroupUserIdsByState(String groupId, int[] states); + + /** + * + * 更新社群用户党员标识 + * + * @params [formDto] + * @return void + * @author liuchuang + * @since 2019/11/11 14:30 + */ + void updateGroupUsersPartyMember(GroupUserPartyMemberFormDTO formDto); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/UserGroupService.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/UserGroupService.java index 9461cf16d..a6a816a24 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/UserGroupService.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/UserGroupService.java @@ -24,6 +24,7 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO; import com.elink.esua.epdc.dto.group.UserGroupDTO; import com.elink.esua.epdc.dto.group.form.GroupAddUserFormDTO; +import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO; import com.elink.esua.epdc.dto.group.form.GroupUserRemoveOrQuitFormDTO; import com.elink.esua.epdc.dto.group.form.GroupUserReviewFormDTO; import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO; @@ -176,4 +177,15 @@ public interface UserGroupService extends BaseService { * @since 2019/11/6 13:29 */ Result modifyGroupUsers(GroupUserReviewFormDTO formDto); + + /** + * + * 更新社群用户党员标识 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/11 14:27 + */ + Result modifyGroupUsersPartyMember(GroupUserPartyMemberFormDTO formDto); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java index f9b6863dd..16a5d26e9 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java @@ -33,10 +33,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO; import com.elink.esua.epdc.dto.group.GroupDTO; import com.elink.esua.epdc.dto.group.UserGroupDTO; import com.elink.esua.epdc.dto.group.UserReviewDto; -import com.elink.esua.epdc.dto.group.form.GroupAddUserFormDTO; -import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO; -import com.elink.esua.epdc.dto.group.form.GroupUserRemoveOrQuitFormDTO; -import com.elink.esua.epdc.dto.group.form.GroupUserReviewFormDTO; +import com.elink.esua.epdc.dto.group.form.*; import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO; import com.elink.esua.epdc.modules.async.NewsTask; import com.elink.esua.epdc.modules.feign.UserFeignClient; @@ -243,4 +240,11 @@ public class UserGroupServiceImpl extends BaseServiceImpl + + UPDATE epdc_user_group SET PARTY_MEMBER = #{partyMember} WHERE USER_ID = #{userId} + + \ No newline at end of file