From a9098372191b3c51995d41ee28404d1b71244d98 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 12 十二月 2023 18:41:04 +0800
Subject: [PATCH] 提交网关心跳和设备状态2
---
src/main/java/com/fzzy/api/service/ApiTriggerService.java | 115 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 78 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/fzzy/api/service/ApiTriggerService.java b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
index 2d02c2c..89ce105 100644
--- a/src/main/java/com/fzzy/api/service/ApiTriggerService.java
+++ b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
@@ -4,17 +4,15 @@
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;
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;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -35,10 +33,10 @@
private String DEFAULT_MAP_KEY = "DEFAULT";
- @Autowired
+ @Resource
private RedisUtil redisUtil;
- @Autowired
+ @Resource
private ApiTriggerRep apiTriggerRep;
@@ -60,6 +58,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 +118,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,22 +139,37 @@
}
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;
}
}
return result;
}
+
+ /**
+ * 鍦ㄧ嚎鎴栬�呬笉鍦ㄧ嚎
+ * <p>
+ * ${dorado.getDataProvider("apiTriggerService#triggerOnline").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<ApiTrigger> triggerOnline() {
+ List<ApiTrigger> list = new ArrayList<>();
+ list.add(new ApiTrigger(Constant.YN_N,"绂荤嚎"));
+ list.add(new ApiTrigger(Constant.YN_Y,"鍦ㄧ嚎"));
+ return list;
+ }
/**
* 椤甸潰涓嬫媺妗嗕娇鐢紝鏍规嵁鐖剁紪鐮佽幏鍙栵紝鐖剁紪鐮佺殑瀹氭敞鎰忓湪 @See Constant
@@ -171,15 +191,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.HB_FZZY_JG_2022.getCode(), PushProtocol.HB_FZZY_JG_2022.getName()));
- return list;
+ return PushProtocol.listTrigger();
}
/**
@@ -190,12 +202,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_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