From 161f558d30e64d40fe7552da16b4141859aa467e Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期日, 15 十二月 2024 14:34:24 +0800
Subject: [PATCH] recordStatusList
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/PointCollector.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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..418f4e1 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
@@ -3,9 +3,13 @@
import com.iailab.module.data.common.enums.DataSourceType;
import com.iailab.module.data.common.utils.R;
import com.iailab.module.data.channel.kio.collector.KingIOCollector;
+import com.iailab.module.data.influxdb.pojo.InfluxPointValueDigPOJO;
+import com.iailab.module.data.influxdb.pojo.InfluxPointValueSimPOJO;
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.DaPointCollectStatusService;
import com.iailab.module.data.point.service.DaPointService;
import com.iailab.module.data.influxdb.pojo.InfluxPointValuePOJO;
import com.iailab.module.data.channel.modbus.collector.ModBusCollector;
@@ -15,7 +19,10 @@
import com.iailab.module.data.point.dto.DaPointWriteValueDTO;
import com.iailab.module.data.influxdb.service.InfluxDBService;
import lombok.extern.slf4j.Slf4j;
+
import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -55,6 +62,12 @@
@Resource
private OpcUaCollector opcUaCollector;
+ @Resource
+ private CumulateHandle cumulateHandle;
+
+ @Autowired
+ private DaPointCollectStatusService daPointCollectStatusService;
+
/**
* 采集
*
@@ -78,11 +91,17 @@
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);
+ log.info("更新采集状态");
+ daPointCollectStatusService.recordStatusList(pointValues, collectTime);
log.info("采集完成");
- } catch (Exception ex) {
+ } catch (Exception ex) {
log.info("采集异常！");
ex.printStackTrace();
}
--
Gitblit v1.9.3