From 60fa13f76afe72a6f48416de2904d58164859382 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 17 一月 2025 13:51:55 +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 | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 a37fe83..ca01dca 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
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import com.iailab.framework.common.constant.CommonConstant;
+import com.iailab.framework.common.util.http.HttpUtils;
import com.iailab.module.data.channel.http.entity.HttpApiEntity;
import com.iailab.module.data.channel.http.service.HttpApiService;
import com.iailab.module.data.common.enums.DataSourceType;
@@ -86,6 +87,11 @@
*/
private static final String T = "t";
+ /**
+ * 数据质量G：good,B:bad
+ */
+ private static final String Q = "q";
+
private HttpApiEntity getHttpApi(String id) {
if (apiMap.containsKey(id)) {
return apiMap.get(id);
@@ -108,7 +114,7 @@
tagSb.append(jsonString);
tagSb.append("]");
String currentDate = DateUtils.format(new Date(), pattern);
- String responseStr = HttpRequest.sendPost(httpApi.getUrl() + "/" + currentDate, tagSb.toString());
+ 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");
@@ -150,7 +156,7 @@
log.info("body=====" + tagSb);
String currentDate = DateUtils.format(new Date(), pattern);
String responseStr = "";
- responseStr = HttpRequest.sendPost(httpApi.getUrl().replace("getPointdatasAvg", "getPointslast") + "/" + currentDate, tagSb);
+ 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");
@@ -266,11 +272,6 @@
StringBuilder tagSb = new StringBuilder();
tagSb.append("[");
for (int i = 0; i < params.size(); i++) {
- if (StringUtils.isBlank(params.get(i)[1].toString()) ||
- StringUtils.isBlank(params.get(i)[2].toString()) ||
- StringUtils.isBlank(params.get(i)[3].toString())) {
- continue;
- }
Map<String, Object> queryParams = new HashMap<>(3);
queryParams.put(N, params.get(i)[1]);
queryParams.put(D, params.get(i)[2]);
@@ -284,7 +285,7 @@
tagSb.append("]");
log.info("body=====" + tagSb);
String currentDate = DateUtils.format(collectTime, pattern);
- String responseStr = HttpRequest.sendPost(url + "/" + currentDate, tagSb.toString());
+ String responseStr = HttpUtils.sendPost(url + "/" + currentDate, tagSb.toString());
JSONObject responseObj = JSON.parseObject(responseStr);
log.info("responseObj=====" + responseObj.toJSONString());
if (STA_TRUE.equals(responseObj.get(IS_SUCCESS).toString())) {
@@ -292,7 +293,9 @@
if (!CollectionUtils.isEmpty(tagValueList)) {
for (int i = 0; i < tagValueList.size(); i++) {
JSONObject item = tagValueList.getJSONObject(i);
- result.put(TagUtils.genTagId(DataSourceType.HTTP.getCode(), sourceName, item.get(N).toString()), item.get(V));
+ if (item.get(Q).toString().equals("G")) {
+ result.put(TagUtils.genTagId(DataSourceType.HTTP.getCode(), sourceName, item.get(N).toString()), item.get(V));
+ }
}
}
}
@@ -316,7 +319,7 @@
tagSb.append("]");
log.info("body=====" + tagSb);
String currentDate = DateUtils.format(collectTime, pattern);
- String responseStr = HttpRequest.sendPost(url + "/" + currentDate, tagSb.toString());
+ String responseStr = HttpUtils.sendPost(url + "/" + currentDate, tagSb.toString());
JSONObject responseObj = JSON.parseObject(responseStr);
log.info("responseObj=====" + responseObj.toJSONString());
if (STA_TRUE.equals(responseObj.get(IS_SUCCESS).toString())) {
--
Gitblit v1.9.3