diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/RocketMqConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/RocketMqConstant.java index 074c114a..a26184ed 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/RocketMqConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/RocketMqConstant.java @@ -53,6 +53,10 @@ public interface RocketMqConstant { * 内容安全审核-初心互助-已报名活动-我要打卡-消息tag */ String MQ_TAG_HEART_SIGNIN_CONTENTSECURITY = "js_heart_signIn_contentSecurityTag"; + /** + * 内容安全审核-初心互助-已报名活动-我要打卡-消息tag + */ + String MQ_TAG_HEART_ACT_APPLY= "js_heart_act_apply"; //--------------------------------------------------------------------------- /** @@ -92,4 +96,18 @@ public interface RocketMqConstant { */ String MQ_TAG_GROUP_TOPIC_COMMENT_CONTENTSECURITY = "js_group_topic_comment_contentSecurityTag"; + + //--------------------------------------------------------------------------- + + /** + * 内容安全审核-我要举报 + */ + String MQ_TOPIC_REPORT_ISSUE = "js_reportIssue_contentSecurityTopic"; + + /** + * 内容安全审核 我要举报tag + */ + String MQ_TAG_REPORT_ISSUE_CONTENTSECURITY = "js_reportIssue_topic_contentSecurityTag"; + + } 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 7b2fe3ec..0d97aa74 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 @@ -327,7 +327,7 @@ public class AppUserServiceImpl implements AppUserService { EpdcAppAuthorizationDTO authorization = this.packageEpdcAppAuthorization(tokenDto, newAppUser.getGrid(), AppUserStatesEnum.STATE_REGISTERED.value()); // 网格长加入网格党员群并设置为群主 - this.joinGridPartyGroup(newAppUser, userGridList, NumConstant.ONE_STR); + // this.joinGridPartyGroup(newAppUser, userGridList, NumConstant.ONE_STR); return new Result().ok(authorization); } @@ -754,11 +754,11 @@ public class AppUserServiceImpl implements AppUserService { userResult = registerBindGridResultDto.getData(); registeredUser = userResult.getUserDTO(); // 用户已认证为党员，绑定网格时加入该网格党员群 - if (NumConstant.ONE_STR.equals(registeredUser.getPartyFlag())) { + /*if (NumConstant.ONE_STR.equals(registeredUser.getPartyFlag())) { UserGridRelationDTO userGridRelationDto = new UserGridRelationDTO(); userGridRelationDto.setGridId(userResult.getGridId()); this.joinGridPartyGroup(registeredUser, Collections.singletonList(userGridRelationDto), NumConstant.ZERO_STR); - } + }*/ } // 已注册已绑定当前网格 @@ -863,7 +863,7 @@ public class AppUserServiceImpl implements AppUserService { EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(tokenDto, userGrid.getGrid(), user.getState()); // 更新社群用户党员标识并加入关联的所有网格党员群 - if (NumConstant.ONE_STR.equals(user.getPartyFlag())) { + /*if (NumConstant.ONE_STR.equals(user.getPartyFlag())) { GroupUserPartyMemberFormDTO formDto = new GroupUserPartyMemberFormDTO(); formDto.setUserId(user.getId()); formDto.setPartyMember(user.getPartyFlag()); @@ -875,7 +875,7 @@ public class AppUserServiceImpl implements AppUserService { groupFeignClient.updateUserPartyMember(formDto); // groupTask.updateUserPartyMember(formDto); - } + }*/ return new Result().ok(authorizationDto); } @@ -1202,9 +1202,9 @@ public class AppUserServiceImpl implements AppUserService { CachingUserInfoDTO cachingUserInfoDTO = cachingUserResult.getData(); EpdcAppAuthorizationDTO authorizationDto = cachingUserInfoForAuthorization(cachingUserInfoDTO, user.getGrid(), user.getState()); - if (!partyFlag && newPartyFlag) { + /*if (!partyFlag && newPartyFlag) { initPartyGroupInfo(cachingUserInfoDTO); - } + }*/ return new Result().ok(authorizationDto); } @@ -1429,9 +1429,9 @@ public class AppUserServiceImpl implements AppUserService { } // 更新社群用户党员标识并加入关联的所有网格党员群 boolean partyFlag = UserTagUtils.containIdentity(cachingUserInfoDTO.getUserTagInfos(), UserTagEnum.PARTY_MEMBER); - if (partyFlag) { + /*if (partyFlag) { initPartyGroupInfo(cachingUserInfoDTO); - } + }*/ //异步更新党群群众信息 PartyUserNewInfoFormDTO formDTO = new PartyUserNewInfoFormDTO(); formDTO.setUserId(cachingUserInfoDTO.getUserId()); @@ -1504,9 +1504,9 @@ public class AppUserServiceImpl implements AppUserService { CachingUserInfoDTO cachingUserInfoDTO = cachingUserResult.getData(); EpdcAppAuthorizationDTO authorizationDto = cachingUserInfoForAuthorization(cachingUserInfoDTO, user.getGrid(), user.getState()); - if ( newPartyFlag) { + /*if ( newPartyFlag) { initPartyGroupInfo(cachingUserInfoDTO); - } + }*/ return new Result().ok(authorizationDto); } diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckResultServiceImpl.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckResultServiceImpl.java index 87957e47..8afc76e6 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckResultServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckResultServiceImpl.java @@ -180,6 +180,9 @@ public class CheckResultServiceImpl extends BaseServiceImpl { * @return void **/ void modifyOrganizationInfo(OrganizationModifyDTO dto); + /** + * @Description 违规删除 + * @Author songyunpeng + * @Date 2020/11/27 + * @Param [dto] + * @return void + **/ + void rejectActInfo(RejectRecordDTO dto); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/reportissue/service/impl/ReportIssueServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/reportissue/service/impl/ReportIssueServiceImpl.java index 7ef83a6c..c39d910a 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/reportissue/service/impl/ReportIssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/reportissue/service/impl/ReportIssueServiceImpl.java @@ -44,6 +44,7 @@ import com.elink.esua.epdc.modules.reportissue.entity.ReportIssueEntity; import com.elink.esua.epdc.modules.reportissue.service.CustomImgService; import com.elink.esua.epdc.modules.reportissue.service.ReportIssueService; import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO; +import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -236,6 +237,12 @@ public class ReportIssueServiceImpl extends BaseServiceImpl @Autowired private ArchivesDeptService archivesDeptService; - @Autowired - private DeptInfoService deptInfoService; - @Autowired private ReportIssueService reportIssueService; @@ -50,8 +46,6 @@ public class OrganizationModifyConsumer implements RocketMQListener archivesService.modifyOrganizationInfo(dto); // 档案部门修改组织机构信息 archivesDeptService.modifyOrganizationInfo(dto); - // 部门信息表修改组织机构信息 - deptInfoService.modifyOrganizationInfo(dto); // 我要举报修改组织机构信息 reportIssueService.modifyOrganizationInfo(dto); log.info("EPDC-CUSTOM-SERVER消费消息END：{topic:{}, msgId:{}, body:{}}", RocketMqConstant.MQ_TOPIC_ORGANIZATION, messageExt.getMsgId(), body); diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/RejectCheckRecordConsumer.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/RejectCheckRecordConsumer.java new file mode 100644 index 00000000..743d472f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/RejectCheckRecordConsumer.java @@ -0,0 +1,48 @@ +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.reportissue.service.ReportIssueService; +import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO; +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; + +/** + * + * 内容审核驳回信息处理-监听MQ消息 + * + * @Author：wangtong + * @Date：2020/7/14 1:54 + */ +@Slf4j +@Component +@RocketMQMessageListener(topic = RocketMqConstant.MQ_TOPIC_REPORT_ISSUE, consumerGroup = "${rocketmq.consumer.contentSecurity-group}", messageModel = MessageModel.BROADCASTING) +public class RejectCheckRecordConsumer implements RocketMQListener { + + @Autowired + private ReportIssueService reportIssueService; + @Override + public void onMessage(MessageExt messageExt) { + log.info("EPDC-CUSTOM-SERVER消费消息START：{topic:{}, msgId:{}}", RocketMqConstant.MQ_TOPIC_REPORT_ISSUE, messageExt.getMsgId()); + try { + String charset = "UTF-8"; + String body = new String(messageExt.getBody(), charset); + String tag = messageExt.getTags(); + RejectRecordDTO dto = JSONObject.parseObject(body, RejectRecordDTO.class); + if(RocketMqConstant.MQ_TAG_REPORT_ISSUE_CONTENTSECURITY.equals(tag)){ + //删除发布活动相关信息 + reportIssueService.rejectActInfo(dto); + } + + log.info("EPDC-CUSTOM-SERVER消费消息END：{topic:{}, msgId:{}, body:{}}", RocketMqConstant.MQ_TOPIC_REPORT_ISSUE, messageExt.getMsgId(), body); + } catch (Exception e) { + log.info("EPDC-CUSTOM-SERVER消费消息失败：msgId:{}", messageExt.getMsgId()); + e.printStackTrace(); + } + } +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/dto/RejectRecordDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/dto/RejectRecordDTO.java new file mode 100644 index 00000000..509c5afe --- /dev/null +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/dto/RejectRecordDTO.java @@ -0,0 +1,27 @@ +package com.elink.esua.epdc.modules.rocketmq.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * + * 内容审核驳回信息处理-发送MQ消息DTO + * + * @Author： wangtong + * @Date： 2020/7/14 14:58 + */ +@Data +public class RejectRecordDTO implements Serializable { + + private static final long serialVersionUID = 3032661994413974324L; + /** + * 用户ID + */ + private String userId; + + /** + * 关联信息ID + */ + private String relationId; +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml index 58b8154a..0ebab4ae 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml @@ -74,4 +74,5 @@ rocketmq: name-server: @rocketmq.name.server@ consumer: group: @rocketmq.consumer.group@ + contentSecurity-group: @rocketmq.consumer.contentSecurity.group@ diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml index 064382ba..1508c65b 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml @@ -79,16 +79,18 @@