From 6205c22a959fbb3b69735f34af8d3316c4082a5d Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 27 二月 2025 16:00:28 +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 | 90 +++++++++++++++++++++++++++++++++++----------
1 files changed, 70 insertions(+), 20 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 bec67f1..f5a40de 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
@@ -1,6 +1,8 @@
package com.iailab.module.data.point.collection.handler;
+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.ihdb.HttpCollectorForIhd;
import com.iailab.module.data.channel.opcda.collector.OpcDACollector;
import com.iailab.module.data.common.enums.CommonConstant;
@@ -10,6 +12,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.point.collection.PointCollector;
import com.iailab.module.data.point.collection.utils.GenInfluxPointValueUtils;
import com.iailab.module.data.point.common.PointDataTypeEnum;
import com.iailab.module.data.point.dto.DaPointDTO;
@@ -19,11 +22,13 @@
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.util.*;
+import java.util.concurrent.TimeUnit;
/**
* 测量点处理
@@ -55,10 +60,16 @@
@Autowired
private HttpCollectorForIhd httpCollectorForIhd;
+ @Autowired
+ private HttpCollectorForAsdb httpCollectorForAsdb;
+
@Resource
private DaPointService daPointService;
- public List<InfluxPointValuePOJO> handle(Date collectTime, List<DaPointDTO> dtos, Map<String, Object> dataMap) {
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
+
+ public List<InfluxPointValuePOJO> handle(Date collectTime, List<DaPointDTO> dtos, Map<String, Object> dataMap,List<String> listGood,List<String> listBad) {
log.info("测量点处理开始");
List<InfluxPointValuePOJO> result = new ArrayList<>();
if (CollectionUtils.isEmpty(dtos)) {
@@ -70,7 +81,7 @@
List<String[]> modbusTagIds = new ArrayList<>();
List<String[]> kioTagIds = new ArrayList<>();
List<Object[]> httpTagIhd = new ArrayList<>();
-
+ List<Object[]> httpTagAsdb = new ArrayList<>();
dtos.stream().forEach(item -> {
if (DataSourceType.OPCUA.getCode().equals(item.getSourceType())) {
@@ -83,7 +94,13 @@
kioTagIds.add(new String[]{item.getSourceId(), item.getTagNo()});
} else if (DataSourceType.HTTP.getCode().equals(item.getSourceType())) {
if (SourceApiEnum.iHyperDB.getCode().equals(item.getSourceName())) {
- httpTagIhd.add(new Object[]{item.getSourceId(), item.getTagNo(), item.getDimension(), item.getValueType()});
+ if (item.getTagNo() != null && item.getDimension() != null && item.getValueType() != null) {
+ httpTagIhd.add(new Object[]{item.getSourceId(), item.getTagNo(), item.getDimension(), item.getValueType()});
+ }
+ } 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()});
+ }
}
}
});
@@ -102,28 +119,34 @@
tagValues.putAll(kingIOCollector.getTagValues(kioTagIds));
}
if (!CollectionUtils.isEmpty(httpTagIhd)) {
- tagValues.putAll(httpCollectorForIhd.getTagValues(httpTagIhd));
+ tagValues.putAll(httpCollectorForIhd.getTagValues(httpTagIhd, collectTime));
}
- this.toCommonResult(collectTime, dtos, tagValues, dataMap, result);
+ if (!CollectionUtils.isEmpty(httpTagAsdb)) {
+ tagValues.putAll(httpCollectorForAsdb.getTagValues(httpTagAsdb, collectTime));
+ }
+ this.toCommonResult(collectTime, dtos, tagValues, dataMap, result,listGood,listBad);
log.info("测量点处理结束");
return result;
}
private void toCommonResult(Date collectTime, List<DaPointDTO> dtos, Map<String, Object> tagValues,
- Map<String, Object> dataMap, List<InfluxPointValuePOJO> result) {
+ Map<String, Object> dataMap, List<InfluxPointValuePOJO> result,List<String> listGood,List<String> listBad) {
if (!CollectionUtils.isEmpty(tagValues)) {
- tagValues.forEach((k, v) -> {
- dataMap.put(k, v);
- });
+// dataMap.putAll(tagValues);
dtos.forEach(dto -> {
String tagId = TagUtils.genTagId(dto.getSourceType(), dto.getSourceName(), dto.getTagNo());
- if (tagValues.get(tagId) != null) {
+ if (tagValues.containsKey(tagId)) {
Object value = handleData(dto, tagValues.get(tagId));
InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto, value);
pojo.setTimestamp(collectTime.toInstant());
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());
+ result.add(pojo);
+ listBad.add(dto.getPointNo());
System.out.println("值异常！TagId=" + tagId);
}
});
@@ -133,12 +156,13 @@
private Object handleData(DaPointDTO dto, Object value) {
Object result = value;
try {
+ if (value == null) {
+ return CommonConstant.BAD_VALUE;
+ }
if (DataTypeEnum.FLOAT.getCode().equals(dto.getDataType()) || DataTypeEnum.INT.getCode().equals(dto.getDataType())) {
BigDecimal rawValue = new BigDecimal(value.toString());
-
- // 异常值处理
- if (rawValue.compareTo(maxValue) > 0 || rawValue.compareTo(minValue) < 0) {
- rawValue = CommonConstant.BAD_VALUE;
+ if(CommonConstant.BAD_VALUE.compareTo(rawValue) == 0) {
+ return CommonConstant.BAD_VALUE;
}
BigDecimal coefficient = dto.getUnittransfactor() == null ? BigDecimal.ONE : dto.getUnittransfactor();
BigDecimal calValue = rawValue.multiply(coefficient);
@@ -157,7 +181,6 @@
} else if (DataTypeEnum.BOOLEAN.getCode().equals(dto.getDataType())) {
result = Boolean.parseBoolean(value.toString());
}
-
} catch (Exception ex) {
log.warn("handleData异常，PointNo=" + dto.getPointNo());
ex.printStackTrace();
@@ -172,20 +195,29 @@
item -> {
try {
Object value = CommonConstant.BAD_VALUE;
- if (DataSourceType.OPCUA.getCode().equals(item.getSourceType())) {
+ 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())) {
- value = httpCollectorForIhd.getTagValue(item.getSourceId(), item.getTagNo(), item.getDimension(), item.getValueType());
+ 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());
- log.info("valueStr=" + value.toString());
- log.info("DataType=" + item.getDataType());
+ 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())) {
@@ -197,6 +229,11 @@
} else {
data.put(item.getPointNo(), value);
}
+
+ if (!hasKey) {
+ // 存入缓存
+ toRedis(value, item);
+ }
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -205,4 +242,17 @@
);
return data;
}
+
+ public void toRedis(Object value, DaPointDTO point) {
+ if (PointDataTypeEnum.FLOAT.getCode().equals(point.getDataType())) {
+ redisTemplate.opsForValue().set(PointCollector.PV + point.getPointNo(), new BigDecimal(value.toString()).intValue(),
+ PointCollector.offset, TimeUnit.SECONDS);
+ } else if (PointDataTypeEnum.INT.getCode().equals(point.getDataType())) {
+ redisTemplate.opsForValue().set(PointCollector.PV + point.getPointNo(), new BigDecimal(value.toString()).doubleValue(),
+ PointCollector.offset, TimeUnit.SECONDS);
+ } else if (PointDataTypeEnum.BOOLEAN.getCode().equals(point.getDataType())) {
+ redisTemplate.opsForValue().set(PointCollector.PV + point.getPointNo(), Boolean.parseBoolean(value.toString()),
+ PointCollector.offset, TimeUnit.SECONDS);
+ }
+ }
}
--
Gitblit v1.9.3