From 06dcd31d599e24711d609dece7eb07a8b5f58dcd Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 25 六月 2025 10:18:04 +0800
Subject: [PATCH] 测点当前值增加上下限制
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 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 cddf15e..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) {
@@ -85,6 +91,26 @@
pojo.setType(daPointDTO.getDataType());
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;
}
@@ -227,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