From daefffe1c2ef6fe9f1a49bca60623c327f39d7e6 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期一, 31 三月 2025 22:31:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/db/增量SQL/2025.sql | 4 +++-
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/StScheduleSchemeDTO.java | 5 +++++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/entity/StScheduleSchemeEntity.java | 5 +++++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StScheduleSchemeRespVO.java | 3 +++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StScheduleSchemeSaveReqVO.java | 4 +++-
5 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/StScheduleSchemeDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/StScheduleSchemeDTO.java
index c46479e..b2e6b56 100644
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/StScheduleSchemeDTO.java
+++ b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/StScheduleSchemeDTO.java
@@ -83,4 +83,9 @@
* 调整速率
*/
private Integer adjustRate;
+
+ /**
+ * 预警调整速率
+ */
+ private Integer warningAdjustRate;
}
diff --git "a/iailab-module-model/iailab-module-model-biz/db/\345\242\236\351\207\217SQL/2025.sql" "b/iailab-module-model/iailab-module-model-biz/db/\345\242\236\351\207\217SQL/2025.sql"
index b1c85d8..3306a7f 100644
--- "a/iailab-module-model/iailab-module-model-biz/db/\345\242\236\351\207\217SQL/2025.sql"
+++ "b/iailab-module-model/iailab-module-model-biz/db/\345\242\236\351\207\217SQL/2025.sql"
@@ -1 +1,3 @@
-alter table t_st_schedule_scheme add column `adjust_rate` int DEFAULT NULL COMMENT '调整速率';
\ No newline at end of file
+alter table t_st_schedule_scheme add column `adjust_rate` int DEFAULT NULL COMMENT '调整速率';
+
+alter table t_st_schedule_scheme add column `warning_adjust_rate` int DEFAULT NULL COMMENT '预警调整速率';
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/entity/StScheduleSchemeEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/entity/StScheduleSchemeEntity.java
index aa80cba..fe6f4ec 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/entity/StScheduleSchemeEntity.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/entity/StScheduleSchemeEntity.java
@@ -93,4 +93,9 @@
* 调整速率
*/
private Integer adjustRate;
+
+ /**
+ * 预警调整速率
+ */
+ private Integer warningAdjustRate;
}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StScheduleSchemeRespVO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StScheduleSchemeRespVO.java
index 004d169..92cb921 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StScheduleSchemeRespVO.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StScheduleSchemeRespVO.java
@@ -60,4 +60,7 @@
@Schema(description = "调整速率")
private Integer adjustRate;
+
+ @Schema(description = "预警调整速率")
+ private Integer warningAdjustRate;
}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StScheduleSchemeSaveReqVO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StScheduleSchemeSaveReqVO.java
index d0ecb8b..637b28f 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StScheduleSchemeSaveReqVO.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StScheduleSchemeSaveReqVO.java
@@ -4,7 +4,6 @@
import lombok.Data;
import javax.validation.constraints.NotNull;
-import java.util.Date;
/**
* @author PanZhibao
@@ -55,4 +54,7 @@
@Schema(description = "调整速率")
private Integer adjustRate;
+
+ @Schema(description = "预警调整速率")
+ private Integer warningAdjustRate;
}
\ No newline at end of file
--
Gitblit v1.9.3