From 240a430cd12066a13e35e3da554b3b6afecdf512 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 03 十一月 2022 17:56:06 +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 | 75 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 21 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..8375855 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,11 @@
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;
+import com.ycl.mapper.message.MessageMapper;
import com.ycl.service.message.IMessageService;
import com.ycl.service.message.Sender;
import org.springframework.beans.BeanUtils;
@@ -31,34 +34,64 @@
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);
- for (String id : ids) {
- Message messageAdd = new Message();
- BeanUtils.copyProperties(messageParam, messageAdd);
- //璁剧疆鎺ユ敹鑰�
- messageAdd.setTargetTo(id);
- //鐢熸垚8浣嶉殢鏈烘暟娑堟伅缂栫爜
- messageAdd.setMessageNumber(messageNumber);
- //鍙戦�佹椂闂�
- messageAdd.setSendTime(new Date());
+ 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());
+ }
+ if (ChannelCode.SMS.equals(messageParam.getChannelCode())) {
+ message.setIsScan(1);
+ } else {
+ message.setIsScan(0);
+ }
+ message.setIsView(0);
+ message.setVersion(0);
+ 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);
}
- BeanUtils.copyProperties(messageParam, message);
- //鎵归噺鏂板
- iMessageService.saveBatch(messages);
+ //鍙戝竷娑堟伅
+ if (message.getStatus() == 1) {
+ String[] ids = messageParam.getTargetTo().split(",");
+ for (String id : ids) {
+ Message messageAdd = new Message();
+ BeanUtils.copyProperties(message, messageAdd);
+ //瀛愮被id璁剧疆涓虹┖
+ messageAdd.setId(null);
+ //璁剧疆鐖剁被Id
+ messageAdd.setParentId(message.getId());
+ //璁剧疆鎺ユ敹鑰�
+ messageAdd.setTargetTo(id);
+ messages.add(messageAdd);
+ }
+ //鎵归噺鏂板
+ iMessageService.saveBatch(messages);
+ }
return message;
}
}
--
Gitblit v1.8.0