From 033e696ffd783f3d78a16c1a359353ec6a7aeec2 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期三, 08 一月 2025 11:31:38 +0800
Subject: [PATCH] 预测参数查询调整
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/PointCollector.java | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 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 52e872c..f263bd2 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,11 +24,14 @@
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;
import java.math.BigDecimal;
+import java.time.Duration;
import java.util.*;
+import java.util.concurrent.TimeUnit;
/**
* @author PanZhibao
@@ -68,6 +72,13 @@
@Autowired
private DaPointCollectStatusService daPointCollectStatusService;
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
+
+ public static final String PV = "point_value:";
+
+ public static final long offset = 60 * 3L;
+
/**
* 采集
*
@@ -95,30 +106,27 @@
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().doubleValue(), offset, TimeUnit.SECONDS);
+ } else if (pointValue instanceof InfluxPointValueDigPOJO) {
+ InfluxPointValueDigPOJO digPOJO = (InfluxPointValueDigPOJO) pointValue;
+ redisTemplate.opsForValue().set(PV + digPOJO.getPoint(), digPOJO.getValue().intValue(), offset, TimeUnit.SECONDS);
+ } else if (pointValue instanceof InfluxPointValueBoolPOJO) {
+ InfluxPointValueBoolPOJO boolPOJO = (InfluxPointValueBoolPOJO) pointValue;
+ redisTemplate.opsForValue().set(PV + boolPOJO.getPoint(), boolPOJO.getValue().booleanValue(), offset, TimeUnit.SECONDS);
+ }
+ }
log.info("更新采集状态");
- updateCollectStatus(pointValues, collectTime);
+ daPointCollectStatusService.recordStatusList(pointValues, collectTime);
log.info("采集完成");
} catch (Exception ex) {
log.info("采集异常！");
- ex.printStackTrace();
- }
- }
-
- private void updateCollectStatus(List<InfluxPointValuePOJO> pointValues, Date collectTime) {
- try {
- for (InfluxPointValuePOJO pointValue : pointValues) {
- if (pointValue instanceof InfluxPointValueSimPOJO) {
- InfluxPointValueSimPOJO pvo = (InfluxPointValueSimPOJO) pointValue;
- daPointCollectStatusService.recordStatus(pvo.getPoint(), pvo.getValue().toString(), collectTime);
- } else if (pointValue instanceof InfluxPointValueDigPOJO) {
- InfluxPointValueDigPOJO pvo = (InfluxPointValueDigPOJO) pointValue;
- daPointCollectStatusService.recordStatus(pvo.getPoint(), pvo.getValue().toString(), collectTime);
- }
- }
- } catch (Exception ex) {
ex.printStackTrace();
}
}
@@ -132,6 +140,7 @@
data.putAll(constantHandle.getCurrent(pointNos));
data.putAll(measureHandle.getCurrent(pointNos));
data.putAll(calculateHandle.getCurrent(pointNos));
+ data.putAll(cumulateHandle.getCurrent(pointNos));
return data;
} catch (Exception ex) {
return R.error(ex.getMessage());
--
Gitblit v1.9.3