From e23efd75ca74df6b35a0c03b8e8fc0712c9d4544 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期五, 01 五月 2026 15:30:54 +0800
Subject: [PATCH] 多加入参数和修改规则
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CloudWmsNotifySchedule.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CloudWmsNotifySchedule.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CloudWmsNotifySchedule.java
index 6f175d2..58ed501 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CloudWmsNotifySchedule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CloudWmsNotifySchedule.java
@@ -62,11 +62,11 @@
log.debug("浜戜粨涓婃姤璋冨害锛氭湰杞緟鍙戦�� 0 鏉�");
return;
}
- log.info("浜戜粨涓婃姤璋冨害锛氭湰杞緟鍙戦�� {} 鏉�", pending.size());
- log.info("浜戜粨涓婃姤璋冨害锛氬紑濮嬫淳鍙�");
+ log.debug("浜戜粨涓婃姤璋冨害锛氭湰杞緟鍙戦�� {} 鏉�", pending.size());
+ log.debug("浜戜粨涓婃姤璋冨害锛氬紑濮嬫淳鍙�");
dispatchPending(pending);
- log.info("浜戜粨涓婃姤璋冨害锛氭淳鍙戝畬鎴�");
- log.info("浜戜粨涓婃姤璋冨害锛氭湰杞皟搴︾粨鏉燂紝鑰楁椂 {} ms", System.currentTimeMillis() - t0);
+ log.debug("浜戜粨涓婃姤璋冨害锛氭淳鍙戝畬鎴�");
+ log.debug("浜戜粨涓婃姤璋冨害锛氭湰杞皟搴︾粨鏉燂紝鑰楁椂 {} ms", System.currentTimeMillis() - t0);
} catch (Exception e) {
log.error("浜戜粨涓婃姤璋冨害寮傚父锛屽凡鑰楁椂 {} ms", System.currentTimeMillis() - t0, e);
}
@@ -80,17 +80,17 @@
/** 鍚屽崟澶氭潯鍚堝苟涓婃姤 */
private void dispatchPending(List<CloudWmsNotifyLog> pending) {
int rowsReported = 0;
- log.info("浜戜粨涓婃姤娲惧彂锛氬紑濮嬶紝寰呭姙 {} 鏉�", pending.size());
+ log.debug("浜戜粨涓婃姤娲惧彂锛氬紑濮嬶紝寰呭姙 {} 鏉�", pending.size());
long tCfg = System.currentTimeMillis();
- log.info("浜戜粨涓婃姤娲惧彂锛氳鍙栦笂鎶ョ被鍨嬮厤缃�");
+ log.debug("浜戜粨涓婃姤娲惧彂锛氳鍙栦笂鎶ョ被鍨嬮厤缃�");
String rtInOut = cloudWmsNotifyLogService.getReportTypeInOutResult();
- log.info("浜戜粨涓婃姤娲惧彂锛氫笂鎶ョ被鍨�={}锛岃閰嶇疆鑰楁椂 {} ms", rtInOut, System.currentTimeMillis() - tCfg);
+ log.debug("浜戜粨涓婃姤娲惧彂锛氫笂鎶ョ被鍨�={}锛岃閰嶇疆鑰楁椂 {} ms", rtInOut, System.currentTimeMillis() - tCfg);
LinkedHashMap<String, List<CloudWmsNotifyLog>> inOutGroups = new LinkedHashMap<>();
int n = pending.size();
for (int i = 0; i < n; i++) {
CloudWmsNotifyLog row = pending.get(i);
if (i == 0 || i == n - 1 || (i + 1) % 5 == 0) {
- log.info("浜戜粨涓婃姤娲惧彂锛氬垎缁勮繘搴� {}/{}锛宨d={}", i + 1, n, row.getId());
+ log.debug("浜戜粨涓婃姤娲惧彂锛氬垎缁勮繘搴� {}/{}锛宨d={}", i + 1, n, row.getId());
}
if (!rtInOut.equals(row.getReportType())) {
continue;
@@ -101,7 +101,7 @@
}
inOutGroups.computeIfAbsent(key, k -> new ArrayList<>()).add(row);
}
- log.info("浜戜粨涓婃姤娲惧彂锛氬叆鍑哄簱鍙垎缁勯敭 {} 涓�", inOutGroups.size());
+ log.debug("浜戜粨涓婃姤娲惧彂锛氬叆鍑哄簱鍙垎缁勯敭 {} 涓�", inOutGroups.size());
Set<Long> done = new HashSet<>();
for (CloudWmsNotifyLog row : pending) {
Long rid = row.getId();
@@ -112,7 +112,7 @@
if (isSendingBusy(row)) {
continue;
}
- log.info("浜戜粨涓婃姤娲惧彂锛氬叾瀹冪被鍨嬪崟鏉� id={}", rid);
+ log.debug("浜戜粨涓婃姤娲惧彂锛氬叾瀹冪被鍨嬪崟鏉� id={}", rid);
if (safeProcessOne(row)) {
rowsReported++;
if (rid != null) {
@@ -126,7 +126,7 @@
if (isSendingBusy(row)) {
continue;
}
- log.info("浜戜粨涓婃姤娲惧彂锛氭棤鍚堝苟閿崟鏉� id={}", rid);
+ log.debug("浜戜粨涓婃姤娲惧彂锛氭棤鍚堝苟閿崟鏉� id={}", rid);
if (safeProcessOne(row)) {
rowsReported++;
if (rid != null) {
@@ -152,12 +152,12 @@
continue;
}
if (work.size() >= 2) {
- log.info("浜戜粨涓婃姤娲惧彂锛氬悓鍗曞悎骞� {} 鏉�", work.size());
+ log.debug("浜戜粨涓婃姤娲惧彂锛氬悓鍗曞悎骞� {} 鏉�", work.size());
Set<Long> handled = safeProcessMergedInOutGroup(work);
done.addAll(handled);
rowsReported += handled.size();
} else {
- log.info("浜戜粨涓婃姤娲惧彂锛氬叆鍑哄簱鍗曟潯 id={}", work.get(0).getId());
+ log.debug("浜戜粨涓婃姤娲惧彂锛氬叆鍑哄簱鍗曟潯 id={}", work.get(0).getId());
if (safeProcessOne(work.get(0))) {
rowsReported++;
if (work.get(0).getId() != null) {
@@ -166,11 +166,11 @@
}
}
}
- log.info("浜戜粨涓婃姤娲惧彂锛氶亶鍘嗙粨鏉�");
+ log.debug("浜戜粨涓婃姤娲惧彂锛氶亶鍘嗙粨鏉�");
if (rowsReported == 0) {
- log.warn("浜戜粨涓婃姤娲惧彂锛氬緟鍔� {} 鏉★紝瀹為檯澶勭悊 0 鏉�", pending.size());
+ log.debug("浜戜粨涓婃姤娲惧彂锛氬緟鍔� {} 鏉★紝瀹為檯澶勭悊 0 鏉�", pending.size());
} else {
- log.info("浜戜粨涓婃姤娲惧彂锛氬緟鍔� {} 鏉★紝瀹為檯澶勭悊 {} 鏉�", pending.size(), rowsReported);
+ log.debug("浜戜粨涓婃姤娲惧彂锛氬緟鍔� {} 鏉★紝瀹為檯澶勭悊 {} 鏉�", pending.size(), rowsReported);
}
}
@@ -178,25 +178,25 @@
Set<Long> handled = new HashSet<>();
List<Long> claimedIds = new ArrayList<>();
List<CloudWmsNotifyLog> claimedRows = new ArrayList<>();
- log.info("浜戜粨涓婃姤娲惧彂锛氬悎骞剁粍鎶㈠崰锛岃鏁� {}", group.size());
+ log.debug("浜戜粨涓婃姤娲惧彂锛氬悎骞剁粍鎶㈠崰锛岃鏁� {}", group.size());
try {
for (CloudWmsNotifyLog row : group) {
Long id = row.getId();
log.debug("浜戜粨涓婃姤娲惧彂锛氬悎骞舵姠鍗犲皾璇� id={}", id);
if (!cloudWmsNotifyLogService.tryClaimSending(id)) {
- log.warn("浜戜粨涓婃姤娲惧彂锛氬悎骞舵姠鍗犳湭鎶㈠埌 id={}锛岃烦杩囨湰琛岀户缁叾瀹冭", id);
+ log.debug("浜戜粨涓婃姤娲惧彂锛氬悎骞舵姠鍗犳湭鎶㈠埌 id={}锛岃烦杩囨湰琛岀户缁叾瀹冭", id);
continue;
}
claimedIds.add(id);
claimedRows.add(row);
}
if (claimedRows.isEmpty()) {
- log.warn("浜戜粨涓婃姤娲惧彂锛氬悎骞剁粍鎶㈠崰 0 琛�");
+ log.debug("浜戜粨涓婃姤娲惧彂锛氬悎骞剁粍鎶㈠崰 0 琛�");
return handled;
}
- log.info("浜戜粨涓婃姤娲惧彂锛氬悎骞剁粍宸叉姠鍗� {} 琛岋紝璇锋眰浜戜粨", claimedRows.size());
+ log.debug("浜戜粨涓婃姤娲惧彂锛氬悎骞剁粍宸叉姠鍗� {} 琛岋紝璇锋眰浜戜粨", claimedRows.size());
processMergedInOut(claimedRows);
- log.info("浜戜粨涓婃姤娲惧彂锛氬悎骞剁粍浜戜粨璋冪敤宸茶繑鍥�");
+ log.debug("浜戜粨涓婃姤娲惧彂锛氬悎骞剁粍浜戜粨璋冪敤宸茶繑鍥�");
handled.addAll(claimedIds);
} catch (Exception e) {
log.warn("浜戜粨涓婃姤鍚屾壒鍚堝苟寮傚父锛歿}", e.getMessage());
@@ -271,9 +271,9 @@
private boolean safeProcessOne(CloudWmsNotifyLog logRecord) {
Long id = logRecord.getId();
- log.info("浜戜粨涓婃姤娲惧彂锛氬崟鏉℃姠鍗� id={}", id);
+ log.debug("浜戜粨涓婃姤娲惧彂锛氬崟鏉℃姠鍗� id={}", id);
if (!cloudWmsNotifyLogService.tryClaimSending(id)) {
- log.warn("浜戜粨涓婃姤娲惧彂锛氬崟鏉℃湭鎶㈠埌 id={}", id);
+ log.debug("浜戜粨涓婃姤娲惧彂锛氬崟鏉℃湭鎶㈠埌 id={}", id);
return false;
}
try {
--
Gitblit v1.9.1