From 0dfdafe759f50060c39581e68b08333c4512edf7 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期五, 28 三月 2025 13:31:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/ihdb/HttpCollectorForIhd.java | 65 +++++++++++++++-----------------
1 files changed, 30 insertions(+), 35 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/ihdb/HttpCollectorForIhd.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/ihdb/HttpCollectorForIhd.java
index da14d16..f4f9d03 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/ihdb/HttpCollectorForIhd.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/ihdb/HttpCollectorForIhd.java
@@ -10,10 +10,8 @@
import com.iailab.module.data.channel.http.service.HttpApiService;
import com.iailab.module.data.common.enums.DataSourceType;
import com.iailab.module.data.common.utils.DateUtils;
-import com.iailab.module.data.common.utils.HttpRequest;
import com.iailab.module.data.common.utils.TagUtils;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.BoundHashOperations;
import org.springframework.data.redis.core.RedisTemplate;
@@ -22,14 +20,8 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.sql.Timestamp;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
/**
* iHyperDB采集
@@ -61,6 +53,8 @@
private static final String pattern = "yyyyMMddHHmm00";
private static final String IS_SUCCESS = "isSuccess";
+
+ private static final String RESP_DATA = "data";
public static final String TIV = "TagIdValue:";
@@ -121,7 +115,7 @@
String responseStr = HttpUtils.sendPost(httpApi.getUrl() + "/" + currentDate, tagSb.toString());
JSONObject responseObj = JSON.parseObject(responseStr);
if (STA_TRUE.equals(responseObj.get(IS_SUCCESS).toString())) {
- JSONArray tagValueList = responseObj.getJSONArray("data");
+ JSONArray tagValueList = responseObj.getJSONArray(RESP_DATA);
if (!CollectionUtils.isEmpty(tagValueList)) {
for (int i = 0; i < tagValueList.size(); i++) {
JSONObject item = tagValueList.getJSONObject(i);
@@ -140,14 +134,14 @@
return result;
}
List<String> noCacheTagNames = new ArrayList<>();//未缓存的tag
- for (int i = 0; i < tagNames.size(); i++) {
+ for (String tagName : tagNames) {
//先查缓存
- BoundHashOperations<String, String, Object> ops = redisTemplate.boundHashOps("IhdTag:" + tagNames.get(i));
+ BoundHashOperations<String, String, Object> ops = redisTemplate.boundHashOps("IhdTag:" + tagName);
if (ops.get(V) != null) {
BigDecimal value = new BigDecimal(ops.get(V).toString());
- result.put(tagNames.get(i), value.setScale(3, RoundingMode.HALF_UP));
+ result.put(tagName, value.setScale(3, RoundingMode.HALF_UP));
} else {
- noCacheTagNames.add(tagNames.get(i));
+ noCacheTagNames.add(tagName);
}
}
if (CollectionUtils.isEmpty(noCacheTagNames)) {
@@ -161,25 +155,26 @@
String responseStr = "";
responseStr = HttpUtils.sendPost(httpApi.getUrl().replace("getPointdatasAvg", "getPointslast") + "/" + currentDate, tagSb);
JSONObject responseObj = JSON.parseObject(responseStr);
- if (STA_TRUE.equals(responseObj.get(IS_SUCCESS).toString())) {
- JSONArray tagValueList = responseObj.getJSONArray("data");
- if (!CollectionUtils.isEmpty(tagValueList)) {
- return result;
+ if (!STA_TRUE.equals(responseObj.get(IS_SUCCESS).toString())) {
+ return result;
+ }
+ JSONArray tagValueList = responseObj.getJSONArray(RESP_DATA);
+ if (CollectionUtils.isEmpty(tagValueList)) {
+ return result;
+ }
+ for (int i = 0; i < tagValueList.size(); i++) {
+ JSONObject item = tagValueList.getJSONObject(i);
+ if (item.get(V) == null) {
+ continue;
}
- for (int i = 0; i < tagValueList.size(); i++) {
- JSONObject item = tagValueList.getJSONObject(i);
- if (item.get(V) == null) {
- continue;
- }
- //存缓存
- BoundHashOperations<String, String, Object> ops = redisTemplate.boundHashOps("IhdTag:" + item.get(N).toString());
- ops.put(V, item.get(V).toString());
- //设置过期时间
- redisTemplate.expire(item.get(N).toString(), 10, TimeUnit.SECONDS);
- //把查询到的数据插入结果集
- BigDecimal value = new BigDecimal(item.get(V).toString());
- result.put(item.get(N).toString(), value.setScale(3, RoundingMode.HALF_UP));
- }
+ //存缓存
+ BoundHashOperations<String, String, Object> ops = redisTemplate.boundHashOps("IhdTag:" + item.get(N).toString());
+ ops.put(V, item.get(V).toString());
+ //设置过期时间
+ redisTemplate.expire(item.get(N).toString(), 10, TimeUnit.SECONDS);
+ //把查询到的数据插入结果集
+ BigDecimal value = new BigDecimal(item.get(V).toString());
+ result.put(item.get(N).toString(), value.setScale(3, RoundingMode.HALF_UP));
}
} catch (Exception ex) {
log.info("getCurrentValue异常");
@@ -312,7 +307,7 @@
JSONObject responseObj = JSON.parseObject(responseStr);
log.info("responseObj=====" + responseObj.toJSONString());
if (STA_TRUE.equals(responseObj.get(IS_SUCCESS).toString())) {
- JSONArray tagValueList = responseObj.getJSONArray("data");
+ JSONArray tagValueList = responseObj.getJSONArray(RESP_DATA);
if (!CollectionUtils.isEmpty(tagValueList)) {
for (int i = 0; i < tagValueList.size(); i++) {
JSONObject item = tagValueList.getJSONObject(i);
@@ -346,7 +341,7 @@
JSONObject responseObj = JSON.parseObject(responseStr);
log.info("responseObj=====" + responseObj.toJSONString());
if (STA_TRUE.equals(responseObj.get(IS_SUCCESS).toString())) {
- JSONArray tagValueList = responseObj.getJSONArray("data");
+ JSONArray tagValueList = responseObj.getJSONArray(RESP_DATA);
if (!CollectionUtils.isEmpty(tagValueList)) {
for (int i = 0; i < tagValueList.size(); i++) {
JSONObject item = tagValueList.getJSONObject(i);
@@ -358,8 +353,8 @@
private void setOut(String url, String sourceName, Map<String, Object> result, List<Object[]> params, Date collectTime) {
for (int i = 0; i < params.size(); i++) {
- String tagId = TIV + TagUtils.genTagId(DataSourceType.HTTP.getCode(), sourceName, params.get(i)[1].toString());
- if(redisTemplate.hasKey(tagId)) {
+ String tagId = TIV + TagUtils.genTagId(DataSourceType.HTTP.getCode(), sourceName, params.get(i)[1].toString());
+ if (redisTemplate.hasKey(tagId)) {
result.put(TagUtils.genTagId(DataSourceType.HTTP.getCode(), sourceName, params.get(i)[1].toString()), redisTemplate.opsForValue().get(tagId));
}
}
--
Gitblit v1.9.3