From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightTaskParam.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightTaskParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightTaskParam.java
index 1fd7a35..45df555 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightTaskParam.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightTaskParam.java
@@ -3,8 +3,8 @@
import lombok.Data;
import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
import java.util.List;
/**
@@ -13,35 +13,44 @@
*/
@Data
public class LightTaskParam {
+
+ public static final int REQUEST_ORDER_LENGTH = 7;
/**
* 浠诲姟鍚嶇О
*/
- @NotEmpty(message = "浠诲姟鍚嶇О涓嶈兘涓虹┖")
+ @NotBlank(message = "浠诲姟鍚嶇О涓嶈兘涓虹┖")
private String taskName;
/**
* 鏄熸湡鍑狅紝浣嶈繍绠椾繚瀛橈紝1浠ｈ〃鏄熸湡涓�锛�2鏄熸湡浜岋紝4鏄熸湡涓夛紝8鏄熸湡鍥涳紝16鏄熸湡浜旓紝32鏄熸湡鍏紝64鏄熸湡鏃�
*/
- @NotNull(message = "鏄熸湡涓嶈兘涓虹┖")
- private Integer week;
+ @NotEmpty(message = "鏄熸湡涓嶈兘涓虹┖")
+ private List<Integer> weekList;
/**
* 寮�鐏懡浠�
*/
- @Length(min = 6, max = 6, message = "寮�鐏懡浠ら暱搴﹂敊璇�")
+ @Length(min = REQUEST_ORDER_LENGTH, max = REQUEST_ORDER_LENGTH, message = "寮�鐏懡浠ら暱搴﹂敊璇�")
private String openOrder;
/**
* 鍏抽棴鐏懡浠�
*/
- @Length(min = 6, max = 6, message = "鍏崇伅鍛戒护闀垮害閿欒")
+ @Length(min = REQUEST_ORDER_LENGTH, max = REQUEST_ORDER_LENGTH, message = "鍏崇伅鍛戒护闀垮害閿欒")
private String closeOrder;
/**
* 鐏帶鍛戒护
*/
private String controlOrder;
+ /**
+ * 鐏ご,榛樿鍏ㄤ寒
+ */
+ private String lightAddress;
+
private List<Long> poleIdList;
+
+ private Long taskId;
}
--
Gitblit v1.9.3