From d247a09bec05cf7c490df9325883f3c99de1a124 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 03 六月 2025 13:24:08 +0800
Subject: [PATCH] handPending

---
 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java |   69 +++++++++++++++++++++++++++++++++-
 1 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java
index b194740..d276ce4 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java
@@ -71,7 +71,8 @@
     }
 
     @Override
-    public Object queryPointMaxValue(ApiPointValueQueryDTO queryDto) {
+    public Map<String, Object> queryPointMaxValue(ApiPointValueQueryDTO queryDto) {
+        Map<String, Object> result = new HashMap<>();
         if (StringUtils.isEmpty(queryDto.getPointNo())) {
             return null;
         }
@@ -82,7 +83,71 @@
         InfluxPointValuePOJO pojo = new InfluxPointValuePOJO();
         pojo.setPoint(queryDto.getPointNo());
         pojo.setType(daPointDTO.getDataType());
-        return influxDBService.queryPointMaxValue(pojo, queryDto.getStart());
+        Object val = influxDBService.queryPointMaxValue(pojo, queryDto.getStart());
+        result.put(queryDto.getPointNo(), val);
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> queryPointMaxTimeValue(ApiPointValueQueryDTO queryDto) {
+        Map<String, Object> result = new HashMap<>();
+        if (StringUtils.isEmpty(queryDto.getPointNo())) {
+            return null;
+        }
+        if (queryDto.getStart() == null) {
+            return null;
+        }
+        if (queryDto.getEnd() == null) {
+            queryDto.setEnd(new Date());
+        }
+        DaPointDTO daPointDTO = daPointService.getByNo(queryDto.getPointNo());
+        InfluxPointValuePOJO pojo = new InfluxPointValuePOJO();
+        pojo.setPoint(queryDto.getPointNo());
+        pojo.setType(daPointDTO.getDataType());
+        result = influxDBService.queryPointMaxTimeValue(pojo, queryDto.getStart(), queryDto.getEnd());
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> queryPointMaxValueRange(ApiPointValueQueryDTO queryDto) {
+        Map<String, Object> result = new HashMap<>();
+        if (StringUtils.isEmpty(queryDto.getPointNo())) {
+            return null;
+        }
+        if (queryDto.getStart() == null) {
+            return null;
+        }
+        if (queryDto.getEnd() == null) {
+            queryDto.setEnd(new Date());
+        }
+        DaPointDTO daPointDTO = daPointService.getByNo(queryDto.getPointNo());
+        InfluxPointValuePOJO pojo = new InfluxPointValuePOJO();
+        pojo.setPoint(queryDto.getPointNo());
+        pojo.setType(daPointDTO.getDataType());
+        Object val = influxDBService.queryPointMaxValueRange(pojo, queryDto.getStart(), queryDto.getEnd());
+        result.put(queryDto.getPointNo(), val);
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> queryPointMinValueRange(ApiPointValueQueryDTO queryDto) {
+        Map<String, Object> result = new HashMap<>();
+        if (StringUtils.isEmpty(queryDto.getPointNo())) {
+            return null;
+        }
+        if (queryDto.getStart() == null) {
+            return null;
+        }
+        if (queryDto.getEnd() == null) {
+            queryDto.setEnd(new Date());
+        }
+        DaPointDTO daPointDTO = daPointService.getByNo(queryDto.getPointNo());
+        InfluxPointValuePOJO pojo = new InfluxPointValuePOJO();
+        pojo.setPoint(queryDto.getPointNo());
+        pojo.setType(daPointDTO.getDataType());
+        Object val = influxDBService.queryPointMinValueRange(pojo, queryDto.getStart(), queryDto.getEnd());
+        result.put(queryDto.getPointNo(), val);
+        return result;
     }
 
     @Override

--
Gitblit v1.9.3