From 0cf0ceb7efe3edaba0cbb3f90f028db0de108abf Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 29 十月 2025 17:19:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/api/service/ApiTriggerService.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/fzzy/api/service/ApiTriggerService.java b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
index 1ac7857..1847981 100644
--- a/src/main/java/com/fzzy/api/service/ApiTriggerService.java
+++ b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
@@ -123,10 +123,10 @@
return bizCode;
}
if (Constant.TRIGGER_P_LSPZ.equals(parentCode)) {
- result = Integer.valueOf(bizCode) * 1000000 + "";
+ result = bizCode + "000000";
result = result.substring(0, 7);
} else if (Constant.TRIGGER_P_LSXZ.equals(parentCode)) {
- result = Integer.valueOf(bizCode) * 100 + "";
+ result = bizCode + "00";
result = result.substring(0, 3);
} else {
result = bizCode;
@@ -136,6 +136,11 @@
result = parentMap.get(bizCode);
if (null == result) {
+ if (Constant.TRIGGER_P_LSPZ.equals(parentCode)) {
+ result = parentMap.get(bizCode.substring(0, 3));
+ }
+ }
+ if (null == result) {
result = parentMap.get(DEFAULT_MAP_KEY);
}
@@ -144,10 +149,10 @@
return bizCode;
}
if (Constant.TRIGGER_P_LSPZ.equals(parentCode)) {
- result = Integer.valueOf(bizCode) * 1000000 + "";
+ result = bizCode + "000000";
result = result.substring(0, 7);
} else if (Constant.TRIGGER_P_LSXZ.equals(parentCode)) {
- result = Integer.valueOf(bizCode) * 100 + "";
+ result = bizCode + "00";
result = result.substring(0, 3);
} else {
result = bizCode;
@@ -183,6 +188,7 @@
list.add(new ApiTrigger(PushProtocol.SB_SH_2021.getCode(), PushProtocol.SB_SH_2021.getName()));
list.add(new ApiTrigger(PushProtocol.SB_SC_2021.getCode(), PushProtocol.SB_SC_2021.getName()));
list.add(new ApiTrigger(PushProtocol.SB_GD_2022.getCode(), PushProtocol.SB_GD_2022.getName()));
+ list.add(new ApiTrigger(PushProtocol.SB_GD_2023.getCode(), PushProtocol.SB_GD_2023.getName()));
list.add(new ApiTrigger(PushProtocol.SB_GD_2020.getCode(), PushProtocol.SB_GD_2020.getName()));
list.add(new ApiTrigger(PushProtocol.SB_HN_2022.getCode(), PushProtocol.SB_HN_2022.getName()));
list.add(new ApiTrigger(PushProtocol.SB_WHJL_2023.getCode(), PushProtocol.SB_WHJL_2023.getName()));
@@ -192,6 +198,7 @@
list.add(new ApiTrigger(PushProtocol.SB_NX_2023.getCode(), PushProtocol.SB_NX_2023.getName()));
list.add(new ApiTrigger(PushProtocol.SB_NX_2024.getCode(), PushProtocol.SB_NX_2024.getName()));
list.add(new ApiTrigger(PushProtocol.SB_SX_2023.getCode(), PushProtocol.SB_SX_2023.getName()));
+ list.add(new ApiTrigger(PushProtocol.SB_SX_2024.getCode(), PushProtocol.SB_SX_2024.getName()));
return list;
}
@@ -208,6 +215,7 @@
list.add(new ApiTrigger(SyncProtocol.FZZY_V30_GB.getCode(), SyncProtocol.FZZY_V30_GB.getName()));
list.add(new ApiTrigger(SyncProtocol.FZZY_V35_GB.getCode(), SyncProtocol.FZZY_V35_GB.getName()));
list.add(new ApiTrigger(SyncProtocol.FZZY_V40_GB.getCode(), SyncProtocol.FZZY_V40_GB.getName()));
+ list.add(new ApiTrigger(SyncProtocol.FZZY_V61_GB.getCode(), SyncProtocol.FZZY_V61_GB.getName()));
list.add(new ApiTrigger(SyncProtocol.FZZY_V40_WHJL.getCode(), SyncProtocol.FZZY_V40_WHJL.getName()));
list.add(new ApiTrigger(SyncProtocol.FZZY_V35_SHYZ.getCode(), SyncProtocol.FZZY_V35_SHYZ.getName()));
return list;
--
Gitblit v1.9.3