From 09e6dc3fb7266620fafb5e341808a8eb36e080a1 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 13 十二月 2025 22:51:52 +0800
Subject: [PATCH] feat:增加企业微信消息提醒
---
ruoyi-system/src/main/java/com/ruoyi/system/listener/TaskMessageListener.java | 155 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 103 insertions(+), 52 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/listener/TaskMessageListener.java b/ruoyi-system/src/main/java/com/ruoyi/system/listener/TaskMessageListener.java
index 629bed0..a9a1141 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/listener/TaskMessageListener.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/listener/TaskMessageListener.java
@@ -1,5 +1,8 @@
package com.ruoyi.system.listener;
+import com.ruoyi.system.domain.*;
+import com.ruoyi.system.event.TaskDispatchSyncEvent;
+import com.ruoyi.system.service.ISysTaskAssigneeService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -8,10 +11,6 @@
import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.domain.SysMessage;
-import com.ruoyi.system.domain.SysTask;
-import com.ruoyi.system.domain.SysTaskEmergency;
-import com.ruoyi.system.domain.NotifyTask;
import com.ruoyi.system.event.TaskCreatedEvent;
import com.ruoyi.system.event.TaskAssignedEvent;
import com.ruoyi.system.event.TaskStatusChangedEvent;
@@ -23,8 +22,12 @@
import com.ruoyi.system.service.INotifyTaskService;
import com.ruoyi.system.service.INotifyDispatchService;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 浠诲姟娑堟伅鐩戝惉鍣�
@@ -61,6 +64,28 @@
/** 寰呭噯澶囩姸鎬� - 鍙互鍙戦�佺煭淇￠�氱煡 */
private static final String TASK_STATUS_PREPARING = "PREPARING";
+ @Autowired
+ private ISysTaskAssigneeService taskAssigneeService;
+
+ @Async
+ @EventListener
+ public void handleTaskDispatchEvent(TaskDispatchSyncEvent event) {
+ try{
+ log.info("鏀跺埌浠诲姟娲惧彂鍚屾浜嬩欢锛屼换鍔D锛歿}锛屼换鍔＄紪鍙凤細{}锛屾淳鍙戝崟ID锛歿}", event.getTaskId(), event.getTaskCode(), event.getDispatchOrderId());
+ SysTask task=sysTaskMapper.selectSysTaskByTaskId(event.getTaskId());
+ SysTaskEmergency emergency = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(event.getTaskId());
+ if(emergency != null){
+ List<SysTaskAssignee> assignees=taskAssigneeService.getAssigneesByTaskId(emergency.getTaskId());
+ if(assignees!=null && !assignees.isEmpty()){
+ List<Long> assigneeIds=assignees.stream().map(SysTaskAssignee::getUserId).collect(Collectors.toList());
+ sendDispatchNotify(assigneeIds, task.getCreatorId(), event.getTaskId(), task.getTaskCode(), buildNotifyContent(task, emergency));
+ }
+ }
+
+ }catch (Exception ex){
+ log.error("澶勭悊浠诲姟娲惧彂鍚屾浜嬩欢澶辫触", ex);
+ }
+ }
/**
* 鐩戝惉浠诲姟鍒涘缓浜嬩欢
*
@@ -145,52 +170,8 @@
// 鏋勫缓閫氱煡鍐呭
String notifyContent = buildNotifyContent(task, emergency);
-
- // 鏀堕泦鍒涘缓鐨勯�氱煡浠诲姟
- List<NotifyTask> createdTasks = new ArrayList<>();
-
- // 涓烘瘡涓墽琛屼汉鍒涘缓閫氱煡浠诲姟
- for (Long assigneeId : event.getAssigneeIds()) {
- // 鎺掗櫎鍒涘缓浜�
- if (creatorId != null && creatorId.equals(assigneeId)) {
- log.debug("璺宠繃鍒涘缓浜猴紝涓嶅彂閫佷换鍔″垎閰嶉�氱煡锛寀serId={}", assigneeId);
- continue;
- }
-
- // 鑾峰彇鎵ц浜轰俊鎭�
- SysUser assignee = sysUserMapper.selectUserById(assigneeId);
- if (assignee == null) {
- log.warn("鎵句笉鍒版墽琛屼汉淇℃伅锛岀敤鎴稩D锛歿}", assigneeId);
- continue;
- }
-
- // 鍒涘缓閫氱煡浠诲姟锛堝甫闃查噸锛�
- NotifyTask notifyTask = new NotifyTask();
- notifyTask.setTaskId(event.getTaskId());
- notifyTask.setTaskCode(event.getTaskCode());
- notifyTask.setNotifyType(NotifyTask.NOTIFY_TYPE_TASK_ASSIGN);
- notifyTask.setUserId(assigneeId);
- notifyTask.setUserName(assignee.getNickName());
- notifyTask.setUserPhone(assignee.getPhonenumber());
- notifyTask.setTitle("浠诲姟鎺ㄩ��");
- notifyTask.setContent(notifyContent);
- notifyTask.setCreateBy(event.getAssignerName() != null ? event.getAssignerName() : "绯荤粺");
-
- NotifyTask created = notifyTaskService.createNotifyTask(notifyTask);
- if (created != null) {
- createdTasks.add(created);
- log.info("鍒涘缓閫氱煡浠诲姟鎴愬姛锛宨d={}, userId={}", created.getId(), assigneeId);
- } else {
- log.info("閫氱煡浠诲姟宸插瓨鍦紝璺宠繃锛宼askId={}, userId={}", event.getTaskId(), assigneeId);
- }
- }
+ this.sendDispatchNotify(event.getAssigneeIds(), creatorId, event.getTaskId(), event.getTaskCode(), notifyContent);
- // 鍒嗗彂閫氱煡浠诲姟
- if (!createdTasks.isEmpty()) {
- int successCount = notifyDispatchService.dispatchNotifies(createdTasks);
- log.info("閫氱煡鍒嗗彂瀹屾垚锛宼askId={}锛屽垱寤烘暟閲�={}锛屾垚鍔熸暟閲�={}",
- event.getTaskId(), createdTasks.size(), successCount);
- }
} catch (Exception e) {
log.error("澶勭悊浠诲姟鍒嗛厤浜嬩欢澶辫触", e);
@@ -198,11 +179,79 @@
}
/**
+ * 鍚戞墽琛屼汉鍙戦�佷换鍔″垎閰嶉�氱煡
+ * @param assigneeIds
+ * @param creatorId
+ * @param taskId
+ * @param taskCode
+ *
+ * @param notifyContent
+ */
+
+ private void sendDispatchNotify(List<Long> assigneeIds, Long creatorId,
+ Long taskId,String taskCode,String notifyContent) {
+ // 鏀堕泦鍒涘缓鐨勯�氱煡浠诲姟
+
+ List<NotifyTask> createdTasks = new ArrayList<>();
+
+ // 涓烘瘡涓墽琛屼汉鍒涘缓閫氱煡浠诲姟
+ for (Long assigneeId : assigneeIds) {
+ // 鎺掗櫎鍒涘缓浜�
+ if (creatorId != null && creatorId.equals(assigneeId)) {
+ log.debug("璺宠繃鍒涘缓浜猴紝涓嶅彂閫佷换鍔″垎閰嶉�氱煡锛寀serId={}", assigneeId);
+ continue;
+ }
+
+ // 鑾峰彇鎵ц浜轰俊鎭�
+ SysUser assignee = sysUserMapper.selectUserById(assigneeId);
+ if (assignee == null) {
+ log.warn("鎵句笉鍒版墽琛屼汉淇℃伅锛岀敤鎴稩D锛歿}", assigneeId);
+ continue;
+ }
+
+ // 鍒涘缓閫氱煡浠诲姟锛堝甫闃查噸锛�
+ NotifyTask notifyTask = new NotifyTask();
+ notifyTask.setTaskId(taskId);
+ notifyTask.setTaskCode(taskCode);
+ notifyTask.setNotifyType(NotifyTask.NOTIFY_TYPE_TASK_ASSIGN);
+ notifyTask.setUserId(assigneeId);
+ notifyTask.setUserName(assignee.getNickName());
+ notifyTask.setUserPhone(assignee.getPhonenumber());
+ notifyTask.setTitle("杞繍鍗曚换鍔℃淳鍗曢�氱煡");
+ notifyTask.setContent(notifyContent);
+ notifyTask.setCreateBy( "绯荤粺");
+
+ NotifyTask created = notifyTaskService.createNotifyTask(notifyTask);
+ if (created != null) {
+ createdTasks.add(created);
+ log.info("鍒涘缓閫氱煡浠诲姟鎴愬姛锛宨d={}, userId={}", created.getId(), assigneeId);
+ } else {
+ log.info("閫氱煡浠诲姟宸插瓨鍦紝璺宠繃锛宼askId={}, userId={}", taskId, assigneeId);
+ }
+ }
+
+ // 鍒嗗彂閫氱煡浠诲姟
+ if (!createdTasks.isEmpty()) {
+ int successCount = notifyDispatchService.dispatchNotifies(createdTasks);
+ log.info("閫氱煡鍒嗗彂瀹屾垚锛宼askId={}锛屽垱寤烘暟閲�={}锛屾垚鍔熸暟閲�={}",
+ taskId, createdTasks.size(), successCount);
+ }
+ }
+ /**
* 鏋勫缓閫氱煡鍐呭
*/
private String buildNotifyContent(SysTask task, SysTaskEmergency emergency) {
- StringBuilder content = new StringBuilder("鎮ㄦ湁鏂扮殑杞繍浠诲姟锛岃鍙婃椂澶勭悊锛屼换鍔″崟鍙�:"+task.getTaskCode());
-
+ //娲惧彂鍗曞彿
+ String dispatchCode=emergency.getDispatchCode();
+ String taskCode=task.getTaskCode();
+ String orderCode=dispatchCode;
+ if(dispatchCode==null){
+ orderCode=taskCode;
+ }
+ Date dispatchTime=task.getPlanedStartTime();
+
+ StringBuilder content = new StringBuilder();
+ content.append("鎮ㄦ湁鏂扮殑杞繍浠诲姟锛屼换鍔″崟鍙�:"+orderCode);
// 娣诲姞鍑哄彂鍦颁俊鎭�
String departure = null;
if (emergency != null && StringUtils.isNotEmpty(emergency.getHospitalOutName())) {
@@ -210,7 +259,9 @@
} else if (StringUtils.isNotEmpty(task.getDepartureAddress())) {
departure = task.getDepartureAddress();
}
-
+ DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ content.append("锛屽嚭鍙戞椂闂达細").append(df.format(dispatchTime));
+
// 娣诲姞鐩殑鍦颁俊鎭�
String destination = null;
if (emergency != null && StringUtils.isNotEmpty(emergency.getHospitalInName())) {
--
Gitblit v1.9.1