消息优化

44f9b9e5 · 阳浪 · e5e8f7d2 · 44f9b9e5 · 44f9b9e5 · 44f9b9e5
Commit 44f9b9e5 authored Mar 19, 2025 by 阳浪
6 changed files
--- a/cloud-newMessage-api/src/main/java/com/yizhi/message/application/vo/MessageRemindVo.java
+++ b/cloud-newMessage-api/src/main/java/com/yizhi/message/application/vo/MessageRemindVo.java
@@ -54,7 +54,7 @@ public class MessageRemindVo implements Serializable {
    private Boolean isChangge = false;
    @ApiModelProperty(value = "专门存放提醒时间设置")
-    private List<MessageTaskRemindVo> messageTaskRemindVos = new ArrayList<>();
+    private List<com.yizhi.core.application.vo.MessageTaskRemindVo> messageTaskRemindVos = new ArrayList<>();
    @ApiModelProperty(value = "目前只有培训项目需要，计划同步项目可见范围")
    private Boolean visibleRangeUpdate = false;
@@ -63,7 +63,7 @@ public class MessageRemindVo implements Serializable {
    private Integer visibleRange;
    @ApiModelProperty(value = "业务参数对象")
-    private TaskVo taskVo;
+    private com.yizhi.core.application.vo.TaskVo taskVo;
    @ApiModelProperty(value = "触发消息专用 发送时间")
    private Date sendTime;

--- a/cloud-newMessage-api/src/main/java/com/yizhi/message/application/vo/MessageVo.java
+++ b/cloud-newMessage-api/src/main/java/com/yizhi/message/application/vo/MessageVo.java
@@ -69,7 +69,7 @@ public class MessageVo {
    private List<Long> messageParameterIds;
    @ApiModelProperty(value = "专门存放提醒时间设置")
-    private List<MessageTaskRemindVo> messageTaskRemindVos = new ArrayList<>();
+    private List<com.yizhi.core.application.vo.MessageTaskRemindVo> messageTaskRemindVos = new ArrayList<>();
 }
--- a/cloud-newMessage-service/src/main/java/com/yizhi/message/application/controller/remote/RemoteMessageAccountComtroller.java
+++ b/cloud-newMessage-service/src/main/java/com/yizhi/message/application/controller/remote/RemoteMessageAccountComtroller.java
@@ -2,10 +2,8 @@ package com.yizhi.message.application.controller.remote;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.yizhi.core.application.event.EventWrapper;
 import com.yizhi.message.application.constans.Constans;
 import com.yizhi.message.application.domain.MessageAccount;
-import com.yizhi.message.application.event.MessageEventHandler;
 import com.yizhi.message.application.service.MessageAccountService;
 import com.yizhi.message.application.service.MessageRemindService;
 import com.yizhi.message.application.vo.MessageRemindVo;
@@ -56,19 +54,10 @@ public class RemoteMessageAccountComtroller {
    @PostMapping("/processBizEvent")
    public void processBizEvent(@RequestBody com.yizhi.core.application.vo.MessageRemindVo data) {
-        MessageRemindVo mrv = new MessageRemindVo();
+        com.yizhi.message.application.vo.MessageRemindVo mrv = new com.yizhi.message.application.vo.MessageRemindVo();
        BeanUtils.copyProperties(data,mrv);
        LOGGER.info("收到消息，开始保存待发消息，其remindVo："+ mrv);
        if (mrv != null) {
-            if(CollectionUtils.isEmpty(data.getMessageTaskRemindVos())){
-                data.getMessageTaskRemindVos().stream().forEach(mtv->{
-                    MessageTaskRemindVo m = new MessageTaskRemindVo();
-                    BeanUtils.copyProperties(mtv,m);
-                    mrv.getMessageTaskRemindVos().add(m);
-                   }
-                );
-            }
            messageRemindService.insertMessageRemind(mrv);
        }else {
            LOGGER.info("remindVo"+mrv+"接到的消息内容为空！！！");

--- a/cloud-newMessage-service/src/main/java/com/yizhi/message/application/controller/util/MessageUtil.java
+++ b/cloud-newMessage-service/src/main/java/com/yizhi/message/application/controller/util/MessageUtil.java
@@ -11,7 +11,7 @@ import com.yizhi.message.application.constans.Constans;
 import com.yizhi.message.application.enums.EvenType;
 import com.yizhi.message.application.enums.MessageParameterEnums;
 import com.yizhi.message.application.enums.ReturnParameterEnums;
-import com.yizhi.message.application.vo.TaskVo;
+import com.yizhi.core.application.vo.TaskVo;
 import com.yizhi.message.application.enums.*;
 import com.yizhi.research.application.feign.ResearchClient;
 import com.yizhi.research.application.vo.domain.ResearchVo;

--- a/cloud-newMessage-service/src/main/java/com/yizhi/message/application/service/impl/MessageRemindServiceImple.java
+++ b/cloud-newMessage-service/src/main/java/com/yizhi/message/application/service/impl/MessageRemindServiceImple.java
 package com.yizhi.message.application.service.impl;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yizhi.application.orm.id.IdGenerator;
@@ -16,6 +17,8 @@ import com.yizhi.message.application.service.MessageParamRelationService;
 import com.yizhi.message.application.service.MessageRemindService;
 import com.yizhi.message.application.service.MessageVisibleRangeService;
 import com.yizhi.message.application.util.DateConvertor;
+import com.yizhi.message.application.vo.MessageRemindVo;
+import com.yizhi.core.application.vo.MessageTaskRemindVo;
 import com.yizhi.message.application.vo.MessageVo;
 import com.yizhi.message.application.vo.TaskVo;
 import com.yizhi.message.application.mapper.*;
@@ -172,7 +175,7 @@ public class MessageRemindServiceImple extends ServiceImpl<MessageRemindMapper, 
     * @param taskVo
     * @return
     */
-    public String getContext(com.yizhi.message.application.vo.MessageRemindVo vo, TaskVo taskVo) {
+    public String getContext(MessageRemindVo vo, com.yizhi.core.application.vo.TaskVo taskVo) {
        String messageContext = "";
        Long siteId = vo.getRequestContext().getSiteId();
@@ -399,7 +402,7 @@ public class MessageRemindServiceImple extends ServiceImpl<MessageRemindMapper, 
    @Override
    @Transactional(rollbackFor = Exception.class)
-    public Integer insertMessageRemind(com.yizhi.message.application.vo.MessageRemindVo vo) {
+    public Integer insertMessageRemind(MessageRemindVo vo) {
        RequestContext context = vo.getRequestContext();
        String messageContext = "";
        Date date = new Date();
@@ -441,9 +444,9 @@ public class MessageRemindServiceImple extends ServiceImpl<MessageRemindMapper, 
                try {
                    Integer num = 0;
                    if (CollectionUtils.isNotEmpty(vo.getMessageTaskRemindVos())) {
-                        List<com.yizhi.message.application.vo.MessageTaskRemindVo> messageTaskRemindVos = vo.getMessageTaskRemindVos();
+                        List<MessageTaskRemindVo> messageTaskRemindVos = vo.getMessageTaskRemindVos();
                        //保存待发消息
-                        for (com.yizhi.message.application.vo.MessageTaskRemindVo vo1 : messageTaskRemindVos) {
+                        for (MessageTaskRemindVo vo1 : messageTaskRemindVos) {
                            //作业没有开始时间，如果有该数据，则过滤
                            if (vo1.getTimeEventType() == 1 && vo.getRelationType().equals(6)) {
                                continue;
@@ -477,7 +480,7 @@ public class MessageRemindServiceImple extends ServiceImpl<MessageRemindMapper, 
     * @param vo
     * @return
     */
-    public Integer copyMessage(com.yizhi.message.application.vo.MessageRemindVo vo) {
+    public Integer copyMessage(MessageRemindVo vo) {
        if (vo.getRelationType() == null || vo.getRelationId() == null || vo.getOldRelationId() == null) {
            logger.info("copy待发消息时，缺少必要参数");
            return -1;
@@ -509,7 +512,7 @@ public class MessageRemindServiceImple extends ServiceImpl<MessageRemindMapper, 
     * @param vo
     * @return
     */
-    public Integer updateMessageRemindByTaskId(com.yizhi.message.application.vo.MessageRemindVo vo) {
+    public Integer updateMessageRemindByTaskId(MessageRemindVo vo) {
        if (vo.getRelationType() == null || vo.getRelationId() == null) {
            logger.info("修改待发消息时，缺少必要参数");
            return -1;
@@ -549,7 +552,7 @@ public class MessageRemindServiceImple extends ServiceImpl<MessageRemindMapper, 
     * @param date
     * @return
     */
-    public Integer insertMessageRemind(com.yizhi.message.application.vo.MessageRemindVo vo, String messageContext, RequestContext context, com.yizhi.message.application.vo.MessageTaskRemindVo vo1, Date date) {
+    public Integer insertMessageRemind(MessageRemindVo vo, String messageContext, RequestContext context, MessageTaskRemindVo vo1, Date date) {
        MessageRemind messageRemind = new MessageRemind();
        Long messageRemindId = idGenerator.generate();
        BeanUtils.copyProperties(vo, messageRemind);
@@ -574,6 +577,8 @@ public class MessageRemindServiceImple extends ServiceImpl<MessageRemindMapper, 
            messageRemind.setTimeEventType(vo1.getTimeEventType());
            messageRemind.setTimeType(vo1.getTimeType());
            if (vo1.getTimeEventType() != 3) {
+                logger.info("======保存待发信息vo，{}", JSONObject.toJSONString(vo));
+                logger.info("======保存待发信息vo1，{}", JSONObject.toJSONString(vo1));
                //计算最终发送时间
                Date sendTime = getSendTime(vo1.getTimeEventType(), vo1.getTimeType(), vo.getTaskVo().getTaskStratTime(), vo.getTaskVo().getTaskEndTime());
                messageRemind.setSendTime(sendTime);
@@ -656,7 +661,7 @@ public class MessageRemindServiceImple extends ServiceImpl<MessageRemindMapper, 
            messageVo.setId(message.getId());
            for (MessageRemind remind : list) {
-                com.yizhi.message.application.vo.MessageTaskRemindVo taskRemindVo = new com.yizhi.message.application.vo.MessageTaskRemindVo();
+                MessageTaskRemindVo taskRemindVo = new MessageTaskRemindVo();
                taskRemindVo.setSendTime(remind.getSendTime());
                taskRemindVo.setTimeEventType(remind.getTimeEventType());
                taskRemindVo.setTimeType(remind.getTimeType());
@@ -672,7 +677,7 @@ public class MessageRemindServiceImple extends ServiceImpl<MessageRemindMapper, 
     *
     * @param messageRemindVo
     */
-    public void deleteMessageRemind(com.yizhi.message.application.vo.MessageRemindVo messageRemindVo) {
+    public void deleteMessageRemind(MessageRemindVo messageRemindVo) {
        if (messageRemindVo.getMessageType() != 1 && (messageRemindVo.getRelationId() == null || messageRemindVo.getRelationType() == null)) {
            logger.info("删除待发消息需要的参数缺少！");
@@ -705,7 +710,7 @@ public class MessageRemindServiceImple extends ServiceImpl<MessageRemindMapper, 
    @Override
    @Transactional(rollbackFor = Exception.class)
-    public Integer updateMessageRemind(com.yizhi.message.application.vo.MessageRemindVo messageRemindVo) {
+    public Integer updateMessageRemind(MessageRemindVo messageRemindVo) {
        RequestContext context = ContextHolder.get();
        Date date = new Date();

--- a/cloud-newMessage-service/src/main/java/com/yizhi/message/application/service/impl/MessageServiceImple.java
+++ b/cloud-newMessage-service/src/main/java/com/yizhi/message/application/service/impl/MessageServiceImple.java
@@ -441,7 +441,17 @@ public class MessageServiceImple extends ServiceImpl<MessageMapper, Message> imp
                        if (canUpdate) {
                            context.setId(messageVo.getMessageContextId());
                            context.setContext(messageVo.getContext());
-                            boolean c = context.updateById();
+                            boolean c =false;
+                            if(messageVo.getMessageContextId()==null){
+                                context.setId(idGenerator.generate());
+                                context.setMessageId(message.getId());
+                                context.setCreateById(requestContext.getAccountId());
+                                context.setCreateByName(requestContext.getAccountName());
+                                context.setCreateTime(date);
+                                c = messageContextService.insert(context);
+                            }else {
+                                c = context.updateById();
+                            }
                        }
                    }
                } catch (Exception e) {