From bfcca60e2dbf84bce27def31f92e1c99f94a1d6e Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 19 九月 2024 18:38:51 +0800
Subject: [PATCH] http tag
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/MeasureHandle.java | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
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 a5d084e..455b836 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
@@ -12,7 +12,6 @@
import com.iailab.module.data.point.common.PointDataTypeEnum;
import com.iailab.module.data.point.dto.DaPointDTO;
import com.iailab.module.data.point.service.DaPointService;
-import com.iailab.module.data.channel.http.collector.HttpCollectorForZxzk;
import com.iailab.module.data.influxdb.pojo.InfluxPointValuePOJO;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
@@ -50,9 +49,6 @@
@Autowired
private OpcDACollector opcDACollector;
-
- @Resource
- private HttpCollectorForZxzk httpCollectorForZxzk;
@Resource
private DaPointService daPointService;
@@ -95,10 +91,6 @@
}
if (!CollectionUtils.isEmpty(kioTagIds)) {
tagValues.putAll(kingIOCollector.getTagValues(kioTagIds));
- }
- if (!CollectionUtils.isEmpty(httpTagZxzk)) {
- tagValues.putAll(httpCollectorForZxzk.getTagValues(httpTagZxzk));
-
}
this.toCommonResult(collectTime, dtos, tagValues, dataMap, result);
log.info("测量点处理结束");
@@ -175,9 +167,7 @@
} else if (DataSourceType.KIO.getCode().equals(item.getSourceType())) {
value = kingIOCollector.getTagValue(item.getSourceId(), item.getTagNo());
} else if (DataSourceType.HTTP.getCode().equals(item.getSourceType())) {
- if (CommonConstant.HTTP_API_ZXZK_IH.equals(item.getSourceName())) {
- value = httpCollectorForZxzk.getTagValue(item.getSourceId(), item.getTagNo());
- }
+
} else {
log.info("没有匹配的TagNo=" + item.getTagNo());
}
--
Gitblit v1.9.3