From 40a8157440e3b906da8f52e07d939d78c3f4c313 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 12 四月 2026 16:14:06 +0800
Subject: [PATCH] feat: 任务增加统计、同步增加通知
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/NotifyDispatchServiceImpl.java | 67 +++++++++++++++------------------
1 files changed, 31 insertions(+), 36 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/NotifyDispatchServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/NotifyDispatchServiceImpl.java
index 9b11a0f..7eb559c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/NotifyDispatchServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/NotifyDispatchServiceImpl.java
@@ -86,8 +86,8 @@
return 0;
}
- log.info("寮�濮嬪垎鍙戦�氱煡浠诲姟锛宨d={}, taskId={}, userId={}, notifyType={}",
- notifyTask.getId(), notifyTask.getTaskId(), notifyTask.getUserId(), notifyTask.getNotifyType());
+// log.info("寮�濮嬪垎鍙戦�氱煡浠诲姟锛宨d={}, taskId={}, userId={}, notifyType={}",
+// notifyTask.getId(), notifyTask.getTaskId(), notifyTask.getUserId(), notifyTask.getNotifyType());
// 鏇存柊鐘舵�佷负澶勭悊涓�
notifyTaskService.markProcessing(notifyTask.getId());
@@ -191,6 +191,7 @@
sendLog.setSendTime(DateUtils.getNowDate());
sendLog.setSendContent(notifyTask.getContent());
sendLog.setResponseMsg(errorMsg);
+ sendLog.setSendResult(success ? "鍙戦�佹垚鍔�" : ("鍙戦�佸け璐�: " + (errorMsg != null ? errorMsg : "鏈煡鍘熷洜")));
notifySendLogService.insertNotifySendLog(sendLog);
} catch (Exception e) {
@@ -341,40 +342,34 @@
*/
@Override
public boolean sendQyWechatMessage(NotifyTask notifyTask) {
- try {
- // 妫�鏌ヤ紒涓氬井淇℃湇鍔℃槸鍚﹀惎鐢�
- if (!qyWechatService.isEnabled()) {
- log.info("浼佷笟寰俊鏈嶅姟宸插叧闂紝璺宠繃鍙戦��");
- return false;
- }
- Long taskId= notifyTask.getTaskId();
- SysTaskEmergency emergency = this.sysEmergencyTaskService.selectSysTaskEmergencyByTaskId(taskId);
- if(emergency==null){
- return false;
- }
-// Long dispatchOrderId = emergency.getLegacyDispatchOrdId();
-// String oldsiteUrl= sysConfigService.selectConfigByKey("oldsite.url");
-// if(oldsiteUrl==null){
-// oldsiteUrl="https://sys.966120.com.cn/m_DispatchOrder.gds?DispatchOrdID=";
-// }
- String appId=wechatConfig.getAppId();
- String pathPage="/pagesTask/detail?id="+taskId;
- // 鍙戦�佷紒涓氬井淇℃秷鎭�
- boolean success = qyWechatService.sendNotifyMessage(
- notifyTask.getUserId(),
- notifyTask.getTitle(),
- notifyTask.getContent(),appId,pathPage
- );
-
- if (success) {
- log.info("浼佷笟寰俊娑堟伅鍙戦�佹垚鍔燂紝userId={}", notifyTask.getUserId());
- } else {
- log.warn("浼佷笟寰俊娑堟伅鍙戦�佸け璐ワ紝userId={}", notifyTask.getUserId());
- }
- return success;
- } catch (Exception e) {
- log.error("浼佷笟寰俊娑堟伅鍙戦�佸紓甯革紝taskId={}, userId={}", notifyTask.getTaskId(), notifyTask.getUserId(), e);
- return false;
+ // 妫�鏌ヤ紒涓氬井淇℃湇鍔℃槸鍚﹀惎鐢�
+ if (!qyWechatService.isEnabled()) {
+ throw new RuntimeException("浼佷笟寰俊鏈嶅姟鏈惎鐢�");
}
+ Long taskId = notifyTask.getTaskId();
+ SysTaskEmergency emergency = this.sysEmergencyTaskService.selectSysTaskEmergencyByTaskId(taskId);
+ if (emergency == null) {
+ throw new RuntimeException("鎵句笉鍒板搴旂殑鎬ユ晳浠诲姟淇℃伅锛宼askId=" + taskId);
+ }
+ // 妫�鏌ョ敤鎴锋槸鍚︾粦瀹氫紒涓氬井淇�
+ Long userId = notifyTask.getUserId();
+ String qyUserId = qyWechatService.getQyUserIdByUserId(userId);
+ if (qyUserId == null || qyUserId.isEmpty()) {
+ throw new RuntimeException("鐢ㄦ埛鏈粦瀹氫紒涓氬井淇D锛寀serId=" + userId);
+ }
+ String appId = wechatConfig.getAppId();
+ String pathPage = "/pagesTask/detail?id=" + taskId;
+ // 鍙戦�佷紒涓氬井淇℃秷鎭�
+ boolean success = qyWechatService.sendNotifyMessage(
+ userId,
+ notifyTask.getTitle(),
+ notifyTask.getContent(), appId, pathPage
+ );
+ if (success) {
+ log.info("浼佷笟寰俊娑堟伅鍙戦�佹垚鍔燂紝userId={}", userId);
+ } else {
+ throw new RuntimeException("浼佷笟寰俊API杩斿洖澶辫触锛寀serId=" + userId);
+ }
+ return true;
}
}
--
Gitblit v1.9.1