From 73b24c8664c66857412c0065d4ee6ee487c61fd8 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期四, 12 六月 2025 17:10:30 +0800
Subject: [PATCH] 增加测点异常历史表查询接口，新增查询测点数量接口
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 155 insertions(+), 4 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 d57f185..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
@@ -1,5 +1,6 @@
package com.iailab.module.data.api.point;
+import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.module.data.api.point.dto.*;
@@ -7,11 +8,20 @@
import com.iailab.module.data.influxdb.service.InfluxDBService;
import com.iailab.module.data.influxdb.service.impl.InfluxDBServiceImpl;
import com.iailab.module.data.point.collection.PointCollector;
+import com.iailab.module.data.point.collection.handler.CalculateHandle;
+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;
+import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RestController;
@@ -36,13 +46,19 @@
@Autowired
private InfluxDBService influxDBService;
+ @Autowired
+ private DaMathPointService daMathPointService;
+
+ @Autowired
+ private DaPointBadHistoryService daPointBadHistoryService;
+
@Override
public ApiPointDTO getInfoById(String pointId) {
return daPointService.getSimpleInfoById(pointId);
}
@Override
- public List<ApiPointDTO> getInfoByIds(List<String> pointIds) {
+ public List<ApiPointDTO> getInfoByIds(Set<String> pointIds) {
List<ApiPointDTO> result = new ArrayList<>(pointIds.size());
for (String pointId : pointIds) {
result.add(daPointService.getSimpleInfoById(pointId));
@@ -61,14 +77,98 @@
}
@Override
- public Map<String, List<Map<String, Object>>> queryPointsHistoryValue(ApiPointsValueQueryDTO queryDto) {
- Map<String, List<Map<String, Object>>> data = new HashMap<>();
+ public Map<String, Object> queryPointMaxValue(ApiPointValueQueryDTO queryDto) {
+ Map<String, Object> result = new HashMap<>();
+ if (StringUtils.isEmpty(queryDto.getPointNo())) {
+ return null;
+ }
if (queryDto.getStart() == null) {
- queryDto.setStart(new Date());
+ return null;
+ }
+ DaPointDTO daPointDTO = daPointService.getByNo(queryDto.getPointNo());
+ InfluxPointValuePOJO pojo = new InfluxPointValuePOJO();
+ pojo.setPoint(queryDto.getPointNo());
+ 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;
+ }
+
+ @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
+ public Map<String, List<Map<String, Object>>> queryPointsHistoryValue(ApiPointsValueQueryDTO queryDto) {
+ Map<String, List<Map<String, Object>>> data = new HashMap<>();
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MILLISECOND, 0);
+ if (queryDto.getEnd() == null) {
+ queryDto.setEnd(calendar.getTime());
+ }
+ if (queryDto.getStart() == null) {
+ calendar.add(Calendar.HOUR_OF_DAY, -1);
+ queryDto.setStart(calendar.getTime());
+ }
+
Map<String, Object> params = new HashMap<>(1);
params.put("pointNos", queryDto.getPointNos());
List<DaPointDTO> pointList = daPointService.list(params);
@@ -93,6 +193,16 @@
pojo.setType(daPointDTO.getDataType());
Date startTime = queryDto.getStart();
Date endTime = queryDto.getEnd();
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MILLISECOND, 0);
+ if (endTime == null) {
+ endTime = calendar.getTime();
+ }
+ if (startTime == null) {
+ calendar.setTime(endTime);
+ calendar.add(Calendar.HOUR_OF_DAY, -1);
+ startTime = calendar.getTime();
+ }
List<Map<String, Object>> list = influxDBService.queryPointValues(pojo, startTime, endTime);
List<ApiPointValueDTO> pointValueList = new ArrayList<>();
for (int i = 0; list.size() - i >= 1; i++) {
@@ -113,7 +223,48 @@
pointCollector.setValue(wr);
return true;
} catch (Exception ex) {
+ ex.printStackTrace();
return false;
}
}
+
+ @Override
+ public PageResult<ApiPointDTO> queryMathPointCurrentValue(ApiPointPageReqVO reqVO) {
+ DaPointDTO daPointDTO = daPointService.getSimpleInfoByNo(reqVO.getPointNo());
+ DaMathPointDTO daMathPointDTO = daMathPointService.getByPoint(daPointDTO.getId());
+ String[] pointNos = daMathPointDTO.getExpression().split(CalculateHandle.regex);
+ DaPointPageReqVO pageReqVO = new DaPointPageReqVO();
+ pageReqVO.setPageNo(reqVO.getPageNo());
+ pageReqVO.setPageSize(reqVO.getPageSize());
+ pageReqVO.setPointNos(Arrays.asList(pointNos));
+ PageResult<DaPointDTO> pageResult = daPointService.queryPage(pageReqVO);
+ List<String> pointNosL = pageResult.getList().stream().map(item -> {
+ return item.getPointNo();
+ }).collect(Collectors.toList());
+ Map<String, Object> currentValueMap = pointCollector.getCurrentValue(pointNosL);
+
+ List<ApiPointDTO> dataList = new ArrayList<>();
+ pageResult.getList().forEach(item -> {
+ ApiPointDTO dto = new ApiPointDTO();
+ dto.setPointNo(item.getPointNo());
+ dto.setPointName(item.getPointName());
+ dto.setCurrentValue(currentValueMap.get(item.getPointNo()).toString());
+ dataList.add(dto);
+ });
+ 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