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); } 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; } 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); } ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
@@ -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; } }