From 2bdbda70e87188f4a398f5cf03e997fcaec150f4 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期三, 07 五月 2025 15:04:17 +0800
Subject: [PATCH] 根据outId查询预测数据
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/DataService.java | 2
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java | 4 +-
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PreDataViewSimpleDTO.java | 44 ++++++++++++++++++++++
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java | 27 +++++++------
4 files changed, 62 insertions(+), 15 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 de9bd25..94cbcff 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
@@ -42,8 +42,8 @@
@PostMapping("/predict-data/chartsByOutIds")
@Operation(summary = "根据outId查询预测数据")
- public CommonResult<List<PreDataViewDTO>> getPreDataByOutIds(@RequestBody PreDataBarLineReqVO reqVO) {
- List<PreDataViewDTO> respVO = dataService.getPreDataByOutIds(reqVO);
+ public CommonResult<List<PreDataViewSimpleDTO>> getPreDataByOutIds(@RequestBody PreDataBarLineReqVO reqVO) {
+ List<PreDataViewSimpleDTO> respVO = dataService.getPreDataByOutIds(reqVO);
return CommonResult.success(respVO);
}
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PreDataViewSimpleDTO.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PreDataViewSimpleDTO.java
new file mode 100644
index 0000000..d0c4f20
--- /dev/null
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PreDataViewSimpleDTO.java
@@ -0,0 +1,44 @@
+package com.iailab.module.ansteel.api.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author DongYukun
+ * @Description
+ * @createTime 2025年05月07日
+ */
+@Schema(description = "RPC 模型 - 预测数据 DTO")
+@Data
+public class PreDataViewSimpleDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "预测项ID")
+ private String itemId;
+
+ @Schema(description = "预测项名称")
+ private String itemName;
+
+ @Schema(description = "输出ID")
+ private String outId;
+
+ @Schema(description = "预测时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date predictTime;
+
+ @Schema(description = "当时预测值")
+ private List<Object[]> curData;
+
+ @Schema(description = "真实值")
+ private List<Object[]> realData;
+
+ @Schema(description = "历史预测值")
+ private List<Object[]> preData;
+
+}
\ No newline at end of file
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 3c2caeb..156687f 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
@@ -37,5 +37,5 @@
List<Object[]> getHistoryValue(Map<String, Object> params);
- List<PreDataViewDTO> getPreDataByOutIds(PreDataBarLineReqVO reqVO);
+ List<PreDataViewSimpleDTO> 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 f97d907..9be30ca 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
@@ -400,14 +400,14 @@
calendar.set(Calendar.MILLISECOND, 0);
if (!params.containsKey("endTime") || StringUtils.isBlank(params.get("endTime").toString())) {
endTime = calendar.getTime();
- }else {
- endTime = DateUtils.parse(params.get("endTime").toString(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+ } else {
+ endTime = DateUtils.parse(params.get("endTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
}
if (!params.containsKey("startTime") || StringUtils.isBlank(params.get("startTime").toString())) {
calendar.add(Calendar.DAY_OF_YEAR, -1);
startTime = calendar.getTime();
- }else {
- startTime = DateUtils.parse(params.get("startTime").toString(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+ } else {
+ startTime = DateUtils.parse(params.get("startTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
}
switch (ProcessConfDataTypeEnum.getEumByCode(dataType)) {
@@ -445,16 +445,19 @@
}
@Override
- public List<PreDataViewDTO> getPreDataByOutIds(PreDataBarLineReqVO reqVO) {
+ public List<PreDataViewSimpleDTO> getPreDataByOutIds(PreDataBarLineReqVO reqVO) {
PreDataBarLineRespVO preDataBarLineRespVO = mcsApi.getPreDataCharts(reqVO);
- List<PreDataViewDTO> preDataViewDTOList = new ArrayList<>();
+ List<PreDataViewSimpleDTO> preDataViewSimpleDTOList = 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);
+ PreDataViewSimpleDTO preDataViewSimpleDTO = new PreDataViewSimpleDTO();
+ preDataViewSimpleDTO.setItemName(item.getItemName());
+ preDataViewSimpleDTO.setItemId(item.getItemId());
+ preDataViewSimpleDTO.setOutId(item.getOutId());
+ preDataViewSimpleDTO.setPredictTime(preDataBarLineRespVO.getPredictTime());
+ preDataViewSimpleDTO.setCurData(item.getCurData());
+ preDataViewSimpleDTO.setRealData(item.getRealData());
+ preDataViewSimpleDTOList.add(preDataViewSimpleDTO);
});
- return preDataViewDTOList;
+ return preDataViewSimpleDTOList;
}
}
\ No newline at end of file
--
Gitblit v1.9.3