From 9969bea2a8c1eab64c12a51a2d24d65e5b6c0dd0 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 24 十月 2022 18:12:41 +0800
Subject: [PATCH] 日志导出乱码 日志查询导出 代码重构

---
 ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java |   41 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java b/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java
index 76639dc..c504416 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java
@@ -1,8 +1,10 @@
 package com.ycl.service.message.factory;
 
+import com.ycl.common.constant.ChannelCode;
 import com.ycl.common.util.UtilNumber;
 import com.ycl.dto.message.MessageParam;
 import com.ycl.entity.message.Message;
+import com.ycl.mapper.message.MessageMapper;
 import com.ycl.service.message.IMessageService;
 import com.ycl.service.message.Sender;
 import org.springframework.beans.BeanUtils;
@@ -31,22 +33,54 @@
     public void setIMessageService(IMessageService iMessageService) {
         InnerSender.iMessageService = iMessageService;
     }
+    private static MessageMapper messageMapper;
+    @Autowired
+    public void setMessageMapper(MessageMapper messageMapper) {
+        InnerSender.messageMapper = messageMapper;
+    }
 
     @Override
     public Message sendMessage(MessageParam messageParam) {
         Message message = new Message();
-        List<Message> messages = new ArrayList<>();
-        String[] ids = messageParam.getTargetTo().split(",");
         String messageNumber = UtilNumber.getNumber("MC", 6);
+        List<Message> messages = new ArrayList<>();
+        BeanUtils.copyProperties(messageParam, message);
+        //鐖禝d涓�0
+        message.setParentId(0L);
+        //鐢熸垚娑堟伅缂栫爜
+        message.setMessageNumber(messageNumber);
+        //鐢熸垚榛樿鍙傛暟
+        //鍙戦�佹椂闂�
+        if (message.getSendTime() == null) {
+            message.setSendTime(new Date());
+        }
+        message.setIsView(0);
+        message.setVersion(0);
+        message.setIsScan(1);
+        message.setCreateTime(new Date());
+        message.setUpdateTime(new Date());
+        message.setCreateUser(messageParam.getCreateUser());
+        message.setUpdateUser(messageParam.getCreateUser());
+        messageMapper.insert(message);
+        String[] ids = messageParam.getTargetTo().split(",");
         for (String id : ids) {
             Message messageAdd = new Message();
             BeanUtils.copyProperties(messageParam, messageAdd);
+            //璁剧疆鐖剁被Id
+            messageAdd.setParentId(message.getId());
             //璁剧疆鎺ユ敹鑰�
             messageAdd.setTargetTo(id);
             //鐢熸垚8浣嶉殢鏈烘暟娑堟伅缂栫爜
             messageAdd.setMessageNumber(messageNumber);
             //鍙戦�佹椂闂�
-            messageAdd.setSendTime(new Date());
+            if (messageAdd.getSendTime() == null) {
+                messageAdd.setSendTime(new Date());
+            }
+            if (ChannelCode.MAIL.equals(messageParam.getChannelCode())) {
+                messageAdd.setIsScan(1);
+            } else {
+                messageAdd.setIsScan(0);
+            }
             //鐢熸垚榛樿鍙傛暟
             messageAdd.setCreateTime(new Date());
             messageAdd.setUpdateTime(new Date());
@@ -56,7 +90,6 @@
             messageAdd.setVersion(0);
             messages.add(messageAdd);
         }
-        BeanUtils.copyProperties(messageParam, message);
         //鎵归噺鏂板
         iMessageService.saveBatch(messages);
         return message;

--
Gitblit v1.8.0