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/utils/TaskStatusPushConverter.java | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/utils/TaskStatusPushConverter.java b/ruoyi-system/src/main/java/com/ruoyi/system/utils/TaskStatusPushConverter.java
index b8af81c..8993dc6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/utils/TaskStatusPushConverter.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/utils/TaskStatusPushConverter.java
@@ -13,7 +13,29 @@
public class TaskStatusPushConverter {
private static final Logger log = LoggerFactory.getLogger(TaskStatusPushConverter.class);
-
+ /** 鏈嶅姟鍗曠姸鎬�
+ * 1 鍜ㄨ鍗�
+ * 2 鏈皟搴�
+ * 3 宸茶皟搴�
+ * 4 鍙栨秷鍗�
+ */
+ /**
+ * 1 1 - 瀹屽叏鏈‘璁�
+ * 2 2 - 閮ㄥ垎宸茬‘璁�
+ * 3 鏈嚭杞�
+ * 4 3 - 宸插嚭杞︼紙鍘绘帴鎮ｈ�呴�斾腑锛�
+ * 5 宸插嚭杞︼紙绛夊緟鎮ｈ�咃級
+ * 6 4 - 宸插嚭杞︼紙鏈嶅姟涓級
+ * 7 5 - 宸查�佽揪锛堝洖绋嬩腑锛�
+ * 8 宸茶繑鍥�
+ * 9 璺戠┖鍗曪紝宸茶繑鍥�
+ * 10 鍙栨秷
+ * 0 0 - 鏂拌皟搴﹀崟锛堟湭涓嬪彂锛�
+ * 11 宸叉彁浜わ紝绛夊緟瀹℃牳
+ * 12 瀹℃牳瀹屾垚
+ * 13 瀹℃牳涓嶉�氳繃
+ * 14 宸查┗鐐�
+ */
/**
* 灏嗘柊绯荤粺TaskStatus杞崲涓烘棫绯荤粺鐘舵�佺爜
*
@@ -37,10 +59,11 @@
return 8;
case CANCELLED: // 宸插彇娑�
return 10;
+ case ARRIVED: // 宸插埌杈�
+ return 6;
case PENDING: // 寰呭鐞� - 涓嶅悓姝�
- case ARRIVED: // 宸插埌杈� - 涓嶅悓姝�
default:
- log.debug("鏂扮郴缁熺姸鎬佷笉闇�瑕佸悓姝ュ埌鏃х郴缁�: {}", taskStatus.getInfo());
+// log.debug("鏂扮郴缁熺姸鎬佷笉闇�瑕佸悓姝ュ埌鏃х郴缁�: {}", taskStatus.getInfo());
return null;
}
}
@@ -55,18 +78,18 @@
*/
public static boolean shouldUpdateLegacyStatus(Integer newStatusCode, Integer oldStatusCode) {
if (newStatusCode == null || oldStatusCode == null) {
- log.warn("鐘舵�佺爜涓虹┖锛岃烦杩囨洿鏂帮紝鏂扮姸鎬佺爜: {}, 鏃х姸鎬佺爜: {}", newStatusCode, oldStatusCode);
+// log.warn("鐘舵�佺爜涓虹┖锛岃烦杩囨洿鏂帮紝鏂扮姸鎬佺爜: {}, 鏃х姸鎬佺爜: {}", newStatusCode, oldStatusCode);
return false;
}
// 闃叉鐘舵�佸�掗��锛氭棫绯荤粺鐘舵�� >= 鏂扮郴缁熻鎺ㄩ�佺殑鐘舵�佹椂锛屼笉鏇存柊
// 鍘熷洜锛氬彲鑳芥槸鏃х郴缁熷凡缁忓鐞嗕簡鏇存柊鐨勭姸鎬侊紝鑰屾柊绯荤粺鐢变簬鏃堕棿宸繕娌℃湁鍚屾鍒�
if (oldStatusCode >= newStatusCode) {
- log.info("鏃х郴缁熺姸鎬�({}) >= 鏂扮郴缁熺洰鏍囩姸鎬�({})锛岃烦杩囨帹閫侊紝闃叉鐘舵�佸�掗��锛�" +
- "鏃х郴缁�: {} ({}), 鏂扮郴缁熺洰鏍�: {} ({})",
- oldStatusCode, newStatusCode,
- oldStatusCode, getLegacyStatusDescription(oldStatusCode),
- newStatusCode, getLegacyStatusDescription(newStatusCode));
+// log.info("鏃х郴缁熺姸鎬�({}) >= 鏂扮郴缁熺洰鏍囩姸鎬�({})锛岃烦杩囨帹閫侊紝闃叉鐘舵�佸�掗��锛�" +
+// "鏃х郴缁�: {} ({}), 鏂扮郴缁熺洰鏍�: {} ({})",
+// oldStatusCode, newStatusCode,
+// oldStatusCode, getLegacyStatusDescription(oldStatusCode),
+// newStatusCode, getLegacyStatusDescription(newStatusCode));
return false;
}
@@ -74,17 +97,17 @@
if (oldStatusCode >= 8) {
// 鏃х郴缁熷凡缁忔槸瀹屾垚鎬侊紙8,9,10锛夛紝涓嶅簲璇ヨ浠讳綍涓棿鐘舵�佽鐩�
if (newStatusCode < 8) {
- log.warn("鏃х郴缁熷凡鏄粓鎬�({})(锛歿})锛屾嫆缁濇帹閫佷腑闂寸姸鎬�({})(锛歿})",
- oldStatusCode, getLegacyStatusDescription(oldStatusCode),
- newStatusCode, getLegacyStatusDescription(newStatusCode));
+// log.warn("鏃х郴缁熷凡鏄粓鎬�({})(锛歿})锛屾嫆缁濇帹閫佷腑闂寸姸鎬�({})(锛歿})",
+// oldStatusCode, getLegacyStatusDescription(oldStatusCode),
+// newStatusCode, getLegacyStatusDescription(newStatusCode));
return false;
}
}
- log.debug("鍏佽鎺ㄩ�佺姸鎬侊紝鏃х郴缁�: {} ({}), 鏂扮郴缁熺洰鏍�: {} ({})",
- oldStatusCode, getLegacyStatusDescription(oldStatusCode),
- newStatusCode, getLegacyStatusDescription(newStatusCode));
-
+// log.debug("鍏佽鎺ㄩ�佺姸鎬侊紝鏃х郴缁�: {} ({}), 鏂扮郴缁熺洰鏍�: {} ({})",
+// oldStatusCode, getLegacyStatusDescription(oldStatusCode),
+// newStatusCode, getLegacyStatusDescription(newStatusCode));
+//
return true;
}
--
Gitblit v1.9.1