消息优化

cloud-training-project-service/src/main/java/com/yizhi/training/application/controller/TpCommentReplyController.java

@@ -53,13 +53,14 @@ public class TpCommentReplyController {
     public Page<TpCommentReply> replyList(@RequestParam("commmentId")Long commmentId, @RequestParam("pageNo")Integer pageNo, @RequestParam("pageSize")Integer pageSize, @RequestParam("type")Integer type){
         Page<TpCommentReply> page = new Page<TpCommentReply>(pageNo, pageSize);
         TpCommentReply reply = new TpCommentReply();
-        if (1==type) {
-			reply.setState(0);
-		}
+		RequestContext requestContext = ContextHolder.get();
         reply.setTpCommentId(commmentId);
         reply.setAuditStatus("0");
         EntityWrapper<TpCommentReply> wrapper = new EntityWrapper<TpCommentReply>(reply);
-        iTpCommentReplyService.selectPage(page, wrapper);
+		if (1==type) {
+			wrapper.and("(state={0} or create_by_id={1})", 0, requestContext.getAccountId());
+		}
+		iTpCommentReplyService.selectPage(page, wrapper);
         String fullName;
         String name;
         for (TpCommentReply listCommentVo : page.getRecords()) {

cloud-training-project-service/src/main/java/com/yizhi/training/application/util/TrainingEvenSendMessage.java

@@ -66,7 +66,7 @@ public class TrainingEvenSendMessage {
             vo.setRequestContext(requestContext);
             try {
                 //临时取消触发功能
-                publicSendMessageClient.processBizEvent( new EventWrapper<MessageRemindVo>(null, vo));
+                publicSendMessageClient.processBizEvent(vo);
             } catch (Exception e) {
                 e.printStackTrace();
                 logger.error("发送消息失败=====================", e);
@@ -108,13 +108,13 @@ public class TrainingEvenSendMessage {
         }
         if (remindVo.getHasDeleted()) {
             vo.setHasDeleted(remindVo.getHasDeleted());
-            publicSendMessageClient.processBizEvent( new EventWrapper<MessageRemindVo>(null, vo));
+            publicSendMessageClient.processBizEvent(vo);
             logger.info("发送删除消息成功！！");
         } else {
             if (remindVo.getVisibleRangeUpdate()) {
                 vo.setVisibleRangeUpdate(remindVo.getVisibleRangeUpdate());
                 vo.setVisibleRange(trainingProject.getVisibleRange());
-                publicSendMessageClient.processBizEvent( new EventWrapper<MessageRemindVo>(null, vo));
+                publicSendMessageClient.processBizEvent(vo);
                 logger.info("发送计划同步可见范围消息成功！！");
                 return;
             }
@@ -123,7 +123,7 @@ public class TrainingEvenSendMessage {
                 //1 为消息业务可发送状态  0 则不行
                 vo.setTaskStatus(trainingProject.getStatus().equals(ProjectConstant.PROJECT_STATUS_ENABLE) ? 1 : 0);
                 vo.setTaskStatusUpdate(remindVo.getTaskStatusUpdate());
-                publicSendMessageClient.processBizEvent( new EventWrapper<MessageRemindVo>(null, vo));
+                publicSendMessageClient.processBizEvent(vo);
                 logger.info("发送修改业务状态消息成功=====================");
                 return;
             }
@@ -158,7 +158,7 @@ public class TrainingEvenSendMessage {
                     }
 
                     try {
-                        publicSendMessageClient.processBizEvent( new EventWrapper<MessageRemindVo>(null, vo));
+                        publicSendMessageClient.processBizEvent(vo);
                         logger.info("发送消息成功=====================");
                     } catch (Exception e) {
                         e.printStackTrace();