Browse Source

【内容审核】-【议题/项目消息队列开发】-(王童)-2020/07/15

feature/dangjian
Jackwang 6 years ago
parent
commit
05f4d30942
  1. 1
      esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
  2. 9
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java
  3. 11
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java
  4. 8
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
  5. 18
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
  6. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
  7. 12
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
  8. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
  9. 11
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  10. 64
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/RejectCheckRecordConsumer.java
  11. 27
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/dto/RejectRecordDTO.java
  12. 1
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
  13. 4
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml
  14. 8
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml

1
esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml

@ -187,6 +187,7 @@
<rocketmq.consumer.group>organizationGroup</rocketmq.consumer.group>
<rocketmq.producer.category.group>categoryGroup</rocketmq.producer.category.group>
<rocketmq.consumer.category.group>categoryGroup</rocketmq.consumer.category.group>
<rocketmq.consumer.contentSecurity.group>contentSecurityGroup</rocketmq.consumer.contentSecurity.group>
</properties>
</profile>

9
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java

@ -122,4 +122,13 @@ public interface EventCommentDao extends BaseDao<EventCommentEntity> {
* @Date 2020/1/6 17:40
**/
int batchInsertEventComment(@Param("list") List<EventCommentInsertDTO> commentEntities);
/**
* @describe:驳回-内容违规检测-待审核信息
* @author wangtong
* @date 2020/7/15 18:26
* @params [relationId]
* @return void
*/
void rejectEventsCommentInfo(@Param("relationId") String relationId);
}

11
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java

@ -22,7 +22,6 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.comment.EpdcCommentsAndAttitudeFromTopicFormDTO;
import com.elink.esua.epdc.dto.comment.EventCommentDTO;
import com.elink.esua.epdc.dto.comment.form.CommentFormDTO;
import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO;
import com.elink.esua.epdc.dto.comment.form.SubmitCommentFormDTO;
import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
@ -32,6 +31,7 @@ import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueHotCommentResultDTO;
import com.elink.esua.epdc.dto.issue.result.WorkEventCommentResultDTO;
import com.elink.esua.epdc.modules.comment.entity.EventCommentEntity;
import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
import java.util.List;
import java.util.Map;
@ -181,4 +181,13 @@ public interface EventCommentService extends BaseService<EventCommentEntity> {
* @return
*/
Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO);
/**
* @describe: 驳回-内容违规检测-待审核信息
* @author wangtong
* @date 2020/7/15 18:26
* @params [dto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result rejectEventsCommentInfo(RejectRecordDTO dto);
}

8
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java

@ -53,6 +53,7 @@ import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
import com.elink.esua.epdc.modules.issue.service.IssueService;
import com.elink.esua.epdc.modules.item.entity.ItemEntity;
import com.elink.esua.epdc.modules.item.service.ItemService;
import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -408,4 +409,11 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
return new Result<WorkEventsCommentsDTO>().ok(workEventsCommentsDTO);
}
@Override
@Transactional
public Result rejectEventsCommentInfo(RejectRecordDTO dto) {
baseDao.rejectEventsCommentInfo(dto.getRelationId());
return new Result();
}
}

18
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java

@ -214,4 +214,22 @@ public interface EpdcEventsDao extends BaseDao<EpdcEventsEntity> {
* @since 2020/3/7 16:39
*/
List<EpdcEventsDTO> selectListOfCategoryInfo(String oldCategoryName);
/**
* @describe: 驳回-内容违规检测-待审核信息
* @author wangtong
* @date 2020/7/15 18:18
* @params [relationId]
* @return void
*/
void rejectEventsInfo(@Param("relationId") String relationId);
/**
* @describe: 驳回-内容违规检测-待审核信息
* @author wangtong
* @date 2020/7/15 18:19
* @params [relationId]
* @return void
*/
void rejectEventsImgInfo(@Param("relationId") String relationId);
}

10
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java

