From 958816e756e5bd93fd8dd19718a089c4c1c97222 Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Wed, 15 Nov 2023 15:49:15 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=8F=91=E9=80=81=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../message/handle/impl/SmsSendMsgHandle.java | 25 +++++++++++++++++--
 .../impl/SysAnnouncementServiceImpl.java      |  3 ++-
 .../service/impl/SendMessageServiceImpl.java  |  7 ++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/laws-module-system/src/main/java/com/jero/modules/message/handle/impl/SmsSendMsgHandle.java b/laws-module-system/src/main/java/com/jero/modules/message/handle/impl/SmsSendMsgHandle.java
index 63c38a3c..4b6051ec 100644
--- a/laws-module-system/src/main/java/com/jero/modules/message/handle/impl/SmsSendMsgHandle.java
+++ b/laws-module-system/src/main/java/com/jero/modules/message/handle/impl/SmsSendMsgHandle.java
@@ -1,15 +1,36 @@
 package com.jero.modules.message.handle.impl;
 
+import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.SpringContextUtils;
+import com.jero.common.util.UUIDUtils;
+import com.jero.modules.system.entity.SysAnnouncement;
+import com.jero.modules.system.service.ISysAnnouncementService;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.modules.message.handle.ISendMsgHandle;
+import org.apache.shiro.SecurityUtils;
+
+import java.util.Date;
 
 @Slf4j
 public class SmsSendMsgHandle implements ISendMsgHandle {
 
 	@Override
 	public void SendMsg(String esReceiver, String esTitle, String esContent) {
-		// TODO Auto-generated method stub
-		log.info("发短信");
+		ISysAnnouncementService bean = SpringContextUtils.getBean(ISysAnnouncementService.class);
+		String id = UUIDUtils.randomUUID20();
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		SysAnnouncement sysAnnouncement = new SysAnnouncement();
+		sysAnnouncement.setId(id);
+		sysAnnouncement.setTitile(esTitle);
+		sysAnnouncement.setMsgContent(esContent);
+		sysAnnouncement.setSender(loginUser.getId());
+		sysAnnouncement.setMsgCategory("2");
+		sysAnnouncement.setMsgType("USER");
+		sysAnnouncement.setSendStatus("1");
+		sysAnnouncement.setSendTime(new Date());
+		sysAnnouncement.setDelFlag("0");
+		sysAnnouncement.setUserIds(esReceiver);
+		bean.saveAnnouncement(sysAnnouncement);
 	}
 
 }
diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementServiceImpl.java
index 3cf99fa8..f5a39640 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementServiceImpl.java
+++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementServiceImpl.java
@@ -46,7 +46,8 @@ public class SysAnnouncementServiceImpl extends ServiceImpl<SysAnnouncementMappe
 			sysAnnouncementMapper.insert(sysAnnouncement);
 			// 2.插入用户通告阅读标记表记录
 			String userId = sysAnnouncement.getUserIds();
-			String[] userIds = userId.substring(0, (userId.length()-1)).split(",");
+			//String[] userIds = userId.substring(0, (userId.length()-1)).split(",");
+			String[] userIds = userId.split(",");
 			String anntId = sysAnnouncement.getId();
 			Date refDate = new Date();
 			for(int i=0;i<userIds.length;i++) {
diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java
index f56fce94..f8eadfdc 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java
@@ -8,6 +8,7 @@ import com.jero.modules.docking.hiwork.handle.DingDingSendMsgHandle;
 import com.jero.modules.docking.hiwork.handle.SystemSendMsgHandle;
 import com.jero.modules.message.entity.SysMessageTemplate;
 import com.jero.modules.message.handle.ISendMsgHandle;
+import com.jero.modules.message.handle.impl.SmsSendMsgHandle;
 import com.jero.modules.message.service.ISysMessageTemplateService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -74,6 +75,12 @@ public class SendMessageServiceImpl implements SendMessageAPI {
                 } else if ("6".equals(type)) {
                     // Hiwork系统消息
                     sendMsgHandle = new SystemSendMsgHandle();
+                } else if ("4".equals(type)) {
+                    // 普通系统消息
+                    sendMsgHandle = new SmsSendMsgHandle();
+                    if (!isSend) {
+                        sendMsgHandle.SendMsg(sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent());
+                    }
                 } else {
                     return;
                 }