From 14cb329f0fec66711e3ddeba7e80db289c7fe8fc Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 31 十月 2024 08:51:04 +0800
Subject: [PATCH] 测点列表.xlsx
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/PointCollector.java | 8 --------
1 files changed, 0 insertions(+), 8 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 3723dd0..203492c 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
@@ -7,7 +7,6 @@
import com.iailab.module.data.point.common.PointTypeEnum;
import com.iailab.module.data.point.dto.DaPointDTO;
import com.iailab.module.data.point.service.DaPointService;
-import com.iailab.module.data.http.collector.HttpCollectorForZxzk;
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;
@@ -56,9 +55,6 @@
@Resource
private OpcUaCollector opcUaCollector;
- @Resource
- private HttpCollectorForZxzk httpCollectorForZxzk;
-
/**
* 采集
*
@@ -70,22 +66,18 @@
Map<String, Object> dataMap = new HashMap<>();
List<InfluxPointValuePOJO> pointValues = new ArrayList<>();
- // 读取常量点
log.info("读取常量点");
List<DaPointDTO> pointConstantList = daPointService.getConstantPoint(minfreq);
pointValues.addAll(constantHandle.handle(collectTime, pointConstantList, dataMap));
- // 读取测量点
log.info("读取测量点");
List<DaPointDTO> pointMeasureList = daPointService.getMeasurePoint(minfreq);
pointValues.addAll(measureHandle.handle(collectTime, pointMeasureList, dataMap));
- // 读取计算点
log.info("读取计算点");
List<DaPointDTO> pointCalculateList = daPointService.getMathPoint(minfreq);
pointValues.addAll(calculateHandle.handle(collectTime, pointCalculateList, dataMap));
- // 存入数据库
log.info("存入数据库");
influxDBService.asyncWritePointValues(pointValues);
--
Gitblit v1.9.3