From 97f3c16ac595493405e8cf76399dc703c088ef6f Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期二, 03 十二月 2024 15:56:11 +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/PointCollector.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 203492c..a97d9cc 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
@@ -4,6 +4,7 @@
import com.iailab.module.data.common.utils.R;
import com.iailab.module.data.channel.kio.collector.KingIOCollector;
import com.iailab.module.data.point.collection.handler.CalculateHandle;
+import com.iailab.module.data.point.collection.handler.CumulateHandle;
import com.iailab.module.data.point.common.PointTypeEnum;
import com.iailab.module.data.point.dto.DaPointDTO;
import com.iailab.module.data.point.service.DaPointService;
@@ -55,6 +56,9 @@
@Resource
private OpcUaCollector opcUaCollector;
+ @Resource
+ private CumulateHandle cumulateHandle;
+
/**
* 采集
*
@@ -78,6 +82,10 @@
List<DaPointDTO> pointCalculateList = daPointService.getMathPoint(minfreq);
pointValues.addAll(calculateHandle.handle(collectTime, pointCalculateList, dataMap));
+ log.info("读取累计点");
+ List<DaPointDTO> pointCumulateList = daPointService.getCumulatePoint(minfreq);
+ pointValues.addAll(cumulateHandle.handle(collectTime, pointCumulateList));
+
log.info("存入数据库");
influxDBService.asyncWritePointValues(pointValues);
--
Gitblit v1.9.3