From fc7ebc6bf97d7c4a4a8911c7a5d7cadcbda24719 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 12 六月 2025 17:41:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java |   91 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 88 insertions(+), 3 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..752dc19 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
@@ -12,8 +12,12 @@
 import com.iailab.module.data.point.dto.DaMathPointDTO;
 import com.iailab.module.data.point.dto.DaPointDTO;
 import com.iailab.module.data.point.dto.DaPointWriteValueDTO;
+import com.iailab.module.data.point.entity.DaPointBadHistoryEntity;
 import com.iailab.module.data.point.service.DaMathPointService;
+import com.iailab.module.data.point.service.DaPointBadHistoryService;
 import com.iailab.module.data.point.service.DaPointService;
+import com.iailab.module.data.point.vo.DaPointBadHistoryPageReqVO;
+import com.iailab.module.data.point.vo.DaPointCountReqVO;
 import com.iailab.module.data.point.vo.DaPointPageReqVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
@@ -23,7 +27,6 @@
 
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 
 /**
  * @author PanZhibao
@@ -45,6 +48,9 @@
 
     @Autowired
     private DaMathPointService daMathPointService;
+
+    @Autowired
+    private DaPointBadHistoryService daPointBadHistoryService;
 
     @Override
     public ApiPointDTO getInfoById(String pointId) {
@@ -71,7 +77,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 +89,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
@@ -182,4 +253,18 @@
         });
         return new PageResult<>(dataList, pageResult.getTotal());
     }
+
+    @Override
+    public PageResult<ApiPointBadHistoryDTO> queryPointBadHistoryPage(ApiPointBadHistoryPageReqVO reqVO) {
+        DaPointBadHistoryPageReqVO req = ConvertUtils.sourceToTarget(reqVO, DaPointBadHistoryPageReqVO.class);
+        PageResult<DaPointBadHistoryEntity> page = daPointBadHistoryService.queryPage(req);
+        List<ApiPointBadHistoryDTO> dataList = ConvertUtils.sourceToTarget(page.getList(), ApiPointBadHistoryDTO.class);
+        return new PageResult<>(dataList, page.getTotal());
+    }
+
+    @Override
+    public String getPointTotalCount(ApiPointCountReqVO reqVO) {
+        DaPointCountReqVO req = ConvertUtils.sourceToTarget(reqVO, DaPointCountReqVO.class);
+        return daPointService.getPointCount(req).toString();
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3