From b4bc05b29aa6d71072efdf39caf1808b4e69eca4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 三月 2025 11:04:11 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/dto/IrrigatePlan.java | 23 ++++-------------------
1 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/dto/IrrigatePlan.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/dto/IrrigatePlan.java
index c24d70d..7327f5b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/dto/IrrigatePlan.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/dto/IrrigatePlan.java
@@ -1,8 +1,6 @@
package com.dy.pipIrrWechat.irrigatePlan.dto;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.*;
import lombok.Data;
import java.util.Date;
@@ -20,11 +18,6 @@
public static final long serialVersionUID = 202502201511001L;
/**
- * 椤圭洰ID
- */
- private Long projectId;
-
- /**
* 璁″垝鍚嶇О
*/
@NotBlank(message = "璁″垝鍚嶇О涓嶈兘涓虹┖")
@@ -34,22 +27,14 @@
* 璁″垝鍚姩妯″紡锛�1-鎵嬪伐鍚姩锛�2-鑷姩鍚姩
*/
@NotNull(message = "璁″垝鍚姩妯″紡涓嶈兘涓虹┖")
+ @Min(value = 1, message = "璁″垝鍚姩妯″紡涓嶈兘灏忎簬1")
+ @Max(value = 2, message = "璁″垝鍚姩妯″紡涓嶈兘澶т簬2")
private Byte startupMode;
/**
* 璁″垝鍚姩鏃堕棿
*/
private Date planStartTime;
-
- /**
- * 璁″垝鍋滄鏃堕棿
- */
- private Date planStopTime;
-
- /**
- * 璁″垝鎸佺画鏃堕棿
- */
- private Integer duration;
/**
* 鎿嶄綔浜篒D
@@ -60,7 +45,7 @@
/**
* 鐏屾簤娆″簭
*/
- @NotEmpty(message = "宸℃杞ㄨ抗涓嶈兘涓虹┖")
+ @NotEmpty(message = "鐏屾簤娆″簭涓嶈兘涓虹┖")
private List<IrrigateSchedule> schedules;
}
--
Gitblit v1.8.0