From ee1a24782c037d04739e712478252a5b3f34b3cb Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期三, 07 五月 2025 14:44:29 +0800
Subject: [PATCH] 根据outId查询预测数据
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/DataService.java | 3 +++
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java | 18 ++++++++----------
ansteel-biz/src/main/java/com/iailab/module/ansteel/gas/entity/GasPredConfEntity.java | 4 ++++
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java | 14 ++++++++++++++
4 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java
index 8d763d2..de9bd25 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java
@@ -1,24 +1,15 @@
package com.iailab.module.ansteel.api.controller.admin;
import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.module.ansteel.api.dto.*;
import com.iailab.module.ansteel.api.service.DataService;
-import com.iailab.module.ansteel.coking.dto.CokingTraceChartDTO;
-import com.iailab.module.ansteel.coking.dto.CokingTraceDataDTO;
-import com.iailab.module.ansteel.common.enums.ProcessConfDataTypeEnum;
-import com.iailab.module.data.api.ind.dto.ApiIndItemQueryDTO;
-import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
-import com.iailab.module.data.api.point.dto.ApiPointValueDTO;
-import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
+import com.iailab.module.model.api.mcs.dto.PreDataBarLineReqVO;
import com.iailab.module.model.api.mcs.dto.PreDataSingleChartReqVO;
import com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestReqVO;
import io.swagger.v3.oas.annotations.Operation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
import java.util.*;
import static com.iailab.framework.common.pojo.CommonResult.success;
@@ -49,6 +40,13 @@
return CommonResult.success(respVO);
}
+ @PostMapping("/predict-data/chartsByOutIds")
+ @Operation(summary = "根据outId查询预测数据")
+ public CommonResult<List<PreDataViewDTO>> getPreDataByOutIds(@RequestBody PreDataBarLineReqVO reqVO) {
+ List<PreDataViewDTO> respVO = dataService.getPreDataByOutIds(reqVO);
+ return CommonResult.success(respVO);
+ }
+
@PostMapping("/plan-data/charts")
@Operation(summary = "计划数据图表")
public CommonResult<Map<String, Object>> getPlanDataChart(@RequestBody PlanDataChartReqVO reqVO) {
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/DataService.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/DataService.java
index e106fcb..3c2caeb 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/DataService.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/DataService.java
@@ -1,6 +1,7 @@
package com.iailab.module.ansteel.api.service;
import com.iailab.module.ansteel.api.dto.*;
+import com.iailab.module.model.api.mcs.dto.PreDataBarLineReqVO;
import com.iailab.module.model.api.mcs.dto.PreDataSingleChartReqVO;
import com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestReqVO;
@@ -35,4 +36,6 @@
List<PowerControlDetDTO> getPowerControlDetList(Map<String, Object> params);
List<Object[]> getHistoryValue(Map<String, Object> params);
+
+ List<PreDataViewDTO> getPreDataByOutIds(PreDataBarLineReqVO reqVO);
}
\ No newline at end of file
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
index 03d7f3a..f97d907 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
@@ -443,4 +443,18 @@
}
return dataList;
}
+
+ @Override
+ public List<PreDataViewDTO> getPreDataByOutIds(PreDataBarLineReqVO reqVO) {
+ PreDataBarLineRespVO preDataBarLineRespVO = mcsApi.getPreDataCharts(reqVO);
+ List<PreDataViewDTO> preDataViewDTOList = new ArrayList<>();
+ preDataBarLineRespVO.getDataViewList().forEach(item -> {
+ PreDataViewDTO dataViewDTO = new PreDataViewDTO();
+ dataViewDTO.setCurData(item.getCurData());
+ dataViewDTO.setRealData(item.getRealData());
+ dataViewDTO.setPredictTime(item.getPredictTime());
+ preDataViewDTOList.add(dataViewDTO);
+ });
+ return preDataViewDTOList;
+ }
}
\ No newline at end of file
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/gas/entity/GasPredConfEntity.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/gas/entity/GasPredConfEntity.java
index 6dc7a1a..b33a305 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/gas/entity/GasPredConfEntity.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/gas/entity/GasPredConfEntity.java
@@ -42,6 +42,10 @@
*/
private String itemName;
/**
+ * 预测项输出id
+ */
+ private String outId;
+ /**
* 预测项输出key
*/
private String outKey;
--
Gitblit v1.9.3