From 7f0bcd00c556889ba890e5e68c681f1b5d4267e1 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 19 十二月 2024 18:07:20 +0800
Subject: [PATCH] 预测项状态添加模型结果异常
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java | 95 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 83 insertions(+), 12 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 c765aec..d57f185 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,11 +1,22 @@
package com.iailab.module.data.api.point;
+import com.iailab.framework.common.util.date.DateUtils;
+import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.module.data.api.point.dto.*;
+import com.iailab.module.data.influxdb.pojo.InfluxPointValuePOJO;
+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.DaPointDTO;
+import com.iailab.module.data.point.dto.DaPointWriteValueDTO;
+import com.iailab.module.data.point.service.DaPointService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @author PanZhibao
@@ -16,33 +27,93 @@
@Validated
public class DataPointApiImpl implements DataPointApi {
- @Override
- public ApiPointDTO getInfoByNo(String pointNo) {
- return null;
- }
+ @Autowired
+ private DaPointService daPointService;
+
+ @Autowired
+ private PointCollector pointCollector;
+
+ @Autowired
+ private InfluxDBService influxDBService;
@Override
public ApiPointDTO getInfoById(String pointId) {
- return null;
+ return daPointService.getSimpleInfoById(pointId);
+ }
+
+ @Override
+ public List<ApiPointDTO> getInfoByIds(List<String> pointIds) {
+ List<ApiPointDTO> result = new ArrayList<>(pointIds.size());
+ for (String pointId : pointIds) {
+ result.add(daPointService.getSimpleInfoById(pointId));
+ }
+ return result;
+ }
+
+ @Override
+ public ApiPointDTO getInfoByNo(String pointNo) {
+ return ConvertUtils.sourceToTarget(daPointService.getSimpleInfoByNo(pointNo), ApiPointDTO.class);
}
@Override
public Map<String, Object> queryPointsRealValue(List<String> pointNos) {
- return null;
+ return pointCollector.getCurrentValue(pointNos);
}
@Override
public Map<String, List<Map<String, Object>>> queryPointsHistoryValue(ApiPointsValueQueryDTO queryDto) {
- return null;
+ Map<String, List<Map<String, Object>>> data = new HashMap<>();
+ if (queryDto.getStart() == null) {
+ queryDto.setStart(new Date());
+ }
+ if (queryDto.getEnd() == null) {
+ queryDto.setEnd(new Date());
+ }
+ Map<String, Object> params = new HashMap<>(1);
+ params.put("pointNos", queryDto.getPointNos());
+ List<DaPointDTO> pointList = daPointService.list(params);
+ if (CollectionUtils.isEmpty(pointList)) {
+ return data;
+ }
+ List<InfluxPointValuePOJO> influxParams = pointList.stream().map(item -> {
+ InfluxPointValuePOJO pojo = new InfluxPointValuePOJO();
+ pojo.setPoint(item.getPointNo());
+ pojo.setType(item.getDataType());
+ return pojo;
+ }).collect(Collectors.toList());
+ data = influxDBService.queryPointsValues(influxParams, queryDto.getStart(), queryDto.getEnd());
+ return data;
}
@Override
public List<ApiPointValueDTO> queryPointHistoryValue(ApiPointValueQueryDTO queryDto) {
- return null;
+ DaPointDTO daPointDTO = daPointService.getByNo(queryDto.getPointNo());
+ InfluxPointValuePOJO pojo = new InfluxPointValuePOJO();
+ pojo.setPoint(queryDto.getPointNo());
+ pojo.setType(daPointDTO.getDataType());
+ Date startTime = queryDto.getStart();
+ Date endTime = queryDto.getEnd();
+ 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.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;
}
@Override
- public Boolean writePointRealValue(ApiPointValueWriteDTO queryDto) {
- return null;
+ public Boolean writePointRealValue(ApiPointValueWriteDTO writeDTO) {
+ try {
+ DaPointWriteValueDTO wr = new DaPointWriteValueDTO();
+ wr.setPointNo(writeDTO.getPointNo());
+ wr.setPointValue(writeDTO.getValue());
+ pointCollector.setValue(wr);
+ return true;
+ } catch (Exception ex) {
+ return false;
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3