From c84806dc721cedbfd12ff513c05b17ba88b679dd Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 14 五月 2025 15:26:35 +0800
Subject: [PATCH] 极值点处理类
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/PointCollector.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 0c4839a..c9520d8 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
@@ -6,8 +6,7 @@
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;
-import com.iailab.module.data.point.collection.handler.CumulateHandle;
+import com.iailab.module.data.point.collection.handler.*;
import com.iailab.module.data.point.common.PointTypeEnum;
import com.iailab.module.data.point.dto.DaPointDTO;
import com.iailab.module.data.point.service.DaPointCollectStatusService;
@@ -15,8 +14,6 @@
import com.iailab.module.data.influxdb.pojo.InfluxPointValuePOJO;
import com.iailab.module.data.channel.modbus.collector.ModBusCollector;
import com.iailab.module.data.channel.opcua.collector.OpcUaCollector;
-import com.iailab.module.data.point.collection.handler.ConstantHandle;
-import com.iailab.module.data.point.collection.handler.MeasureHandle;
import com.iailab.module.data.point.dto.DaPointWriteValueDTO;
import com.iailab.module.data.influxdb.service.InfluxDBService;
import lombok.extern.slf4j.Slf4j;
@@ -68,6 +65,9 @@
@Resource
private CumulateHandle cumulateHandle;
+ @Resource
+ private ExtremalHandle extremalHandle;
+
@Autowired
private DaPointCollectStatusService daPointCollectStatusService;
@@ -108,6 +108,10 @@
List<DaPointDTO> pointCumulateList = daPointService.getCumulatePoint(minfreq);
pointValues.addAll(cumulateHandle.handle(collectTime, pointCumulateList, listGood, listBad));
+ log.info("读取极值点");
+ List<DaPointDTO> pointExtremalList = daPointService.getExtremalPoint(minfreq);
+ pointValues.addAll(extremalHandle.handle(collectTime, pointExtremalList, listGood, listBad));
+
log.info("存入时序库");
log.info("pointValueTimestamp=" + (pointValues.get(0) == null ? 0 : pointValues.get(0).getTimestamp().getNano()));
influxDBService.asyncWritePointValues(pointValues);
@@ -144,6 +148,7 @@
data.putAll(measureHandle.getCurrent(pointNos));
data.putAll(calculateHandle.getCurrent(pointNos));
data.putAll(cumulateHandle.getCurrent(pointNos));
+ data.putAll(extremalHandle.getCurrent(pointNos));
return data;
} catch (Exception ex) {
ex.printStackTrace();
--
Gitblit v1.9.3