From 76743b009ca5ea67557fcab597b332f8d1947813 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 24 十二月 2024 14:09:04 +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 | 24 +++++++++++++++++++++++-
1 files changed, 23 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 043d3bb..c7475c9 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,6 +3,7 @@
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.InfluxPointValueBoolPOJO;
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;
@@ -23,6 +24,7 @@
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;
@@ -68,6 +70,13 @@
@Autowired
private DaPointCollectStatusService daPointCollectStatusService;
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
+
+ public static final String PV = "PV_";
+
+ public static final int offset = 60 * 3;
+
/**
* 采集
*
@@ -95,9 +104,22 @@
List<DaPointDTO> pointCumulateList = daPointService.getCumulatePoint(minfreq);
pointValues.addAll(cumulateHandle.handle(collectTime, pointCumulateList));
- log.info("存入数据库");
+ log.info("存入时序库");
influxDBService.asyncWritePointValues(pointValues);
+ log.info("存入缓存");
+ for (InfluxPointValuePOJO pointValue : pointValues) {
+ if (pointValue instanceof InfluxPointValueSimPOJO) {
+ InfluxPointValueSimPOJO simPOJO = (InfluxPointValueSimPOJO) pointValue;
+ redisTemplate.opsForValue().set(PV + simPOJO.getPoint(), simPOJO.getValue(), offset);
+ } else if (pointValue instanceof InfluxPointValueDigPOJO) {
+ InfluxPointValueDigPOJO digPOJO = (InfluxPointValueDigPOJO) pointValue;
+ redisTemplate.opsForValue().set(PV + digPOJO.getPoint(), digPOJO.getValue(), offset);
+ } else if (pointValue instanceof InfluxPointValueBoolPOJO) {
+ InfluxPointValueBoolPOJO boolPOJO = (InfluxPointValueBoolPOJO) pointValue;
+ redisTemplate.opsForValue().set(PV + boolPOJO.getPoint(), boolPOJO.getValue(), offset);
+ }
+ }
log.info("更新采集状态");
daPointCollectStatusService.recordStatusList(pointValues, collectTime);
log.info("采集完成");
--
Gitblit v1.9.3