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/HttpCollectorForAsMediaType.java | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsde.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsMediaType.java
similarity index 73%
rename from iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsde.java
rename to iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsMediaType.java
index 8b7a77f..9e087bc 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsde.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsMediaType.java
@@ -9,6 +9,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;
@@ -16,10 +17,7 @@
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.TimeUnit;
/**
@@ -29,13 +27,16 @@
*/
@Slf4j
@Component
-public class HttpCollectorForAsde {
+public class HttpCollectorForAsMediaType {
@Autowired
private HttpApiService httpApiService;
@Autowired
private RedisTemplate redisTemplate;
+
+ @Autowired
+ private HttpCollectorForAsag httpCollectorForAsag;
public static final long offset = 10;
@@ -90,8 +91,24 @@
return new HashMap<>();
}
try {
- HttpApiEntity httpApi = this.getHttpApi(params.get(0)[0].toString());
- this.getByHtp(httpApi.getUrl(), httpApi.getCode(), result, params);
+ List<Object[]> paramsDig = new ArrayList<>();
+ List<Object[]> paramsSim = 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, paramsDig);
+ }
+ if (!CollectionUtils.isEmpty(paramsSim)) {
+ log.info("查询模拟量，paramsSim.size(): " + paramsSim.size());
+ httpCollectorForAsag.getTagValues(paramsSim, collectTime, result);
+ }
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -99,10 +116,10 @@
}
private void getByHtp(String url, String sourceName, Map<String, Object> result, List<Object[]> params) {
- log.info("HttpCollectorForAsde.getByHtp:url=" + url);
- log.info("HttpCollectorForAsde.getByHtp:params=" + JSONArray.toJSONString(params));
+ log.info("HttpCollectorForAsMediaType.getByHtp:url=" + url);
+ log.info("HttpCollectorForAsMediaType.getByHtp:params=" + JSONArray.toJSONString(params));
String responseStr = HttpUtils.sendGet(url, null, "");
- log.info("HttpCollectorForAsde.getByHtp:responseStr=" + responseStr);
+ log.info("HttpCollectorForAsMediaType.getByHtp:responseStr=" + responseStr);
List<HttpAsdbRespDataVO> dataList = JSON.parseArray(responseStr, HttpAsdbRespDataVO.class);
Map<String, HttpAsdbRespDataVO> valueGroup = new HashMap<>();
for (HttpAsdbRespDataVO data : dataList) {
--
Gitblit v1.9.3