From 6a5c41c91d0e10e9a48f96d58f4a191b953106ea Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期四, 27 三月 2025 16:10:59 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/PointCollector.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 a9b3215..0c4839a 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
@@ -29,7 +29,6 @@
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
-import java.time.Duration;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -77,7 +76,7 @@
public static final String PV = "point_value:";
- public static final long offset = 60 * 3L;
+ public static final long offset = 60 * 2L;
/**
* 采集
@@ -87,6 +86,7 @@
*/
public void collect(Date collectTime, String minfreq) {
try {
+ log.info("collectTime=" + collectTime.getTime());
Map<String, Object> dataMap = new HashMap<>();
List<InfluxPointValuePOJO> pointValues = new ArrayList<>();
// 记录点位状态
@@ -94,21 +94,22 @@
List<String> listBad = new ArrayList<>();
log.info("读取常量点");
List<DaPointDTO> pointConstantList = daPointService.getConstantPoint(minfreq);
- pointValues.addAll(constantHandle.handle(collectTime, pointConstantList, dataMap,listGood,listBad));
+ pointValues.addAll(constantHandle.handle(collectTime, pointConstantList, dataMap, listGood, listBad));
log.info("读取测量点");
List<DaPointDTO> pointMeasureList = daPointService.getMeasurePoint(minfreq);
- pointValues.addAll(measureHandle.handle(collectTime, pointMeasureList, dataMap,listGood,listBad));
+ pointValues.addAll(measureHandle.handle(collectTime, pointMeasureList, dataMap, listGood, listBad));
log.info("读取计算点");
List<DaPointDTO> pointCalculateList = daPointService.getMathPoint(minfreq);
- pointValues.addAll(calculateHandle.handle(collectTime, pointCalculateList, dataMap,listGood,listBad));
+ pointValues.addAll(calculateHandle.handle(collectTime, pointCalculateList, dataMap, listGood, listBad));
log.info("读取累计点");
List<DaPointDTO> pointCumulateList = daPointService.getCumulatePoint(minfreq);
- pointValues.addAll(cumulateHandle.handle(collectTime, pointCumulateList,listGood,listBad));
+ pointValues.addAll(cumulateHandle.handle(collectTime, pointCumulateList, listGood, listBad));
log.info("存入时序库");
+ log.info("pointValueTimestamp=" + (pointValues.get(0) == null ? 0 : pointValues.get(0).getTimestamp().getNano()));
influxDBService.asyncWritePointValues(pointValues);
log.info("存入缓存");
@@ -125,7 +126,7 @@
}
}
log.info("更新采集状态");
- daPointCollectStatusService.recordStatusList(listGood,listBad, collectTime);
+ daPointCollectStatusService.recordStatusList(listGood, listBad, collectTime);
log.info("采集完成");
} catch (Exception ex) {
log.info("采集异常！");
--
Gitblit v1.9.3