From 56e254f4c6a3eab1218a4fbea3f60609d209ff95 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 27 六月 2025 14:19:26 +0800
Subject: [PATCH] 鞍信平均值
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/MeasureHandle.java | 274 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 174 insertions(+), 100 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 44850d5..68e9cbc 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,5 +1,12 @@
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.asdb.HttpCollectorForAsMediaType;
+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;
import com.iailab.module.data.common.enums.DataSourceType;
import com.iailab.module.data.common.enums.DataTypeEnum;
@@ -7,20 +14,24 @@
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;
import com.iailab.module.data.point.dto.DaPointDTO;
import com.iailab.module.data.point.service.DaPointService;
-import com.iailab.module.data.http.collector.HttpCollectorForZxzk;
-import com.iailab.module.data.http.service.impl.HttpTagCollector;
import com.iailab.module.data.influxdb.pojo.InfluxPointValuePOJO;
import lombok.extern.slf4j.Slf4j;
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;
/**
* 测量点处理
@@ -33,10 +44,6 @@
@Component
public class MeasureHandle {
- private BigDecimal maxValue = new BigDecimal("1000000000");
-
- private BigDecimal minValue = new BigDecimal("0");
-
@Resource
private ModBusCollector modBusCollector;
@@ -46,37 +53,48 @@
@Resource
private OpcUaCollector opcUaCollector;
- @Resource
- private HttpTagCollector httpTagCollector;
+ @Autowired
+ private OpcDACollector opcDACollector;
- @Resource
- private HttpCollectorForZxzk httpCollectorForZxzk;
+ @Autowired
+ private HttpCollectorForIhd httpCollectorForIhd;
+
+ @Autowired
+ private HttpCollectorForAsdb httpCollectorForAsdb;
+
+ @Autowired
+ private HttpCollectorForAsMediaType httpCollectorForAsMediaType;
+
+ @Autowired
+ private HttpCollectorForAsdy httpCollectorForAsdy;
@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)) {
return result;
}
- List<String[]> opcuaTagIds = new ArrayList<>();
+ List<String[]> opcUaTagIds = new ArrayList<>();
List<String[]> opcDaTagIds = new ArrayList<>();
List<String[]> modbusTagIds = new ArrayList<>();
List<String[]> kioTagIds = new ArrayList<>();
- List<String[]> httpTagZxzk = new ArrayList<>();
-
-
- List<String> tagYearPeiIds = new ArrayList<>();
- List<String> tagCurrentPerformanceIds = new ArrayList<>();
- List<String> tagCurrentSaleIds = new ArrayList<>();
- List<String> tagPrdTimeDistIds = 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<>();
+ List<Object[]> httpTagAsdm = new ArrayList<>();
dtos.stream().forEach(item -> {
if (DataSourceType.OPCUA.getCode().equals(item.getSourceType())) {
- opcuaTagIds.add(new String[]{item.getSourceId(), item.getTagNo()});
+ opcUaTagIds.add(new String[]{item.getSourceId(), item.getTagNo()});
} else if (DataSourceType.OPCDA.getCode().equals(item.getSourceType())) {
opcDaTagIds.add(new String[]{item.getSourceId(), item.getTagNo()});
} else if (DataSourceType.ModBus.getCode().equals(item.getSourceType())) {
@@ -84,72 +102,89 @@
} else if (DataSourceType.KIO.getCode().equals(item.getSourceType())) {
kioTagIds.add(new String[]{item.getSourceId(), item.getTagNo()});
} else if (DataSourceType.HTTP.getCode().equals(item.getSourceType())) {
- if (CommonConstant.YEAR_PEI_HTTP_TAG.equals(item.getSourceId())) {
- tagYearPeiIds.add(item.getTagNo());
- } else if (CommonConstant.CURRENT_PERFORMANCE_HTTP_TAG.equals(item.getSourceId())) {
- tagCurrentPerformanceIds.add(item.getTagNo());
- } else if (CommonConstant.CURRENT_SALE_HTTP_TAG.equals(item.getSourceId())) {
- tagCurrentSaleIds.add(item.getTagNo());
- } else if (CommonConstant.PRD_TIME_DIST_HTTP_TAG.equals(item.getSourceId())) {
- tagPrdTimeDistIds.add(item.getTagNo());
- } else if (CommonConstant.HTTP_API_ZXZK_IH.equals(item.getSourceName())) {
- httpTagZxzk.add(new String[]{item.getSourceId(), item.getTagNo()});
+ if (SourceApiEnum.iHyperDB.getCode().equals(item.getSourceName())) {
+ 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()});
+ }
+ } 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()});
+ }
+ } else if (SourceApiEnum.ASDM.getCode().equals(item.getSourceName())) {
+ if (item.getTagNo() != null && item.getDimension() != null && item.getValueType() != null) {
+ httpTagAsdm.add(new Object[]{item.getSourceId(), item.getTagNo(), item.getDimension(), item.getValueType()});
+ }
}
}
});
- if (!CollectionUtils.isEmpty(opcuaTagIds)) {
- Map<String, Object> tagValues = opcUaCollector.getTagValues(opcuaTagIds);
- this.toCommonResult(collectTime, dtos, tagValues, dataMap, result);
+ Map<String, Object> tagValues = new HashMap<>();
+ if (!CollectionUtils.isEmpty(opcUaTagIds)) {
+ tagValues.putAll(opcUaCollector.getTagValues(opcUaTagIds));
}
if (!CollectionUtils.isEmpty(opcDaTagIds)) {
+ tagValues.putAll(opcDACollector.getTagValues(modbusTagIds));
}
if (!CollectionUtils.isEmpty(modbusTagIds)) {
- Map<String, Object> tagValues = modBusCollector.getTagValues(modbusTagIds);
- this.toCommonResult(collectTime, dtos, tagValues, dataMap, result);
+ tagValues.putAll(modBusCollector.getTagValues(modbusTagIds));
}
if (!CollectionUtils.isEmpty(kioTagIds)) {
- Map<String, Object> tagValues = kingIOCollector.getTagValues(kioTagIds);
- this.toCommonResult(collectTime, dtos, tagValues, dataMap, result);
+ tagValues.putAll(kingIOCollector.getTagValues(kioTagIds));
}
- if (!CollectionUtils.isEmpty(httpTagZxzk)) {
- Map<String, Object> tagValues = httpCollectorForZxzk.getTagValues(httpTagZxzk);
- this.toCommonResult(collectTime, dtos, tagValues, dataMap, result);
+ if (!CollectionUtils.isEmpty(httpTagIhd)) {
+ tagValues.putAll(httpCollectorForIhd.getTagValues(httpTagIhd, collectTime));
}
- if (!CollectionUtils.isEmpty(tagYearPeiIds)) {
- Map<String, Object> tagValues = httpTagCollector.collect(CommonConstant.YEAR_PEI_HTTP_TAG, tagYearPeiIds);
- this.toCommonResult(collectTime, dtos, tagValues, dataMap, result);
- } else if (!CollectionUtils.isEmpty(tagCurrentPerformanceIds)) {
- Map<String, Object> tagValues = httpTagCollector.collect(CommonConstant.CURRENT_PERFORMANCE_HTTP_TAG, tagCurrentPerformanceIds);
- this.toCommonResult(collectTime, dtos, tagValues, dataMap, result);
- } else if (!CollectionUtils.isEmpty(tagCurrentSaleIds)) {
- Map<String, Object> tagValues = httpTagCollector.collect(CommonConstant.CURRENT_SALE_HTTP_TAG, tagCurrentSaleIds);
- this.toCommonResult(collectTime, dtos, tagValues, dataMap, result);
- } else if (!CollectionUtils.isEmpty(tagPrdTimeDistIds)) {
- Map<String, Object> tagValues = httpTagCollector.collect(CommonConstant.PRD_TIME_DIST_HTTP_TAG, tagPrdTimeDistIds);
- this.toCommonResult(collectTime, dtos, tagValues, dataMap, result);
+ if (!CollectionUtils.isEmpty(httpTagAsdb)) {
+ tagValues.putAll(httpCollectorForAsdb.getTagValues(httpTagAsdb, collectTime));
}
-
+ if (!CollectionUtils.isEmpty(httpTagAsde)) {
+ tagValues.putAll(httpCollectorForAsMediaType.getTagValues(httpTagAsde, collectTime));
+ }
+ if (!CollectionUtils.isEmpty(httpTagAsdc)) {
+ tagValues.putAll(httpCollectorForAsMediaType.getTagValues(httpTagAsdc, collectTime));
+ }
+ if (!CollectionUtils.isEmpty(httpTagAsdm)) {
+ tagValues.putAll(httpCollectorForAsMediaType.getTagValues(httpTagAsdm, collectTime));
+ }
+ if (!CollectionUtils.isEmpty(httpTagAsdy)) {
+ tagValues.putAll(httpCollectorForAsdy.getTagValues(httpTagAsdy, 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());
+ pojo.setTimestamp(GenInfluxPointValueUtils.getByMin(collectTime, DataPointFreqEnum.getEumByCode(dto.getMinfreqid())));
dataMap.put(dto.getPointNo(), value);
result.add(pojo);
+ listGood.add(dto.getPointNo());
} else {
- System.out.println("值异常！TagId=" + tagId);
+ InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto, CommonConstant.BAD_VALUE);
+ pojo.setTimestamp(GenInfluxPointValueUtils.getByMin(collectTime, DataPointFreqEnum.getEumByCode(dto.getMinfreqid())));
+ result.add(pojo);
+ listBad.add(dto.getPointNo());
+ log.info("值异常！TagId=" + tagId);
}
});
}
@@ -158,12 +193,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);
@@ -182,7 +218,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();
@@ -193,43 +228,82 @@
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;
- 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 (CommonConstant.HTTP_API_ZXZK_IH.equals(item.getSourceName())) {
- value = httpCollectorForZxzk.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());
- 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);
- }
- } 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 = httpCollectorForAsMediaType.getTagValue(item.getSourceId(), item.getTagNo());
+ } else if (SourceApiEnum.ASDC.getCode().equals(item.getSourceName())) {
+ value = httpCollectorForAsMediaType.getTagValue(item.getSourceId(), item.getTagNo());
+ } else if (SourceApiEnum.ASDM.getCode().equals(item.getSourceName())) {
+ value = httpCollectorForAsMediaType.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);
+ }
+ if (item.getMaxValue() != null && decValue.compareTo(item.getMaxValue()) > 0) {
+ decValue = item.getMaxValue();
+ } else if (item.getMinValue() != null && decValue.compareTo(item.getMinValue()) < 0) {
+ decValue = item.getMinValue();
+ }
+ data.put(item.getPointNo(), decValue);
+ } else {
+ data.put(item.getPointNo(), value);
+ }
+
+ if (!hasKey) {
+ // 存入缓存
+ toRedis(value, item);
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
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