From 60e664bd398e908206d00eb8e17c3b4796c70df1 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 24 三月 2025 18:42:33 +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 |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 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 96d9e11..40662a2 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
@@ -57,6 +57,9 @@
     @Schema(description = "运行下限")
     private BigDecimal limitL;
 
+    @Schema(description = "当前")
+    private BigDecimal currValue;
+
     @Schema(description = "最大值")
     private BigDecimal maxValue;
 
@@ -84,8 +87,17 @@
     @Schema(description = "预测平均值")
     private BigDecimal preAvg;
 
+    @Schema(description = "预测最后一个值")
+    private BigDecimal preLast;
+
     @Schema(description = "预测累计值")
     private BigDecimal preCumulant;
+
+    @Schema(description = "调整值")
+    private BigDecimal adjValue;
+
+    @Schema(description = "调整值")
+    private BigDecimal[] adjValueArr;
 
     @Schema(description = "属性")
     private Map<String, Object> prop;
@@ -102,6 +114,24 @@
     @Schema(description = "当时预测值")
     private List<Object[]> curData;
 
-    @Schema(description = "调整值")
+    @Schema(description = "调整预测值")
     private List<Object[]> adjData;
+
+    @Schema(description = "预警信息")
+    private List<AlarmMessageRespDTO> alarmList;
+
+    @Schema(description = "预警信息")
+    private String alarmMessage;
+
+    @Schema(description = "展示线类型")
+    private String lineType;
+
+    @Schema(description = "累计真实值")
+    private List<Object[]> cumulantRealData;
+
+    @Schema(description = "累计预测值")
+    private List<Object[]> cumulantPreData;
+
+    @Schema(description = "累计预测值最后一个值")
+    private BigDecimal cumulantPreLast;
 }
\ No newline at end of file

--
Gitblit v1.9.3