From 80e22bcc7af8aebed7443965655542fbe4966708 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 09 四月 2025 15:11:55 +0800
Subject: [PATCH] 灌溉计划删除，所有命令发布都失败依然允许终止

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigatePlan.java |   43 +++++++++++++++++++++++--------------------
 1 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigatePlan.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigatePlan.java
index f0c2679..8b79933 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigatePlan.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigatePlan.java
@@ -8,7 +8,6 @@
 import com.dy.common.po.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import lombok.*;
 
 import java.util.Date;
@@ -30,54 +29,58 @@
     public static final long serialVersionUID = 202502201543001L;
 
     /**
-    * 涓婚敭
-    */
+     * 涓婚敭
+     */
     @JSONField(serializeUsing= ObjectWriterImplToString.class)
     @TableId(type = IdType.INPUT)
     private Long id;
 
     /**
-    * 椤圭洰ID
-    */
+     * 椤圭洰ID
+     */
     private Long projectId;
 
     /**
-    * 璁″垝鍚嶇О
-    */
+     * 璁″垝鍚嶇О
+     */
     @NotBlank(message = "璁″垝鍚嶇О涓嶈兘涓虹┖")
     private String planName;
 
     /**
-    * 璁″垝鍚姩妯″紡;1-鎵嬪姩鍚姩锛�2-鑷姩鍚姩
-    */
-    @NotNull(message = "璁″垝鍚姩妯″紡涓嶈兘涓虹┖")
+     * 璁″垝鍚姩妯″紡;1-鎵嬪姩鍚姩锛�2-鑷姩鍚姩
+     */
     private Byte startupMode;
 
     /**
-    * 鐏屾簤寮�濮嬫椂闂�;绮剧‘鍒板垎
-    */
+     * 鐏屾簤寮�濮嬫椂闂�;绮剧‘鍒板垎
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date planStartTime;
 
     /**
-    * 鐏屾簤缁撴潫鏃堕棿;绮剧‘鍒板垎
-    */
+     * 鐏屾簤缁撴潫鏃堕棿;绮剧‘鍒板垎
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date planStopTime;
 
     /**
-    * 璁″垝鐘舵��;1-鑽夌锛�2-宸插彂甯�
-    */
+     * 鐏屾簤鏃堕暱;鍒嗛挓
+     */
+    private Integer duration;
+
+    /**
+     * 璁″垝鐘舵��;1-鑽夌锛�2-宸插彂甯�
+     */
     private Byte planState;
 
     /**
-    * 鎵ц鐘舵��;1-鏈墽琛岋紝2-鎵ц涓紝3-宸叉殏鍋滐紝4-宸茬粓姝紝5-宸插畬鎴�
-    */
+     * 鎵ц鐘舵��;1-鏈墽琛岋紝2-鎵ц涓紝3-宸叉殏鍋滐紝4-宸茬粓姝紝5-宸插畬鎴�
+     */
     private Byte executingState;
 
     /**
-    * 閫昏緫鍒犻櫎鏍囪瘑;鏈垹闄や负0锛屽凡鍒犻櫎涓哄垹闄ゆ椂闂�
-    */
+     * 閫昏緫鍒犻櫎鏍囪瘑;鏈垹闄や负0锛屽凡鍒犻櫎涓哄垹闄ゆ椂闂�
+     */
     private Long deleted;
 
 }
\ No newline at end of file

--
Gitblit v1.8.0