From 118b1820cf50ceaccade036f78473a78cc049b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com>
Date: Fri, 15 Aug 2025 17:02:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DesPrelimSchemeServiceImpl.java      |  9 +---
 .../message/service/IMsgNoticeService.java    |  5 +++
 .../service/impl/MsgNoticeServiceImpl.java    | 44 +++++++++++++++++++
 3 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesPrelimSchemeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesPrelimSchemeServiceImpl.java
index fc08541a..b55121f2 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesPrelimSchemeServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesPrelimSchemeServiceImpl.java
@@ -207,17 +207,14 @@ public class DesPrelimSchemeServiceImpl extends ServiceImpl<DesPrelimSchemeMappe
         }
         this.updateById(prelimScheme);
         //状态为已完成发送消息
-//        if (BusinessStatusEnum.FINISH.getStatus().equals(processEvent.getStatus())) {
-            System.out.println("1!!!!!!!!!!!!!!!!!!!!!!!");
+        if (BusinessStatusEnum.FINISH.getStatus().equals(processEvent.getStatus())) {
             //发送消息
             MsgConfig msgConfig = msgConfigService.getOne(
                 new LambdaQueryWrapper<MsgConfig>().
                     eq(MsgConfig::getProjectId, prelimScheme.getProjectId()).
                     eq(MsgConfig::getMsgKey, "prelimScheme")
             );
-            System.out.println("2!!!!!!!!!!!!!!!!!!!!!!!");
             if (msgConfig != null) {
-                System.out.println("3!!!!!!!!!!!!!!!!!!!!!!!");
                 String userId = msgConfig.getUserId();
                 List<Long> userIdList = Arrays.stream(userId.split(","))
                     .map(String::trim)
@@ -231,7 +228,6 @@ public class DesPrelimSchemeServiceImpl extends ServiceImpl<DesPrelimSchemeMappe
                     })
                     .filter(Objects::nonNull) // 过滤掉转换失败的null值
                     .collect(Collectors.toList());
-                System.out.println("4!!!!!!!!!3123213!!!!!!!!!!!!!!");
                 //发送消息
                 SendMsgDto sendMsgDto = new SendMsgDto();
                 sendMsgDto.setProjectId(prelimScheme.getProjectId());
@@ -240,10 +236,9 @@ public class DesPrelimSchemeServiceImpl extends ServiceImpl<DesPrelimSchemeMappe
                 sendMsgDto.setConfigId(msgConfig.getId());
                 sendMsgDto.setDetailId(prelimScheme.getId().toString());
                 sendMsgDto.setContent(msgConfig.getMsgContent());
-                System.out.println("5!!!!!!!!!!!!!!!!!!!!!!!");
                 msgNoticeService.sendMsg(sendMsgDto);
             }
-//        }
+        }
     }
 
     /**
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/service/IMsgNoticeService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/service/IMsgNoticeService.java
index a890c369..0f682a76 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/service/IMsgNoticeService.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/service/IMsgNoticeService.java
@@ -89,4 +89,9 @@ public interface IMsgNoticeService extends IService<MsgNotice>{
      * 指定用户向指定用户发送消息
      */
     Boolean sendMsg(SendMsgDto bo);
+
+    /**
+     * 发送消息
+     */
+    void sendMsg(Long projectId, Long detailsID,String type);
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/service/impl/MsgNoticeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/service/impl/MsgNoticeServiceImpl.java
index 10eef01c..a314031b 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/service/impl/MsgNoticeServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/service/impl/MsgNoticeServiceImpl.java
@@ -25,6 +25,7 @@ import org.dromara.message.mapper.MsgNoticeMapper;
 import org.dromara.message.service.IMsgNoticeService;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 消息Service业务层处理
@@ -168,6 +169,8 @@ public class MsgNoticeServiceImpl extends ServiceImpl<MsgNoticeMapper, MsgNotice
         return this.save(me);
     }
 
+
+
     /**
      * 指定用户向指定（一个或多个）用户发送消息
      */
@@ -209,4 +212,45 @@ public class MsgNoticeServiceImpl extends ServiceImpl<MsgNoticeMapper, MsgNotice
         }
         return b;
     }
+
+
+    
+
+
+    /**
+     * 发送消息
+     */
+    @Override
+    public void sendMsg(Long projectId, Long detailsID,String type) {
+        //发送消息
+        MsgConfig msgConfig = msgConfigService.getOne(
+            new LambdaQueryWrapper<MsgConfig>().
+                eq(MsgConfig::getProjectId, projectId).
+                eq(MsgConfig::getMsgKey, type)
+        );
+        if (msgConfig != null) {
+            String userId = msgConfig.getUserId();
+            List<Long> userIdList = Arrays.stream(userId.split(","))
+                .map(String::trim)
+                .map(s -> {
+                    try {
+                        return Long.valueOf(s);
+                    } catch (NumberFormatException e) {
+                        // 处理转换失败的情况
+                        return null; // 或者根据需求处理
+                    }
+                })
+                .filter(Objects::nonNull) // 过滤掉转换失败的null值
+                .collect(Collectors.toList());
+            //发送消息
+            SendMsgDto sendMsgDto = new SendMsgDto();
+            sendMsgDto.setProjectId(projectId);
+            sendMsgDto.setRecipientIds(userIdList);
+            sendMsgDto.setSenderId(0L);
+            sendMsgDto.setConfigId(msgConfig.getId());
+            sendMsgDto.setDetailId(detailsID.toString());
+            sendMsgDto.setContent(msgConfig.getMsgContent());
+            this.sendMsg(sendMsgDto);
+        }
+    }
 }