From 68f80a7451a126335153ec00bb6cb520a5ae1f8d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 13 Nov 2023 17:02:45 +0800
Subject: [PATCH] 定时任务逻辑修改
---
src/main/java/com/dji/sample/wayline/model/param/CreateJobParam.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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 f8fe651..9b723b7 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,10 +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
@@ -23,15 +26,11 @@
@NotBlank
private String dockSn;
- @Range(max = 0)
@NotNull
- private Integer waylineType;
+ private WaylineTemplateTypeEnum waylineType;
- @Range(max = 1)
@NotNull
- private Integer taskType;
-
- private Long executeTime;
+ private WaylineTaskTypeEnum taskType;
@Range(min = 20, max = 500)
@NotNull
@@ -40,4 +39,23 @@
@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;
+
+ private Integer repFreType;
+
+ private Integer repFreVal;
+
+ private Integer repRuleType;
+
+ private List<Integer> repRuleVal;
+
+ private List<List<Long>> executeStartTimeArr;
}
--
Gitblit v1.9.3