From 355dda1f90c70ab04c4517688da37d1a4236f112 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期二, 23 十二月 2025 21:43:30 +0800
Subject: [PATCH] fix:优化保存
---
ruoyi-system/src/main/java/com/ruoyi/system/listener/TaskMessageListener.java | 81 +++++++++++++++++++++++++++++++---------
1 files changed, 63 insertions(+), 18 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 8cc98ed..d280de3 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
@@ -2,10 +2,10 @@
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.utils.DeptUtil;
+import com.ruoyi.common.utils.LongUtil;
import com.ruoyi.system.domain.*;
-import com.ruoyi.system.event.TaskDispatchSyncEvent;
-import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ISysTaskAssigneeService;
+import com.ruoyi.system.event.*;
+import com.ruoyi.system.service.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,16 +14,11 @@
import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.event.TaskCreatedEvent;
-import com.ruoyi.system.event.TaskAssignedEvent;
-import com.ruoyi.system.event.TaskStatusChangedEvent;
import com.ruoyi.system.mapper.SysMessageMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.mapper.SysTaskMapper;
import com.ruoyi.system.mapper.SysTaskEmergencyMapper;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.system.service.INotifyTaskService;
-import com.ruoyi.system.service.INotifyDispatchService;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -85,6 +80,12 @@
sendDispatchNotify(assigneeIds, task.getCreatorId(), event.getTaskId(),task.getShowTaskCode(), buildNotifyContent(task, emergency));
}
}
+
+ Long taskId= event.getTaskId();
+ Long dispatchOrdId= event.getDispatchOrderId();
+ Long serviceOrdId= event.getServiceOrderId();
+ Integer oaUserID= event.getOaUserId();
+ legacySystemSyncService.syncTaskAttachment(taskId, dispatchOrdId, serviceOrdId, oaUserID);
}catch (Exception ex){
log.error("澶勭悊浠诲姟娲惧彂鍚屾浜嬩欢澶辫触", ex);
@@ -218,6 +219,31 @@
}
return content.toString();
+ }
+
+
+
+
+ @Autowired
+ private ILegacySystemSyncService legacySystemSyncService;
+
+ @Async
+ @EventListener
+ public void handleTaskUpdateEvent(TaskUpdateEvent event){
+ log.info("鏀跺埌浠诲姟鏇存柊浜嬩欢锛屼换鍔D锛歿}锛屼换鍔＄紪鍙凤細{}", event.getTaskId(), event.getTaskCode());
+ legacySystemSyncService.resyncDispatchOrderToLegacy(event.getTaskId());
+
+ }
+ //鍦ㄨ繖閲岀洃鍚淳鍙戠殑浜嬩欢
+ @Async
+ @EventListener
+ public void handleTaskServiceOrderSyncEvent(TaskServiceOrderSyncEvent event) {
+// log.info("鏀跺埌浠诲姟鏈嶅姟鍗曞悓姝ヤ簨浠讹紝浠诲姟ID锛歿}锛屼换鍔＄紪鍙凤細{}锛屾湇鍔″崟ID锛歿}", event.getTaskId(), event.getTaskCode(), event.getServiceOrderId());
+ Long dispatchOrderId= legacySystemSyncService.syncDispatchOrderToLegacy(event.getTaskId());
+// if(LongUtil.isNotEmpty(dispatchOrderId)){
+// //鏇存柊needsync涓�0
+//
+// }
}
@@ -392,6 +418,8 @@
return content.toString();
}
+ @Autowired
+ private ITaskStatusSyncService taskStatusSyncService;
/**
* 鐩戝惉浠诲姟鐘舵�佸彉鏇翠簨浠�
*
@@ -400,26 +428,43 @@
@Async
@EventListener
public void handleTaskStatusChangedEvent(TaskStatusChangedEvent event) {
+
+ sendTaskStatusToLocal(event);
+ sendTaskStatusToLegacy(event.getTaskId());
+
+ }
+
+ private void sendTaskStatusToLegacy(Long taskId) {
+ try{
+ taskStatusSyncService.syncTaskStatusFromLegacy(taskId);
+ }catch (Exception e){
+ log.error("浠诲姟鐘舵�佸悓姝ュ埌鏃х郴缁熷紓甯� taskId:{}",taskId, e);
+ }
+ }
+
+
+
+ private void sendTaskStatusToLocal(TaskStatusChangedEvent event) {
try {
- log.info("鏀跺埌浠诲姟鐘舵�佸彉鏇翠簨浠讹紝浠诲姟ID锛歿}锛屾棫鐘舵�侊細{}锛屾柊鐘舵�侊細{}",
+ log.info("鏀跺埌浠诲姟鐘舵�佸彉鏇翠簨浠讹紝浠诲姟ID锛歿}锛屾棫鐘舵�侊細{}锛屾柊鐘舵�侊細{}",
event.getTaskId(), event.getOldStatus(), event.getNewStatus());
-
+ //鍙戣捣鐘舵�佸悓姝�
// 鏋勫缓鐘舵�佸彉鏇村唴瀹�
String statusContent = getStatusChangeContent(event.getNewStatus(), event.getNewStatusDesc());
-
+
// 鏀堕泦鎵�鏈夐渶瑕侀�氱煡鐨勭敤鎴稩D锛堟墽琛屼汉+鍒涘缓浜猴紝鍘婚噸锛�
java.util.Set<Long> receiverIds = new java.util.HashSet<>();
-
+
// 娣诲姞鎵ц浜�
if (event.getAssigneeIds() != null) {
receiverIds.addAll(event.getAssigneeIds());
}
-
+
// 娣诲姞鍒涘缓浜猴紙濡傛灉涓嶆槸鎵ц浜猴級
if (event.getCreatorId() != null) {
receiverIds.add(event.getCreatorId());
}
-
+
// 缁欐瘡涓敤鎴峰彂閫佹秷鎭�
for (Long receiverId : receiverIds) {
SysUser user = sysUserMapper.selectUserById(receiverId);
@@ -427,7 +472,7 @@
log.warn("鎵句笉鍒扮敤鎴蜂俊鎭紝鐢ㄦ埛ID锛歿}", receiverId);
continue;
}
-
+
// 鍒涘缓娑堟伅
SysMessage message = new SysMessage();
message.setMessageType("STATUS");
@@ -442,13 +487,13 @@
message.setIsRead("0");
message.setCreateTime(DateUtils.getNowDate());
message.setDelFlag("0");
-
+
// 淇濆瓨娑堟伅
sysMessageMapper.insertSysMessage(message);
- log.info("浠诲姟鐘舵�佸彉鏇存秷鎭凡淇濆瓨锛屾秷鎭疘D锛歿}锛屾柊鐘舵�侊細{}锛屾帴鏀朵汉锛歿}",
+ log.info("浠诲姟鐘舵�佸彉鏇存秷鎭凡淇濆瓨锛屾秷鎭疘D锛歿}锛屾柊鐘舵�侊細{}锛屾帴鏀朵汉锛歿}",
message.getMessageId(), event.getNewStatus(), user.getNickName());
}
-
+
} catch (Exception e) {
log.error("澶勭悊浠诲姟鐘舵�佸彉鏇翠簨浠跺け璐�", e);
}
--
Gitblit v1.9.1