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/control/controller/DockController.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/dji/sample/control/controller/DockController.java b/src/main/java/com/dji/sample/control/controller/DockController.java
index 8b05ff8..53d07f5 100644
--- a/src/main/java/com/dji/sample/control/controller/DockController.java
+++ b/src/main/java/com/dji/sample/control/controller/DockController.java
@@ -1,13 +1,14 @@
package com.dji.sample.control.controller;
import com.dji.sample.common.model.ResponseResult;
+import com.dji.sample.control.model.enums.DroneAuthorityEnum;
+import com.dji.sample.control.model.param.*;
import com.dji.sample.control.service.IControlService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
/**
* @author sean
@@ -24,7 +25,41 @@
@PostMapping("/{sn}/jobs/{service_identifier}")
public ResponseResult createControlJob(@PathVariable String sn,
- @PathVariable("service_identifier") String serviceIdentifier) {
- return controlService.controlDock(sn, serviceIdentifier);
+ @PathVariable("service_identifier") String serviceIdentifier,
+ @RequestBody(required = false) RemoteDebugParam param) {
+ return controlService.controlDockDebug(sn, serviceIdentifier, param);
}
+
+ @PostMapping("/{sn}/jobs/fly-to-point")
+ public ResponseResult flyToPoint(@PathVariable String sn, @Valid @RequestBody FlyToPointParam param) {
+ return controlService.flyToPoint(sn, param);
+ }
+
+ @DeleteMapping("/{sn}/jobs/fly-to-point")
+ public ResponseResult flyToPointStop(@PathVariable String sn) {
+ return controlService.flyToPointStop(sn);
+ }
+
+ @PostMapping("/{sn}/jobs/takeoff-to-point")
+ public ResponseResult takeoffToPoint(@PathVariable String sn, @Valid @RequestBody TakeoffToPointParam param) {
+ return controlService.takeoffToPoint(sn, param);
+ }
+
+ @PostMapping("/{sn}/authority/flight")
+ public ResponseResult seizeFlightAuthority(@PathVariable String sn) {
+ return controlService.seizeAuthority(sn, DroneAuthorityEnum.FLIGHT, null);
+ }
+
+ @PostMapping("/{sn}/authority/payload")
+ public ResponseResult seizePayloadAuthority(@PathVariable String sn, @Valid @RequestBody DronePayloadParam param) {
+ return controlService.seizeAuthority(sn, DroneAuthorityEnum.PAYLOAD, param);
+ }
+
+ @PostMapping("/{sn}/payload/commands")
+ public ResponseResult payloadCommands(@PathVariable String sn, @Valid @RequestBody PayloadCommandsParam param) throws Exception {
+ param.setSn(sn);
+ return controlService.payloadCommands(param);
+ }
+
+
}
--
Gitblit v1.9.3