From 5408346178dd12b7ab78fb51c76f59c300a7e153 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期四, 31 十月 2024 23:37:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/api/service/ApiTriggerService.java | 49 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/fzzy/api/service/ApiTriggerService.java b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
index 3a0a609..6dc7075 100644
--- a/src/main/java/com/fzzy/api/service/ApiTriggerService.java
+++ b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
@@ -10,7 +10,6 @@
import com.fzzy.api.utils.RedisConst;
import com.fzzy.api.utils.RedisUtil;
import com.fzzy.api.view.repository.ApiTriggerRep;
-
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -60,6 +59,13 @@
add2Cache(trigger);
}
+ }
+
+ public ApiTrigger findNameByCode(String code, String parentCode) {
+
+ List<ApiTrigger> listParent = apiTriggerRep.findNameByCode(code, parentCode);
+ if (null == listParent || listParent.isEmpty()) return null;
+ return listParent.get(0);
}
private void add2Cache(ApiTrigger trigger) {
@@ -113,16 +119,16 @@
String result = null;
Map<String, String> parentMap = contextMap.get(parentCode);
if (null == parentMap || parentMap.isEmpty()) {
- if(StringUtils.isEmpty(bizCode)){
+ if (StringUtils.isEmpty(bizCode)) {
return bizCode;
}
- if(Constant.TRIGGER_P_LSPZ.equals(parentCode)){
- result = Integer.valueOf(bizCode)*1000000 + "";
- result = result.substring(0,7);
- }else if(Constant.TRIGGER_P_LSXZ.equals(parentCode)){
- result = Integer.valueOf(bizCode)*100 + "";
- result = result.substring(0,3);
- }else {
+ if (Constant.TRIGGER_P_LSPZ.equals(parentCode)) {
+ result = Integer.valueOf(bizCode) * 1000000 + "";
+ result = result.substring(0, 7);
+ } else if (Constant.TRIGGER_P_LSXZ.equals(parentCode)) {
+ result = Integer.valueOf(bizCode) * 100 + "";
+ result = result.substring(0, 3);
+ } else {
result = bizCode;
}
return result;
@@ -134,16 +140,16 @@
}
if (null == result) {
- if(StringUtils.isEmpty(bizCode)){
+ if (StringUtils.isEmpty(bizCode)) {
return bizCode;
}
- if(Constant.TRIGGER_P_LSPZ.equals(parentCode)){
- result = Integer.valueOf(bizCode)*1000000 + "";
- result = result.substring(0,7);
- }else if(Constant.TRIGGER_P_LSXZ.equals(parentCode)){
- result = Integer.valueOf(bizCode)*100 + "";
- result = result.substring(0,3);
- }else {
+ if (Constant.TRIGGER_P_LSPZ.equals(parentCode)) {
+ result = Integer.valueOf(bizCode) * 1000000 + "";
+ result = result.substring(0, 7);
+ } else if (Constant.TRIGGER_P_LSXZ.equals(parentCode)) {
+ result = Integer.valueOf(bizCode) * 100 + "";
+ result = result.substring(0, 3);
+ } else {
result = bizCode;
}
}
@@ -177,9 +183,16 @@
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()));
list.add(new ApiTrigger(PushProtocol.HB_FZZY_JG_2022.getCode(), PushProtocol.HB_FZZY_JG_2022.getName()));
list.add(new ApiTrigger(PushProtocol.SB_SHJdJW_2023.getCode(), PushProtocol.SB_SHJdJW_2023.getName()));
+ list.add(new ApiTrigger(PushProtocol.SB_SH_2023.getCode(), PushProtocol.SB_SH_2023.getName()));
+ 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()));
return list;
}
@@ -195,6 +208,8 @@
list.add(new ApiTrigger(SyncProtocol.GB_DEFAULT.getCode(), SyncProtocol.GB_DEFAULT.getName()));
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_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