From f01dc4edbe2c8689483787ea8e8d5ee2c54195df Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 25 十月 2023 20:31:34 +0800
Subject: [PATCH] 四川省网关接口相关6
---
src/main/java/com/fzzy/api/service/ApiTriggerService.java | 85 ++++++++++++++++++++++++++++++++++--------
1 files changed, 69 insertions(+), 16 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..819b278 100644
--- a/src/main/java/com/fzzy/api/service/ApiTriggerService.java
+++ b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
@@ -4,6 +4,8 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
+import com.fzzy.api.data.GatewayDeviceProtocol;
+import com.fzzy.api.data.GatewayProtocol;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.entity.ApiTrigger;
@@ -62,6 +64,13 @@
}
+ 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) {
String key = RedisConst.buildKey(RedisConst.KYE_LIST_TRIGGER, trigger.getCode());
@@ -113,16 +122,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 +143,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;
}
}
@@ -178,8 +187,13 @@
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_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.GATEWAY_SC_2023.getCode(), PushProtocol.GATEWAY_SC_2023.getName()));
return list;
}
@@ -195,8 +209,47 @@
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;
}
+ /**
+ * ${dorado.getDataProvider("apiTriggerService#triggerGatewayProtocol").getResult()}
+ * 绯荤粺涓庣綉鍏崇洿鎺ョ殑閫氳鍗忚
+ *
+ * @return
+ */
+ @DataProvider
+ public List<ApiTrigger> triggerGatewayProtocol() {
+ List<ApiTrigger> list = new ArrayList<>();
+ list.add(new ApiTrigger(GatewayProtocol.GATE_HTTP.getCode(), GatewayProtocol.GATE_HTTP.getName()));
+ list.add(new ApiTrigger(GatewayProtocol.GATE_MQTT.getCode(), GatewayProtocol.GATE_MQTT.getName()));
+ list.add(new ApiTrigger(GatewayProtocol.GATE_WEBSOCKET.getCode(), GatewayProtocol.GATE_WEBSOCKET.getName()));
+ list.add(new ApiTrigger(GatewayProtocol.GATE_TEST.getName(), GatewayProtocol.GATE_TEST.getName()));
+ return list;
+ }
+
+ /**
+ * ${dorado.getDataProvider("apiTriggerService#triggerGatewayDeviceProtocol").getResult()}
+ * 绯荤粺涓庣綉鍏崇洿鎺ョ殑閫氳鍗忚
+ *
+ * @return
+ */
+ @DataProvider
+ public List<ApiTrigger> triggerGatewayDeviceProtocol() {
+ List<ApiTrigger> list = new ArrayList<>();
+ list.add(new ApiTrigger(GatewayDeviceProtocol.GRAIN_FZZY_ZH_2023.getCode(), GatewayDeviceProtocol.GRAIN_FZZY_ZH_2023.getName()));
+
+ list.add(new ApiTrigger(GatewayDeviceProtocol.DEVICE_WEIGHT_HTTP.getCode(), GatewayDeviceProtocol.DEVICE_WEIGHT_HTTP.getName()));
+ list.add(new ApiTrigger(GatewayDeviceProtocol.DEVICE_IDCARD_HTTP.getCode(), GatewayDeviceProtocol.DEVICE_IDCARD_HTTP.getName()));
+ list.add(new ApiTrigger(GatewayDeviceProtocol.DEVICE_LED_HTTP.getCode(), GatewayDeviceProtocol.DEVICE_LED_HTTP.getName()));
+ list.add(new ApiTrigger(GatewayDeviceProtocol.DEVICE_LPR_HTTP.getCode(), GatewayDeviceProtocol.DEVICE_LPR_HTTP.getName()));
+ list.add(new ApiTrigger(GatewayDeviceProtocol.DEVICE_TEST.getCode(), GatewayDeviceProtocol.DEVICE_TEST.getName()));
+
+ return list;
+ }
+
+
}
--
Gitblit v1.9.3