From e690db9517216bea6a19c7c186d35b2ad8d6fd3f Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 26 五月 2025 15:41:14 +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 | 143 +++++++++++++++++++++++++++++++----------------
1 files changed, 93 insertions(+), 50 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..2bed5dc 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,9 @@
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.asdb.HttpCollectorForAsdy;
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;
@@ -12,6 +15,7 @@
import com.iailab.module.data.channel.kio.collector.KingIOCollector;
import com.iailab.module.data.channel.modbus.collector.ModBusCollector;
import com.iailab.module.data.channel.opcua.collector.OpcUaCollector;
+import com.iailab.module.data.enums.DataPointFreqEnum;
import com.iailab.module.data.point.collection.PointCollector;
import com.iailab.module.data.point.collection.utils.GenInfluxPointValueUtils;
import com.iailab.module.data.point.common.PointDataTypeEnum;
@@ -59,6 +63,15 @@
@Autowired
private HttpCollectorForAsdb httpCollectorForAsdb;
+ @Autowired
+ private HttpCollectorForAsde httpCollectorForAsde;
+
+ @Autowired
+ private HttpCollectorForAsdc httpCollectorForAsdc;
+
+ @Autowired
+ private HttpCollectorForAsdy httpCollectorForAsdy;
+
@Resource
private DaPointService daPointService;
@@ -78,6 +91,9 @@
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<>();
+ List<Object[]> httpTagAsdy = new ArrayList<>();
dtos.stream().forEach(item -> {
if (DataSourceType.OPCUA.getCode().equals(item.getSourceType())) {
@@ -96,6 +112,18 @@
} 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()});
+ }
+ } else if (SourceApiEnum.ASDY.getCode().equals(item.getSourceName())) {
+ if (item.getTagNo() != null && item.getDimension() != null && item.getValueType() != null) {
+ httpTagAsdy.add(new Object[]{item.getSourceId(), item.getTagNo(), item.getDimension(), item.getValueType()});
}
}
}
@@ -120,6 +148,15 @@
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));
+ }
+ if (!CollectionUtils.isEmpty(httpTagAsdy)) {
+ tagValues.putAll(httpCollectorForAsdy.getTagValues(httpTagAsdy, collectTime));
+ }
this.toCommonResult(collectTime, dtos, tagValues, dataMap, result,listGood,listBad);
log.info("测量点处理结束");
return result;
@@ -134,16 +171,16 @@
if (tagValues.containsKey(tagId)) {
Object value = handleData(dto, tagValues.get(tagId));
InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto, value);
- pojo.setTimestamp(collectTime.toInstant());
+ pojo.setTimestamp(GenInfluxPointValueUtils.getByMin(collectTime, DataPointFreqEnum.getEumByCode(dto.getMinfreqid())));
dataMap.put(dto.getPointNo(), value);
result.add(pojo);
listGood.add(dto.getPointNo());
} else {
InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto, CommonConstant.BAD_VALUE);
- pojo.setTimestamp(collectTime.toInstant());
+ pojo.setTimestamp(GenInfluxPointValueUtils.getByMin(collectTime, DataPointFreqEnum.getEumByCode(dto.getMinfreqid())));
result.add(pojo);
listBad.add(dto.getPointNo());
- System.out.println("值异常！TagId=" + tagId);
+ log.info("值异常！TagId=" + tagId);
}
});
}
@@ -187,55 +224,61 @@
public Map<String, Object> getCurrent(List<String> pointNos) {
Map<String, Object> data = new HashMap<>();
List<DaPointDTO> pointMeasureList = daPointService.getMeasurePoint(pointNos);
- pointMeasureList.forEach(
- item -> {
- try {
- Object value = CommonConstant.BAD_VALUE;
- boolean hasKey = redisTemplate.hasKey(PointCollector.PV + item.getPointNo());
- if (hasKey) {
- value = redisTemplate.opsForValue().get(PointCollector.PV + item.getPointNo());
- }
- if(hasKey && StrUtils.isNumeric(value.toString()) &&
- new BigDecimal(value.toString()).compareTo(CommonConstant.BAD_VALUE) != 0 ) {
- value = redisTemplate.opsForValue().get(PointCollector.PV + item.getPointNo());
- } else if (DataSourceType.OPCUA.getCode().equals(item.getSourceType())) {
- value = opcUaCollector.getTagValue(item.getSourceId(), item.getTagNo());
- } else if (DataSourceType.ModBus.getCode().equals(item.getSourceType())) {
- value = modBusCollector.getTagValue(item.getSourceId(), item.getTagNo());
- } else if (DataSourceType.KIO.getCode().equals(item.getSourceType())) {
- value = kingIOCollector.getTagValue(item.getSourceId(), item.getTagNo());
- } else if (DataSourceType.HTTP.getCode().equals(item.getSourceType())) {
- if (SourceApiEnum.iHyperDB.getCode().equals(item.getSourceName())) {
- 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 {
- log.info("没有匹配的TagNo=" + item.getTagNo());
- }
- log.info("TagNo=" + item.getTagNo() + ",value=" + value.toString());
- if (!PointDataTypeEnum.BOOLEAN.getCode().equals(item.getDataType())) {
- BigDecimal decValue = new BigDecimal(value.toString());
- if (PointDataTypeEnum.FLOAT.getCode().equals(item.getDataType())) {
- decValue = decValue.setScale(2, BigDecimal.ROUND_HALF_UP);
- } else if (PointDataTypeEnum.INT.getCode().equals(item.getDataType())) {
- decValue = decValue.setScale(0, BigDecimal.ROUND_HALF_UP);
- }
- data.put(item.getPointNo(), decValue);
- } else {
- data.put(item.getPointNo(), value);
- }
-
- if (!hasKey) {
- // 存入缓存
- toRedis(value, item);
- }
- } catch (Exception ex) {
- ex.printStackTrace();
+ for (DaPointDTO item : pointMeasureList) {
+ try {
+ Object value = CommonConstant.BAD_VALUE;
+ boolean hasKey = redisTemplate.hasKey(PointCollector.PV + item.getPointNo());
+ if (hasKey && !StrUtils.isNumeric(value.toString())) {
+ value = redisTemplate.opsForValue().get(PointCollector.PV + item.getPointNo());
+ data.put(item.getPointNo(), value);
+ continue;
+ } else if(hasKey && StrUtils.isNumeric(value.toString()) && new BigDecimal(value.toString()).compareTo(CommonConstant.BAD_VALUE) != 0 ) {
+ value = redisTemplate.opsForValue().get(PointCollector.PV + item.getPointNo());
+ data.put(item.getPointNo(), value);
+ continue;
+ } else if (DataSourceType.OPCUA.getCode().equals(item.getSourceType())) {
+ value = opcUaCollector.getTagValue(item.getSourceId(), item.getTagNo());
+ } else if (DataSourceType.ModBus.getCode().equals(item.getSourceType())) {
+ value = modBusCollector.getTagValue(item.getSourceId(), item.getTagNo());
+ } else if (DataSourceType.KIO.getCode().equals(item.getSourceType())) {
+ value = kingIOCollector.getTagValue(item.getSourceId(), item.getTagNo());
+ } else if (DataSourceType.HTTP.getCode().equals(item.getSourceType())) {
+ if (SourceApiEnum.iHyperDB.getCode().equals(item.getSourceName())) {
+ 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 if (SourceApiEnum.ASDY.getCode().equals(item.getSourceName())) {
+ value = httpCollectorForAsdy.getTagValue(item.getSourceId(), item.getTagNo());
}
-
+ } else {
+ log.info("没有匹配的TagNo=" + item.getTagNo());
}
- );
+ log.info("TagNo=" + item.getTagNo() + ",value=" + value.toString());
+ if (!PointDataTypeEnum.BOOLEAN.getCode().equals(item.getDataType())) {
+ BigDecimal coefficient = item.getUnittransfactor() == null ? BigDecimal.ONE : item.getUnittransfactor();
+ BigDecimal decValue = new BigDecimal(value.toString()).multiply(coefficient);
+ if (PointDataTypeEnum.FLOAT.getCode().equals(item.getDataType())) {
+ decValue = decValue.setScale(2, BigDecimal.ROUND_HALF_UP);
+ } else if (PointDataTypeEnum.INT.getCode().equals(item.getDataType())) {
+ decValue = decValue.setScale(0, BigDecimal.ROUND_HALF_UP);
+ }
+ data.put(item.getPointNo(), decValue);
+ } else {
+ data.put(item.getPointNo(), value);
+ }
+
+ if (!hasKey) {
+ // 存入缓存
+ toRedis(value, item);
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
return data;
}
--
Gitblit v1.9.3