From 56e254f4c6a3eab1218a4fbea3f60609d209ff95 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 27 六月 2025 14:19:26 +0800
Subject: [PATCH] 鞍信平均值
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsdb.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsdb.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsdb.java
index 6d3b18d..f8fc261 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsdb.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsdb.java
@@ -8,6 +8,7 @@
import com.iailab.module.data.channel.http.service.HttpApiService;
import com.iailab.module.data.common.enums.DataSourceType;
import com.iailab.module.data.common.utils.TagUtils;
+import com.iailab.module.data.point.common.MeasurePointValueType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
@@ -26,7 +27,6 @@
@Slf4j
@Component
public class HttpCollectorForAsdb {
- private static Map<String, HttpApiEntity> apiMap = new HashMap<>();
@Autowired
private HttpApiService httpApiService;
@@ -34,15 +34,13 @@
@Autowired
private RedisTemplate redisTemplate;
+ @Autowired
+ private HttpCollectorForAsag httpCollectorForAsag;
+
public static final long offset = 10;
private HttpApiEntity getHttpApi(String id) {
- if (apiMap.containsKey(id)) {
- return apiMap.get(id);
- }
- HttpApiEntity httpApi = httpApiService.info(id);
- apiMap.put(id, httpApi);
- return httpApi;
+ return httpApiService.getFromCatch(id);
}
public BigDecimal getTagValue(String sourceId, String tagNo) {
@@ -58,9 +56,14 @@
List<HttpAsdbRespDataVO> dataList = JSON.parseArray(responseStr, HttpAsdbRespDataVO.class);
log.info("存入IailabData缓存: " + catchKey);
dataList.forEach(item -> {
- redisTemplate.opsForValue().set(catchKey, item.getValue().toString(), offset, TimeUnit.SECONDS);
+ redisTemplate.opsForValue().set("IailabData:" + httpApi.getCode() + ":" + item.getPoint(), item.getValue().toString(), offset, TimeUnit.SECONDS);
});
- value = Objects.requireNonNull(dataList.stream().filter(data -> tagNo.equals(data.getPoint())).findFirst().orElse(null)).getValue();
+ for (HttpAsdbRespDataVO data : dataList){
+ if (tagNo.equals(data.getPoint())){
+ value = data.getValue();
+ break;
+ }
+ }
return value;
}
@@ -87,8 +90,24 @@
return new HashMap<>();
}
try {
- HttpApiEntity httpApi = this.getHttpApi(params.get(0)[0].toString());
- this.getByHtp(httpApi.getUrl(), httpApi.getCode(), result, params);
+ List<Object[]> paramsSim = new ArrayList<>();
+ List<Object[]> paramsDig = new ArrayList<>();
+ for (Object[] param : params) {
+ if (((String) param[3]).equals(MeasurePointValueType.DIGITAL.getCode()) || (Integer) param[2] == 0) {
+ paramsDig.add(param);
+ } else {
+ paramsSim.add(param);
+ }
+ }
+ if (!CollectionUtils.isEmpty(paramsDig)) {
+ log.info("查询数字量，paramsDig.size(): " + paramsDig.size());
+ HttpApiEntity httpApi = this.getHttpApi(params.get(0)[0].toString());
+ this.getByHtp(httpApi.getUrl(), httpApi.getCode(), result, params);
+ }
+ if (!CollectionUtils.isEmpty(paramsSim)) {
+ log.info("查询模拟量，paramsSim.size(): " + paramsSim.size());
+ httpCollectorForAsag.getTagValues(paramsSim, collectTime, result);
+ }
} catch (Exception ex) {
ex.printStackTrace();
}
--
Gitblit v1.9.3