@ -34,6 +34,7 @@ import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO;
import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO;
import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
import java.util.List;
import java.util.Map;
@ -277,4 +278,13 @@ public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
* @since 2020/3/7 16:33
*/
void modifyCategoryInfo(CategoryModifyDTO dto);
/**
* @describe: 驳回-内容违规检测-待审核信息
* @author wangtong
* @date 2020/7/15 18:16
* @params [dto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result rejectEventsInfo(RejectRecordDTO dto);
}

12
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@ -75,6 +75,7 @@ import com.elink.esua.epdc.modules.issue.service.IssueService;
import com.elink.esua.epdc.modules.item.service.ItemService;
import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO;
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -753,4 +754,15 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
return entities;
}
@Override
@Transactional
public Result rejectEventsInfo(RejectRecordDTO dto) {
baseDao.rejectEventsInfo(dto.getRelationId());
baseDao.rejectEventsImgInfo(dto.getRelationId());
return new Result();
}
}

10
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java

@ -33,6 +33,7 @@ import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO;
import com.elink.esua.epdc.modules.item.entity.ItemEntity;
import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO;
import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
import java.util.List;
import java.util.Map;
@ -415,4 +416,13 @@ public interface ItemService extends BaseService<ItemEntity> {
* @since 2020/3/7 16:33
*/
void modifyCategoryInfo(CategoryModifyDTO dto);
/**
* @describe: 置空 满意度评价 文本内容
* @author wangtong
* @date 2020/7/15 18:39
* @params [dto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result rejectItemSatisfactionInfo(RejectRecordDTO dto);
}

11
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@ -84,6 +84,7 @@ import com.elink.esua.epdc.modules.item.entity.*;
import com.elink.esua.epdc.modules.item.service.*;
import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO;
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.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -1574,6 +1575,16 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
}
}
@Override
@Transactional
public Result rejectItemSatisfactionInfo(RejectRecordDTO dto) {
ItemEntity entity = baseDao.selectById(dto.getRelationId());
entity.setEvaluationContent(null);
entity.setUpdatedTime(new Date());
updateById(entity);
return new Result();
}
/**
*
* 分类信息处理

64
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/RejectCheckRecordConsumer.java

@ -0,0 +1,64 @@
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.comment.service.EventCommentService;
import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
import com.elink.esua.epdc.modules.item.service.ItemService;
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消息
*
* @Authorwangtong
* @Date2020/7/14 1:54
*/
@Slf4j
@Component
@RocketMQMessageListener(topic = RocketMqConstant.MQ_TOPIC_ISSUE_ITEM_CONTENTSECURITY, consumerGroup = "${rocketmq.consumer.contentSecurity-group}", messageModel = MessageModel.CLUSTERING)
public class RejectCheckRecordConsumer implements RocketMQListener<MessageExt> {
@Autowired
private EpdcEventsService epdcEventsService;
@Autowired
private EventCommentService eventCommentService;
@Autowired
private ItemService itemService;
@Override
public void onMessage(MessageExt messageExt) {
log.info("EPDC-EVENTS-SERVER消费消息START:{topic:{}, msgId:{}}", RocketMqConstant.MQ_TOPIC_ISSUE_ITEM_CONTENTSECURITY, 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_ISSUE_ITEM_SUBMIT_CONTENTSECURITY.equals(tag)){
//删除 我要报事 相关信息
epdcEventsService.rejectEventsInfo(dto);
}else if(RocketMqConstant.MQ_TAG_ISSUE_ITEM_COMMENT_CONTENTSECURITY.equals(tag)){
//删除 议题项目评论 相关信息
eventCommentService.rejectEventsCommentInfo(dto);
}else if(RocketMqConstant.MQ_TAG_ISSUE_ITEM_SATISFACTION_CONTENTSECURITY.equals(tag)){
//置空 满意度评价 文本内容
itemService.rejectItemSatisfactionInfo(dto);
}
log.info("EPDC-EVENTS-SERVER消费消息END:{topic:{}, msgId:{}, body:{}}", RocketMqConstant.MQ_TOPIC_ISSUE_ITEM_CONTENTSECURITY, messageExt.getMsgId(), body);
} catch (Exception e) {
log.info("EPDC-EVENTS-SERVER消费消息失败:msgId:{}", messageExt.getMsgId());
e.printStackTrace();
}
}
}

27
esua-epdc/epdc-module/epdc-events/epdc-events-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;
}

1
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml

@ -141,3 +141,4 @@ rocketmq:
consumer:
group: @rocketmq.consumer.group@
category-group: @rocketmq.consumer.category.group@
contentSecurity-group: @rocketmq.consumer.contentSecurity.group@

4
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml

@ -283,4 +283,8 @@
#{item.delFlag},#{item.revision},#{item.createdBy},#{item.createdTime},#{item.updatedBy},#{item.updatedTime},#{item.partyFlag})
</foreach>
</insert>
<delete id="rejectEventsCommentInfo">
UPDATE epdc_event_comment SET DEL_FLAG = 1,UPDATED_TIME=NOW()
where id=#{relationId}
</delete>
</mapper>

8
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml

@ -398,5 +398,13 @@
WHERE
FIND_IN_SET( #{oldCategoryName}, REPLACE(REPLACE(CATEGORY_FULL_NAME,',','uniquecode'),'-',',') )
</select>
<update id="rejectEventsInfo">
UPDATE epdc_events SET DEL_FLAG = 1,UPDATED_TIME=NOW()
where id=#{relationId}
</update>
<update id="rejectEventsImgInfo">
UPDATE epdc_img SET DEL_FLAG = 1,UPDATED_TIME=NOW()
where REFERENCE_ID=#{relationId}
</update>
</mapper>

Loading…
Cancel
Save