From ffbf0130d65b9439444672f7d93b2a5438fa16fc Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Wed, 6 Nov 2024 16:01:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=97=B6=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=A1=BE=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/service/impl/RepairWorkerServiceImpl.java  |  8 +++++---
 .../service/impl/DlRepairBookingServiceImpl.java    | 13 ++++++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairWorkerServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairWorkerServiceImpl.java
index 62d1f243..fc10bb08 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairWorkerServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairWorkerServiceImpl.java
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.common.RepairRoleEnum;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.module.app.controller.admin.NotifyMessageSocket;
 import cn.iocoder.yudao.module.base.entity.RepairWorker;
 import cn.iocoder.yudao.module.base.mapper.RepairWorkerMapper;
@@ -223,7 +224,7 @@ public class RepairWorkerServiceImpl extends ServiceImpl<RepairWorkerMapper, Rep
     public void sentMessage(Long userId, String text) {
         try {
             //获取当前登录用户
-            LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+//            LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
             // 准备发送参数
             Map<String, Object> templateParams = new HashMap<>();
             // 发送模版内容
@@ -232,8 +233,9 @@ public class RepairWorkerServiceImpl extends ServiceImpl<RepairWorkerMapper, Rep
             sendApi.sendSingleMessageToAdmin(new NotifySendSingleToUserReqDTO()
                     .setUserId(userId)
                     .setTemplateCode(TICKET_EMPLOY).setTemplateParams(templateParams));
-            //发送语音提醒
-            notifyMessageSocket.sendMessage(text, loginUser.getTenantId().toString(), userId.toString());
+            //发送语音提醒---小李---通过租户上下文去取租户ID
+//            notifyMessageSocket.sendMessage(text, loginUser.getTenantId().toString(), userId.toString());
+            notifyMessageSocket.sendMessage(text, TenantContextHolder.getRequiredTenantId().toString(), userId.toString());
         } catch (IOException e) {
             e.printStackTrace();
         }
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/service/impl/DlRepairBookingServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/service/impl/DlRepairBookingServiceImpl.java
index a49b2503..1ea90272 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/service/impl/DlRepairBookingServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/service/impl/DlRepairBookingServiceImpl.java
@@ -7,7 +7,9 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.common.RepairRoleEnum;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
+import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.module.app.booking.vo.BookingQueryVO;
+import cn.iocoder.yudao.module.base.service.RepairWorkerService;
 import cn.iocoder.yudao.module.booking.entity.DlRepairBooking;
 import cn.iocoder.yudao.module.booking.mapper.DlRepairBookingMapper;
 import cn.iocoder.yudao.module.booking.service.DlRepairBookingService;
@@ -67,6 +69,9 @@ public class DlRepairBookingServiceImpl extends ServiceImpl<DlRepairBookingMappe
     @Autowired
     private AdminUserApi adminUserApi;
 
+    @Resource
+    private RepairWorkerService repairWorkerService;
+
     /**
      * 维修预约表 新增、修改
      *
@@ -91,12 +96,14 @@ public class DlRepairBookingServiceImpl extends ServiceImpl<DlRepairBookingMappe
 
         // 选择了服务顾问
         if (ObjectUtil.isNotEmpty(repairBookingRespVO.getAdviserId())){
-            // 站内信通知
-            // websocket通知
+            // 发送消息通知
+            repairWorkerService.sentMessage(Long.valueOf(repairBookingRespVO.getAdviserId()), message);
         }else {
         // 没选服务顾问
             // 获取所有的服务顾问
-            // 站内信通知和websocket通知
+            List<UserDTO> allServicer = getAllServicer(TenantContextHolder.getRequiredTenantId());
+            // 发送消息通知
+            allServicer.forEach(item -> repairWorkerService.sentMessage(item.getId(), message));
         }
 
         // 正常的新增、修改