diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 235f56d..9d7cf7e 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 235f56d5ea756317efe54c5e0d4be0ac45e09155 +Subproject commit 9d7cf7e81ccc634751f032f72e5333a90eb40ee2 diff --git a/epdc-cloud-group/pom.xml b/epdc-cloud-group/pom.xml index a457295..e3c82f2 100644 --- a/epdc-cloud-group/pom.xml +++ b/epdc-cloud-group/pom.xml @@ -155,6 +155,7 @@ 47.104.85.99:9876;114.215.125.123:9876 organizationGroup + userGroup @@ -199,6 +200,7 @@ 47.104.85.99:9876 organizationGroup + userGroup 172.16.1.242:9876;172.16.1.243:9876 organizationGroup + userGroup diff --git a/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/group/dao/UserGroupDao.java b/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/group/dao/UserGroupDao.java index 04f9d23..1d98613 100644 --- a/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/group/dao/UserGroupDao.java +++ b/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/group/dao/UserGroupDao.java @@ -24,6 +24,7 @@ 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; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -38,80 +39,83 @@ import java.util.Map; public interface UserGroupDao extends BaseDao { /** - * * 社群成员列表 * - * @params [params] * @return java.util.List + * @params [params] * @author liuchuang * @since 2019/10/17 10:31 */ - List selectListOfGroupUsers(Map params); + List selectListOfGroupUsers(Map params); /** - * * 移动端-社群成员列表 * - * @params [groupId] * @return java.util.List + * @params [groupId] * @author liuchuang * @since 2019/10/21 11:14 */ List selectListOfGroupUsersByState(String groupId, Integer state); /** - * * 群主信息 * - * @params [groupId] * @return com.elink.esua.epdc.dto.group.UserGroupDTO + * @params [groupId] * @author liuchuang * @since 2019/10/22 15:57 */ UserGroupDTO selectOneOfLordInfoByGroupId(String groupId); /** - * * 操作社群成员 * - * @params [formDto] * @return void + * @params [formDto] * @author liuchuang * @since 2019/10/23 12:00 */ void updateMemberState(GroupUserRemoveOrQuitFormDTO formDto); /** - * * 获取社群成员信息 * - * @params [groupId, userId, states] * @return com.elink.esua.epdc.dto.group.UserGroupDTO + * @params [groupId, userId, states] * @author liuchuang * @since 2019/10/23 13:47 */ UserGroupDTO selectOnOfUserInfo(String groupId, String userId, int[] states); /** - * * 获取社群用户ID * - * @params [groupId, states] * @return java.util.List + * @params [groupId, states] * @author liuchuang * @since 2019/10/23 15:04 */ List selectListOfGroupUserIdsByState(String groupId, int[] states); /** - * * 更新社群用户党员标识 * - * @params [formDto] * @return void + * @params [formDto] * @author liuchuang * @since 2019/11/11 14:30 */ void updateGroupUsersPartyMember(GroupUserPartyMemberFormDTO formDto); - + + /** + * 更新党员标识 + * + * @param userId + * @return void + * @author zhy + * @date 2021/8/30 14:28 + */ + void updatePartyFlag(@Param("userId") String userId); + } \ No newline at end of file diff --git a/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/group/service/UserGroupService.java b/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/group/service/UserGroupService.java index 99c455f..80c1986 100644 --- a/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/group/service/UserGroupService.java +++ b/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/group/service/UserGroupService.java @@ -29,6 +29,7 @@ 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; import com.elink.esua.epdc.modules.group.entity.UserGroupEntity; +import com.elink.esua.epdc.modules.rocketmq.dto.UserModifyDTO; import java.util.List; import java.util.Map; @@ -188,4 +189,14 @@ public interface UserGroupService extends BaseService { * @since 2019/11/11 14:27 */ Result modifyGroupUsersPartyMember(GroupUserPartyMemberFormDTO formDto); + + /** + * 党员认证处理 + * + * @param dto + * @return void + * @author zhy + * @date 2021/8/30 14:21 + */ + void modifyUserInfo(UserModifyDTO dto); } \ No newline at end of file diff --git a/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/group/service/impl/UserGroupServiceImpl.java b/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/group/service/impl/UserGroupServiceImpl.java index dbd28d5..0bfc876 100644 --- a/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/group/service/impl/UserGroupServiceImpl.java +++ b/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/group/service/impl/UserGroupServiceImpl.java @@ -20,15 +20,14 @@ package com.elink.esua.epdc.modules.group.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.constant.SysSmsTemplateConstant; import com.elink.esua.epdc.dto.UserGridRelationDTO; import com.elink.esua.epdc.dto.constant.GroupNoticeConstant; -import com.elink.esua.epdc.dto.enums.GroupStateEnum; import com.elink.esua.epdc.dto.enums.GroupUserStateEnum; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; @@ -46,6 +45,7 @@ import com.elink.esua.epdc.modules.group.dao.UserGroupDao; import com.elink.esua.epdc.modules.group.entity.UserGroupEntity; import com.elink.esua.epdc.modules.group.service.GroupService; import com.elink.esua.epdc.modules.group.service.UserGroupService; +import com.elink.esua.epdc.modules.rocketmq.dto.UserModifyDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -91,8 +91,8 @@ public class UserGroupServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -165,7 +165,7 @@ public class UserGroupServiceImpl extends BaseServiceImpl userGroupEntities = new ArrayList<>(formDto.getMembers().size()); List userMobiles = new ArrayList<>(); UserGroupEntity entity = null; - for (GroupUserFormDTO userDto: + for (GroupUserFormDTO userDto : formDto.getMembers()) { entity = new UserGroupEntity(); entity.setGroupId(formDto.getGroupId()); @@ -185,7 +185,7 @@ public class UserGroupServiceImpl extends BaseServiceImpl userGroupEntities = new ArrayList<>(formDto.getMembers().size()); UserGroupEntity entity = null; - for (UserReviewDto userReviewDto: + for (UserReviewDto userReviewDto : formDto.getMembers()) { entity = new UserGroupEntity(); entity.setId(userReviewDto.getId()); @@ -224,7 +224,7 @@ public class UserGroupServiceImpl extends BaseServiceImpl userMobiles){ + private void invitePlusGroupSmsNotification(List userMobiles) { // 审核操作发送短信 SmsNoticeFormDTO sms = new SmsNoticeFormDTO(); sms.setMobiles(userMobiles); diff --git a/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/UserModifyConsumer.java b/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/UserModifyConsumer.java new file mode 100644 index 0000000..579035e --- /dev/null +++ b/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/UserModifyConsumer.java @@ -0,0 +1,44 @@ +package com.elink.esua.epdc.modules.rocketmq.consumer; + +import com.alibaba.fastjson.JSONObject; +import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant; +import com.elink.esua.epdc.modules.group.service.UserGroupService; +import com.elink.esua.epdc.modules.rocketmq.dto.UserModifyDTO; +import lombok.extern.slf4j.Slf4j; +import org.apache.rocketmq.common.message.MessageExt; +import org.apache.rocketmq.spring.annotation.MessageModel; +import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; +import org.apache.rocketmq.spring.core.RocketMQListener; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 用户党员认证 + * + * @author zhy + * @date 2021/8/30 14:11 + */ +@Slf4j +@Component +@RocketMQMessageListener(topic = RocketMqConstant.MQ_TOPIC_USER, consumerGroup = "${rocketmq.consumer.user.group}", messageModel = MessageModel.BROADCASTING) +public class UserModifyConsumer implements RocketMQListener { + + @Autowired + private UserGroupService userGroupService; + + @Override + public void onMessage(MessageExt messageExt) { + log.info("EPDC-GROUP-SERVER消费消息START:{topic:{}, msgId:{}}", RocketMqConstant.MQ_TOPIC_USER, messageExt.getMsgId()); + try { + String charset = "UTF-8"; + String body = new String(messageExt.getBody(), charset); + UserModifyDTO dto = JSONObject.parseObject(body, UserModifyDTO.class); + // 用户党员认证 + userGroupService.modifyUserInfo(dto); + log.info("EPDC-GROUP-SERVER消费消息END:{topic:{}, msgId:{}, body:{}}", RocketMqConstant.MQ_TOPIC_USER, messageExt.getMsgId(), body); + } catch (Exception e) { + log.info("EPDC-GROUP-SERVER消费消息失败:msgId:{}", messageExt.getMsgId()); + e.printStackTrace(); + } + } +} diff --git a/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/rocketmq/dto/UserModifyDTO.java b/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/rocketmq/dto/UserModifyDTO.java new file mode 100644 index 0000000..08bdce0 --- /dev/null +++ b/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/rocketmq/dto/UserModifyDTO.java @@ -0,0 +1,23 @@ +package com.elink.esua.epdc.modules.rocketmq.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 用户党员认证-接收MQ消息DTO + * 由于党员认证是单向的,所以不需要再记录新旧党员标识 + * + * @author zhy + * @date 2021/8/30 14:05 + */ +@Data +public class UserModifyDTO implements Serializable { + private static final long serialVersionUID = -5692602006311937083L; + + /** + * 用户ID + */ + private String userId; + +} diff --git a/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/topic/service/TopicService.java b/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/topic/service/TopicService.java index 7a9f3ed..6f5536d 100644 --- a/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/topic/service/TopicService.java +++ b/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/topic/service/TopicService.java @@ -28,6 +28,7 @@ import com.elink.esua.epdc.dto.topic.form.*; import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO; import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO; import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO; +import com.elink.esua.epdc.modules.rocketmq.dto.UserModifyDTO; import com.elink.esua.epdc.modules.topic.entity.TopicEntity; import java.util.List; @@ -52,11 +53,10 @@ public interface TopicService extends BaseService { PageData page(Map params); /** - * * 话题列表 * - * @params [params] * @return com.elink.esua.epdc.commons.tools.page.PageData + * @params [params] * @author liuchuang * @since 2019/11/12 9:43 */ @@ -73,11 +73,10 @@ public interface TopicService extends BaseService { List list(Map params); /** - * * 移动端-话题列表 * - * @params [formDto] * @return java.util.List + * @params [formDto] * @author liuchuang * @since 2019/11/11 15:08 */ @@ -130,101 +129,93 @@ public interface TopicService extends BaseService { void updateCommentNum(String id); /** - * * 移动端-发布话题 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/6 15:53 */ Result saveTopic(TopicSubmitFormDTO formDto); /** - * * 移动端-话题详情 * - * @params [id] * @return com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO + * @params [id] * @author liuchuang * @since 2019/11/7 15:34 */ TopicDetailResultDTO getTopicDetailById(TopicDetailFormDTO formDto); /** - * * 关闭话题 * - * @params [formDto, operatorUser(操作人:0-群主,1-网格长)] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto, operatorUser(操作人:0-群主,1-网格长)] * @author liuchuang * @since 2019/11/7 16:50 */ Result modifyTopicState(TopicCloseFormDTO formDto, String operatorUser); /** - * * 话题审核记录 * - * @params [topicId] * @return java.util.List + * @params [topicId] * @author liuchuang * @since 2019/11/8 9:35 */ List listOfTopicAuditRecord(String topicId); /** - * * 移动端-转议题 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/8 10:41 */ Result changeToIssue(TopicChangeToIssueFormDTO formDto); /** - * * 话题转议题回调 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/11 10:50 */ Result reviewCallback(TopicReviewFormDTO formDto); /** - * * 话题详情 * - * @params [id] * @return com.elink.esua.epdc.dto.topic.TopicDetailDTO + * @params [id] * @author liuchuang * @since 2019/11/12 10:24 */ TopicDetailDTO getDetail(String id); /** - * * 话题修改组织机构信息 * - * @params [dto] * @return void + * @params [dto] * @author liuchuang * @since 2020/3/7 1:23 */ void modifyOrganizationInfo(OrganizationModifyDTO dto); /** - * * 更新话题表党员群名称 * - * @params [groups] * @return void + * @params [groups] * @author liuchuang * @since 2020/3/7 12:20 */ void modifyPartyGroupNameByGroupId(List groups); + } diff --git a/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicServiceImpl.java b/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicServiceImpl.java index e6944dd..f9e016b 100644 --- a/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicServiceImpl.java +++ b/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicServiceImpl.java @@ -54,6 +54,7 @@ import com.elink.esua.epdc.modules.feign.EventFeignClient; import com.elink.esua.epdc.modules.group.service.GroupService; import com.elink.esua.epdc.modules.group.service.UserGroupService; import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO; +import com.elink.esua.epdc.modules.rocketmq.dto.UserModifyDTO; import com.elink.esua.epdc.modules.topic.dao.TopicDao; import com.elink.esua.epdc.modules.topic.entity.GroupTopicUserReadEntity; import com.elink.esua.epdc.modules.topic.entity.TopicAuditRecordEntity; diff --git a/epdc-cloud-group/src/main/resources/application.yml b/epdc-cloud-group/src/main/resources/application.yml index 70efc66..12b821e 100644 --- a/epdc-cloud-group/src/main/resources/application.yml +++ b/epdc-cloud-group/src/main/resources/application.yml @@ -112,3 +112,4 @@ rocketmq: name-server: @rocketmq.name.server@ consumer: group: @rocketmq.consumer.group@ + user: @rocketmq.consumer.user.group@ diff --git a/epdc-cloud-group/src/main/resources/mapper/group/UserGroupDao.xml b/epdc-cloud-group/src/main/resources/mapper/group/UserGroupDao.xml index f9557b2..8d5c9d8 100644 --- a/epdc-cloud-group/src/main/resources/mapper/group/UserGroupDao.xml +++ b/epdc-cloud-group/src/main/resources/mapper/group/UserGroupDao.xml @@ -97,4 +97,8 @@ UPDATE epdc_user_group SET PARTY_MEMBER = #{partyMember} WHERE USER_ID = #{userId} + + UPDATE epdc_user_group SET PARTY_MEMBER = 1 WHERE USER_ID = #{userId} + +