From 5e036b9e9d19b799a09dfab61ad0f85ff137f1d9 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期一, 31 三月 2025 15:07:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/MeasureHandle.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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..c03f5ef 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,8 @@
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.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.opcda.collector.OpcDACollector;
import com.iailab.module.data.common.enums.CommonConstant;
@@ -59,6 +61,12 @@
@Autowired
private HttpCollectorForAsdb httpCollectorForAsdb;
+ @Autowired
+ private HttpCollectorForAsde httpCollectorForAsde;
+
+ @Autowired
+ private HttpCollectorForAsdc httpCollectorForAsdc;
+
@Resource
private DaPointService daPointService;
@@ -78,6 +86,8 @@
List<String[]> kioTagIds = new ArrayList<>();
List<Object[]> httpTagIhd = new ArrayList<>();
List<Object[]> httpTagAsdb = new ArrayList<>();
+ List<Object[]> httpTagAsde = new ArrayList<>();
+ List<Object[]> httpTagAsdc = new ArrayList<>();
dtos.stream().forEach(item -> {
if (DataSourceType.OPCUA.getCode().equals(item.getSourceType())) {
@@ -96,6 +106,14 @@
} 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()});
+ }
+ } 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()});
}
}
}
@@ -120,6 +138,12 @@
if (!CollectionUtils.isEmpty(httpTagAsdb)) {
tagValues.putAll(httpCollectorForAsdb.getTagValues(httpTagAsdb, collectTime));
}
+ if (!CollectionUtils.isEmpty(httpTagAsde)) {
+ tagValues.putAll(httpCollectorForAsde.getTagValues(httpTagAsde, collectTime));
+ }
+ if (!CollectionUtils.isEmpty(httpTagAsdc)) {
+ tagValues.putAll(httpCollectorForAsdc.getTagValues(httpTagAsdc, collectTime));
+ }
this.toCommonResult(collectTime, dtos, tagValues, dataMap, result,listGood,listBad);
log.info("测量点处理结束");
return result;
@@ -143,7 +167,7 @@
pojo.setTimestamp(collectTime.toInstant());
result.add(pojo);
listBad.add(dto.getPointNo());
- System.out.println("值异常！TagId=" + tagId);
+ log.info("值异常！TagId=" + tagId);
}
});
}
@@ -209,6 +233,10 @@
value = httpCollectorForIhd.getTagValue(item.getSourceId(), item.getTagNo(), item.getDimension(), item.getValueType());
} else if (SourceApiEnum.ASDB.getCode().equals(item.getSourceName())) {
value = httpCollectorForAsdb.getTagValue(item.getSourceId(), item.getTagNo());
+ } else if (SourceApiEnum.ASDE.getCode().equals(item.getSourceName())) {
+ value = httpCollectorForAsde.getTagValue(item.getSourceId(), item.getTagNo());
+ } else if (SourceApiEnum.ASDC.getCode().equals(item.getSourceName())) {
+ value = httpCollectorForAsdc.getTagValue(item.getSourceId(), item.getTagNo());
}
} else {
log.info("没有匹配的TagNo=" + item.getTagNo());
--
Gitblit v1.9.3