From cb5066ddca3d7c8d0959b20715f0f46948e6753e Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 14 一月 2025 14:40:42 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java | 64 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 7 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 64cc9a6..aca9940 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,8 +8,10 @@
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.dto.DaMathPointDTO;
import com.iailab.module.data.point.dto.DaPointDTO;
import com.iailab.module.data.point.dto.DaPointWriteValueDTO;
+import com.iailab.module.data.point.service.DaMathPointService;
import com.iailab.module.data.point.service.DaPointService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -17,6 +20,7 @@
import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.IntStream;
/**
* @author PanZhibao
@@ -36,9 +40,21 @@
@Autowired
private InfluxDBService influxDBService;
+ @Autowired
+ private DaMathPointService daMathPointService;
+
@Override
public ApiPointDTO getInfoById(String pointId) {
- return ConvertUtils.sourceToTarget(daPointService.getSimpleInfoById(pointId), ApiPointDTO.class);
+ return daPointService.getSimpleInfoById(pointId);
+ }
+
+ @Override
+ public List<ApiPointDTO> getInfoByIds(Set<String> pointIds) {
+ List<ApiPointDTO> result = new ArrayList<>(pointIds.size());
+ for (String pointId : pointIds) {
+ result.add(daPointService.getSimpleInfoById(pointId));
+ }
+ return result;
}
@Override
@@ -54,12 +70,16 @@
@Override
public Map<String, List<Map<String, Object>>> queryPointsHistoryValue(ApiPointsValueQueryDTO queryDto) {
Map<String, List<Map<String, Object>>> data = new HashMap<>();
- if (queryDto.getStart() == null) {
- queryDto.setStart(new Date());
- }
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MILLISECOND, 0);
if (queryDto.getEnd() == null) {
- queryDto.setEnd(new Date());
+ 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);
@@ -84,12 +104,21 @@
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.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++) {
ApiPointValueDTO pointValue = new ApiPointValueDTO();
- pointValue.setDataValue(Double.parseDouble(list.get(i).get(InfluxDBServiceImpl.VALUE).toString()));
- pointValue.setDataTime(DateUtils.parse(list.get(i).get(InfluxDBServiceImpl.TIME).toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ pointValue.setV(Double.parseDouble(list.get(i).get(InfluxDBServiceImpl.VALUE).toString()));
+ pointValue.setT(DateUtils.parse(list.get(i).get(InfluxDBServiceImpl.TIME).toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
pointValueList.add(pointValue);
}
return pointValueList;
@@ -104,7 +133,28 @@
pointCollector.setValue(wr);
return true;
} catch (Exception ex) {
+ ex.printStackTrace();
return false;
}
}
+
+ @Override
+ public PageResult<ApiPointDTO> getPageByNo(String pointNo) {
+ DaPointDTO daPointDTO = daPointService.getSimpleInfoByNo(pointNo);
+ DaMathPointDTO daMathPointDTO = daMathPointService.getByPoint(daPointDTO.getId());
+ String[] pointNos = daMathPointDTO.getExpression().split("[-+]+");
+ HashMap<Integer, String> map = new HashMap<>();
+ IntStream.range(0, pointNos.length).forEach(i -> map.put(i, pointNos[i]));
+ List<String> pointNosL = new ArrayList<>();
+ for (String value : map.values()) {
+ pointNosL.add(value);
+ }
+ PageResult<ApiPointDTO> pageResult = daPointService.getPointPage(map);
+ Map<String, Object> CurrentValueMap = pointCollector.getCurrentValue(pointNosL);
+ pageResult.getList().stream().map(item -> {
+ item.setCurrentValue(CurrentValueMap.get(item.getPointNo()));
+ return item;
+ }).collect(Collectors.toList());
+ return pageResult;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3