From 44ba81f6aab41b5939c6a5e13c776971604467b8 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 26 三月 2025 16:52:44 +0800
Subject: [PATCH] ASDE
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/MeasureHandle.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 6002f45..d3c6d26 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
@@ -3,6 +3,7 @@
import com.iailab.framework.common.util.string.StrUtils;
import com.iailab.module.data.channel.http.collector.SourceApiEnum;
import com.iailab.module.data.channel.http.collector.asdb.HttpCollectorForAsdb;
+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.opcda.collector.OpcDACollector;
import com.iailab.module.data.common.enums.CommonConstant;
@@ -59,6 +60,9 @@
@Autowired
private HttpCollectorForAsdb httpCollectorForAsdb;
+ @Autowired
+ private HttpCollectorForAsde httpCollectorForAsde;
+
@Resource
private DaPointService daPointService;
@@ -78,6 +82,7 @@
List<String[]> kioTagIds = new ArrayList<>();
List<Object[]> httpTagIhd = new ArrayList<>();
List<Object[]> httpTagAsdb = new ArrayList<>();
+ List<Object[]> httpTagAsde = new ArrayList<>();
dtos.stream().forEach(item -> {
if (DataSourceType.OPCUA.getCode().equals(item.getSourceType())) {
@@ -96,6 +101,10 @@
} else if (SourceApiEnum.ASDB.getCode().equals(item.getSourceName())) {
if (item.getTagNo() != null && item.getDimension() != null && item.getValueType() != null) {
httpTagAsdb.add(new Object[]{item.getSourceId(), item.getTagNo(), item.getDimension(), item.getValueType()});
+ }
+ } else if (SourceApiEnum.ASDE.getCode().equals(item.getSourceName())) {
+ if (item.getTagNo() != null && item.getDimension() != null && item.getValueType() != null) {
+ httpTagAsde.add(new Object[]{item.getSourceId(), item.getTagNo(), item.getDimension(), item.getValueType()});
}
}
}
@@ -120,6 +129,9 @@
if (!CollectionUtils.isEmpty(httpTagAsdb)) {
tagValues.putAll(httpCollectorForAsdb.getTagValues(httpTagAsdb, collectTime));
}
+ if (!CollectionUtils.isEmpty(httpTagAsde)) {
+ tagValues.putAll(httpCollectorForAsde.getTagValues(httpTagAsde, collectTime));
+ }
this.toCommonResult(collectTime, dtos, tagValues, dataMap, result,listGood,listBad);
log.info("测量点处理结束");
return result;
--
Gitblit v1.9.3