From 1e2eb11bc373763dae6a1d494bdbddcd72f68697 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 28 三月 2025 13:48:41 +0800
Subject: [PATCH] ASDC
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/HttpCollector.java | 3 ++-
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsde.java | 4 ++++
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsdc.java | 4 ++++
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/MeasureHandle.java | 6 +++---
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/HttpCollector.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/HttpCollector.java
index 6d2a18e..319756c 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/HttpCollector.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/HttpCollector.java
@@ -8,6 +8,7 @@
import com.iailab.framework.common.constant.CommonConstant;
import com.iailab.module.data.channel.http.collector.asdb.HttpCollectorForAsdb;
+import com.iailab.module.data.channel.http.collector.asdb.HttpCollectorForAsdc;
import com.iailab.module.data.channel.http.collector.asdb.HttpCollectorForAsde;
import com.iailab.module.data.channel.http.collector.ihdb.HttpCollectorForIhd;
import com.iailab.module.data.channel.http.entity.HttpApiEntity;
@@ -38,7 +39,7 @@
private HttpCollectorForAsde httpCollectorForAsde;
@Autowired
- private HttpCollectorForAsde httpCollectorForAsdc;
+ private HttpCollectorForAsdc httpCollectorForAsdc;
public Object getTagValue(String apiId, String tag) {
HttpApiEntity httpApi = httpApiService.getFromCatch(apiId);
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsdc.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsdc.java
index 94b1e61..c04fecb 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsdc.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsdc.java
@@ -1,6 +1,7 @@
package com.iailab.module.data.channel.http.collector.asdb;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.iailab.framework.common.constant.CommonConstant;
import com.iailab.framework.common.util.http.HttpUtils;
import com.iailab.module.data.channel.http.collector.asdb.vo.HttpAsdbRespDataVO;
@@ -104,7 +105,10 @@
}
private void getByHtp(String url, String sourceName, Map<String, Object> result, List<Object[]> params) {
+ log.info("HttpCollectorForAsdc.getByHtp:url=" + url);
+ log.info("HttpCollectorForAsdc.getByHtp:params=" + JSONArray.toJSONString(params));
String responseStr = HttpUtils.sendGet(url, null, "");
+ log.info("HttpCollectorForAsdc.getByHtp:responseStr=" + responseStr);
List<HttpAsdbRespDataVO> dataList = JSON.parseArray(responseStr, HttpAsdbRespDataVO.class);
Map<String, HttpAsdbRespDataVO> valueGroup = new HashMap<>();
for (HttpAsdbRespDataVO data : dataList) {
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/HttpCollectorForAsde.java
index 54efb72..13e0015 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/HttpCollectorForAsde.java
@@ -1,6 +1,7 @@
package com.iailab.module.data.channel.http.collector.asdb;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.iailab.framework.common.constant.CommonConstant;
import com.iailab.framework.common.util.http.HttpUtils;
import com.iailab.module.data.channel.http.collector.asdb.vo.HttpAsdbRespDataVO;
@@ -104,7 +105,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));
String responseStr = HttpUtils.sendGet(url, null, "");
+ log.info("HttpCollectorForAsde.getByHtp:responseStr=" + responseStr);
List<HttpAsdbRespDataVO> dataList = JSON.parseArray(responseStr, HttpAsdbRespDataVO.class);
Map<String, HttpAsdbRespDataVO> valueGroup = new HashMap<>();
for (HttpAsdbRespDataVO data : dataList) {
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/MeasureHandle.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/MeasureHandle.java
index 6e06075..68fee73 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/MeasureHandle.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/MeasureHandle.java
@@ -111,11 +111,11 @@
if (item.getTagNo() != null && item.getDimension() != null && item.getValueType() != null) {
httpTagAsde.add(new Object[]{item.getSourceId(), item.getTagNo(), item.getDimension(), item.getValueType()});
}
- } else if (SourceApiEnum.ASDC.getCode().equals(item.getSourceName())) {
+ } /*else if (SourceApiEnum.ASDC.getCode().equals(item.getSourceName())) {
if (item.getTagNo() != null && item.getDimension() != null && item.getValueType() != null) {
httpTagAsdc.add(new Object[]{item.getSourceId(), item.getTagNo(), item.getDimension(), item.getValueType()});
}
- }
+ }*/
}
});
@@ -167,7 +167,7 @@
pojo.setTimestamp(collectTime.toInstant());
result.add(pojo);
listBad.add(dto.getPointNo());
- System.out.println("值异常！TagId=" + tagId);
+ log.info("值异常！TagId=" + tagId);
}
});
}
--
Gitblit v1.9.3