From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 06 五月 2025 17:25:56 +0800 Subject: [PATCH] 1、实现万功能token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并相应修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。 --- pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/dto/IrrigatePlan.java | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 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..c7fa0f7 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; @@ -34,22 +32,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 +50,7 @@ /** * 鐏屾簤娆″簭 */ - @NotEmpty(message = "宸℃杞ㄨ抗涓嶈兘涓虹┖") + @NotEmpty(message = "鐏屾簤娆″簭涓嶈兘涓虹┖") private List<IrrigateSchedule> schedules; } -- Gitblit v1.8.0