From 509b52219b44cbbf16c3b364da566ed00f8aabbe Mon Sep 17 00:00:00 2001
From: liyanqi <15181887205@163.com>
Date: 星期四, 27 十月 2022 11:18:05 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java | 106 +++++++++++++++++++++++++++++-----------------------
1 files changed, 59 insertions(+), 47 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 c504416..011851c 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,6 +1,7 @@
package com.ycl.service.message.factory;
import com.ycl.common.constant.ChannelCode;
+import com.ycl.common.util.CommonUtils;
import com.ycl.common.util.UtilNumber;
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
@@ -42,56 +43,67 @@
@Override
public Message sendMessage(MessageParam messageParam) {
Message message = new Message();
- 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);
- //鍙戦�佹椂闂�
- if (messageAdd.getSendTime() == null) {
- messageAdd.setSendTime(new Date());
- }
- if (ChannelCode.MAIL.equals(messageParam.getChannelCode())) {
- messageAdd.setIsScan(1);
- } else {
- messageAdd.setIsScan(0);
- }
+ if (CommonUtils.isEmpty(messageParam.getId())) {
+ String messageNumber = UtilNumber.getNumber("MC", 6);
+ BeanUtils.copyProperties(messageParam, message);
+ //鐖禝d涓�0
+ message.setParentId(0L);
+ //鐢熸垚娑堟伅缂栫爜
+ message.setMessageNumber(messageNumber);
//鐢熸垚榛樿鍙傛暟
- messageAdd.setCreateTime(new Date());
- messageAdd.setUpdateTime(new Date());
- messageAdd.setCreateUser(messageParam.getCreateUser());
- messageAdd.setUpdateUser(messageParam.getCreateUser());
- messageAdd.setIsView(0);
- messageAdd.setVersion(0);
- messages.add(messageAdd);
+ //鍙戦�佹椂闂�
+ 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);
+ } else {
+ message.setId(messageParam.getId());
+ BeanUtils.copyProperties(messageParam, message);
+ message.setUpdateTime(new Date());
+ message.setUpdateUser(messageParam.getCreateUser());
+ messageMapper.updateById(message);
}
- //鎵归噺鏂板
- iMessageService.saveBatch(messages);
+ //鍙戝竷娑堟伅
+ if (message.getStatus() == 1) {
+ 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(message.getMessageNumber());
+ //鍙戦�佹椂闂�
+ 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());
+ messageAdd.setCreateUser(messageParam.getCreateUser());
+ messageAdd.setUpdateUser(messageParam.getCreateUser());
+ messageAdd.setIsView(0);
+ messageAdd.setVersion(0);
+ messages.add(messageAdd);
+ }
+ //鎵归噺鏂板
+ iMessageService.saveBatch(messages);
+ }
return message;
}
}
--
Gitblit v1.8.0