From 3058865fa4dfa634a92b4ebd826d8b1264dc90a3 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期三, 05 三月 2025 15:04:41 +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 |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 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 07a1d40..48602c3 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;
 
@@ -90,6 +93,12 @@
     @Schema(description = "预测累计值")
     private BigDecimal preCumulant;
 
+    @Schema(description = "调整值")
+    private BigDecimal adjValue;
+
+    @Schema(description = "调整值")
+    private BigDecimal[] adjValueArr;
+
     @Schema(description = "属性")
     private Map<String, Object> prop;
 
@@ -105,9 +114,21 @@
     @Schema(description = "当时预测值")
     private List<Object[]> curData;
 
-    @Schema(description = "调整值")
+    @Schema(description = "调整预测值")
     private List<Object[]> adjData;
 
     @Schema(description = "预警信息")
-    private List<AlarmMessageRespDTO> alarmeList;
+    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;
 }
\ No newline at end of file

--
Gitblit v1.9.3