From 057d17fad3bf7143d5aa07a5dbd9cd3451b8a66c Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 17 三月 2025 10:19:21 +0800
Subject: [PATCH] 采集超时使用最近的值
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/PointCollector.java | 31 ++-----------------------------
1 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/PointCollector.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/PointCollector.java
index 4c5eee6..69c1412 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/PointCollector.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/PointCollector.java
@@ -101,40 +101,13 @@
List<DaPointDTO> pointMeasureList = daPointService.getMeasurePoint(minfreq);
pointValues.addAll(measureHandle.handle(collectTime, pointMeasureList, dataMap, listGood, listBad));
- List<String> listBadNew = new ArrayList<>();
- if (!CollectionUtils.isEmpty(listBad)) {
- log.info("BAD点值修复");
- List<InfluxPointValuePOJO> influxParams = new ArrayList<>();
- for (String bad : listBad) {
- DaPointDTO daPointDTO = daPointService.getByNo(bad);
- InfluxPointValuePOJO pojo = new InfluxPointValuePOJO();
- pojo.setPoint(bad);
- pojo.setType(daPointDTO.getDataType());
- influxParams.add(pojo);
- }
- Map<String, Object> lastValue = influxDBService.queryPointsLastValue(influxParams);
- log.info("lastValue=" + JSONObject.toJSONString(lastValue));
- if (!CollectionUtils.isEmpty(lastValue)) {
- for (String bad : listBad) {
- if (lastValue.containsKey(bad)) {
- listGood.add(bad);
- dataMap.put(bad, lastValue.get(bad));
- } else {
- listBadNew.add(bad);
- }
- }
- } else {
- listBadNew = listBad;
- }
- }
-
log.info("读取计算点");
List<DaPointDTO> pointCalculateList = daPointService.getMathPoint(minfreq);
- pointValues.addAll(calculateHandle.handle(collectTime, pointCalculateList, dataMap, listGood, listBadNew));
+ pointValues.addAll(calculateHandle.handle(collectTime, pointCalculateList, dataMap, listGood, listBad));
log.info("读取累计点");
List<DaPointDTO> pointCumulateList = daPointService.getCumulatePoint(minfreq);
- pointValues.addAll(cumulateHandle.handle(collectTime, pointCumulateList, listGood, listBadNew));
+ pointValues.addAll(cumulateHandle.handle(collectTime, pointCumulateList, listGood, listBad));
log.info("存入时序库");
influxDBService.asyncWritePointValues(pointValues);
--
Gitblit v1.9.3