From faedd5d2f0ee850464f0507da93c37459bd5e3bb Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 26 Sep 2023 16:30:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/main/java/com/dji/sample/wayline/model/param/CreateJobParam.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/model/param/CreateJobParam.java b/src/main/java/com/dji/sample/wayline/model/param/CreateJobParam.java
index a186838..558a9d2 100644
--- a/src/main/java/com/dji/sample/wayline/model/param/CreateJobParam.java
+++ b/src/main/java/com/dji/sample/wayline/model/param/CreateJobParam.java
@@ -1,6 +1,13 @@
package com.dji.sample.wayline.model.param;
+import com.dji.sample.wayline.model.enums.WaylineTaskTypeEnum;
+import com.dji.sample.wayline.model.enums.WaylineTemplateTypeEnum;
import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
/**
* @author sean
@@ -10,13 +17,35 @@
@Data
public class CreateJobParam {
+ @NotBlank
private String name;
+ @NotBlank
private String fileId;
+ @NotBlank
private String dockSn;
- private String type;
+ @NotNull
+ private WaylineTemplateTypeEnum waylineType;
- private boolean immediate;
+ @NotNull
+ private WaylineTaskTypeEnum taskType;
+
+ @Range(min = 20, max = 500)
+ @NotNull
+ private Integer rthAltitude;
+
+ @NotNull
+ @Range(max = 2)
+ private Integer outOfControlAction;
+
+ @Range(min = 50, max = 90)
+ private Integer minBatteryCapacity;
+
+ private Integer minStorageCapacity;
+
+ private List<Long> taskDays;
+
+ private List<List<Long>> taskPeriods;
}
--
Gitblit v1.9.3