From 233c0e20548cadafb77efdcb3418f38c6658bbad Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 26 十月 2023 14:20:57 +0800
Subject: [PATCH] 四川省网关接口相关7
---
src/main/java/com/fzzy/api/service/ApiTriggerService.java | 60 +++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/fzzy/api/service/ApiTriggerService.java b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
index 5e0b5c3..adc7454 100644
--- a/src/main/java/com/fzzy/api/service/ApiTriggerService.java
+++ b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
@@ -4,8 +4,7 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
-import com.fzzy.api.data.PushProtocol;
-import com.fzzy.api.data.SyncProtocol;
+import com.fzzy.api.data.*;
import com.fzzy.api.entity.ApiTrigger;
import com.fzzy.api.utils.RedisConst;
import com.fzzy.api.utils.RedisUtil;
@@ -178,19 +177,7 @@
*/
@DataProvider
public List<ApiTrigger> triggerPushProtocol() {
- List<ApiTrigger> list = new ArrayList<>();
- list.add(new ApiTrigger(PushProtocol.GB_DEFAULT.getCode(), PushProtocol.GB_DEFAULT.getName()));
- list.add(new ApiTrigger(PushProtocol.GB_2022.getCode(), PushProtocol.GB_2022.getName()));
- 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_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()));
- return list;
+ return PushProtocol.listTrigger();
}
/**
@@ -201,14 +188,41 @@
*/
@DataProvider
public List<ApiTrigger> triggerSyncProtocol() {
- List<ApiTrigger> list = new ArrayList<>();
- 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;
+ return SyncProtocol.listTrigger();
}
+ /**
+ * ${dorado.getDataProvider("apiTriggerService#triggerGatewayProtocol").getResult()}
+ * 绯荤粺涓庣綉鍏崇洿鎺ョ殑閫氳鍗忚
+ *
+ * @return
+ */
+ @DataProvider
+ public List<ApiTrigger> triggerGatewayProtocol() {
+ return GatewayProtocol.listTrigger();
+ }
+
+ /**
+ * ${dorado.getDataProvider("apiTriggerService#triggerGatewayDeviceProtocol").getResult()}
+ * 绯荤粺涓庣綉鍏崇洿鎺ョ殑閫氳鍗忚
+ *
+ * @return
+ */
+ @DataProvider
+ public List<ApiTrigger> triggerGatewayDeviceProtocol() {
+ return GatewayDeviceProtocol.listTrigger();
+ }
+
+ /**
+ * ${dorado.getDataProvider("apiTriggerService#triggerGatewayDeviceType").getResult()}
+ * 绯荤粺涓庣綉鍏崇洿鎺ョ殑閫氳鍗忚
+ *
+ * @return
+ */
+ @DataProvider
+ public List<ApiTrigger> triggerGatewayDeviceType() {
+ return GatewayDeviceType.listTrigger();
+ }
+
+
}
--
Gitblit v1.9.3