From 60fa13f76afe72a6f48416de2904d58164859382 Mon Sep 17 00:00:00 2001 From: houzhongjian <houzhongyi@126.com> Date: 星期五, 17 一月 2025 13:51:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreDataViewRespDTO.java | 34 +++++++++++++++++++++++++++++++--- 1 files changed, 31 insertions(+), 3 deletions(-) diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreDataViewRespDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreDataViewRespDTO.java index add373f..7713ffd 100644 --- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreDataViewRespDTO.java +++ b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreDataViewRespDTO.java @@ -1,8 +1,10 @@ package com.iailab.module.model.api.mcs.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; @@ -15,7 +17,8 @@ */ @Schema(description = "RPC 模型 - 预测数据 DTO") @Data -public class PreDataViewRespDTO { +public class PreDataViewRespDTO implements Serializable { + private static final long serialVersionUID = 1L; @Schema(description = "预测项ID") private String itemId; @@ -23,7 +26,17 @@ @Schema(description = "预测项名称") private String itemName; + @Schema(description = "输出ID") + private String outId; + + @Schema(description = "输出结果") + private String resultstr; + + @Schema(description = "输出结果") + private String resultName; + @Schema(description = "预测时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date predictTime; @Schema(description = "量程上限") @@ -39,10 +52,13 @@ private BigDecimal deadLineL; @Schema(description = "运行上限") - private BigDecimal limtH; + private BigDecimal limitH; @Schema(description = "运行下限") - private BigDecimal limtL; + private BigDecimal limitL; + + @Schema(description = "当前") + private BigDecimal currValue; @Schema(description = "最大值") private BigDecimal maxValue; @@ -71,6 +87,9 @@ @Schema(description = "预测平均值") private BigDecimal preAvg; + @Schema(description = "预测最后一个值") + private BigDecimal preLast; + @Schema(description = "预测累计值") private BigDecimal preCumulant; @@ -91,4 +110,13 @@ @Schema(description = "调整值") private List<Object[]> adjData; + + @Schema(description = "预警信息") + private List<AlarmMessageRespDTO> alarmList; + + @Schema(description = "预警信息") + private String alarmMessage; + + @Schema(description = "展示线类型") + private String lineType; } \ No newline at end of file -- Gitblit v1.9.3