From 2927bb498574a0e30bcbb3a9f7ee9468636cf0d8 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 15 Aug 2024 11:31:33 +0800
Subject: [PATCH] 优化无人机状态更新，更新照片角度附属信息
---
src/main/java/com/dji/sample/droneairport/controller/RegistController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/dji/sample/droneairport/controller/RegistController.java b/src/main/java/com/dji/sample/droneairport/controller/RegistController.java
index 4130470..f969124 100644
--- a/src/main/java/com/dji/sample/droneairport/controller/RegistController.java
+++ b/src/main/java/com/dji/sample/droneairport/controller/RegistController.java
@@ -2,7 +2,7 @@
import com.dji.sample.common.model.CustomClaim;
import com.dji.sample.common.model.ResponseResult;
-import com.dji.sample.droneairport.dao.DeviceExpanSionDao;
+import com.dji.sample.droneairport.dao.DeviceExpanSionMapper;
import com.dji.sample.droneairport.model.param.ReturnTaskParam;
import com.dji.sample.droneairport.service.RegistService;
import com.dji.sample.manage.service.impl.DeviceRedisServiceImpl;
@@ -10,6 +10,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -19,7 +20,7 @@
@Autowired
private RegistService registService;
@Autowired
- private DeviceExpanSionDao expanSionDao;
+ private DeviceExpanSionMapper expanSionDao;
@Autowired
private DeviceRedisServiceImpl deviceRedisService;
@@ -41,7 +42,7 @@
}
@GetMapping("/getDroneStatus/{deviceid}")
- public ResponseResult droneStatus(@PathVariable(name = "deviceid") String deviceid, HttpServletRequest request) throws Exception {
+ public ResponseResult droneStatus(@PathVariable(name = "deviceid") String deviceid, HttpServletResponse response) throws Exception {
return ResponseResult.success(registService.getDroneState(deviceid));
}
@@ -51,7 +52,7 @@
CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
String creator = customClaim.getUsername();
ReturnTaskParam param = registService.AddTask(body, headerValue, creator);
- return ResponseResult.success(200, "无人机机场任务添加成功", param.getTraceId(), param.getWaylineId());
+ return ResponseResult.success(200, "无人机机场任务添加成功", param.getTraceId(), param.getJobId());
}
@GetMapping("/cancelTask/{taskId}")
@@ -65,7 +66,7 @@
CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
String creator = customClaim.getUsername();
ReturnTaskParam param = registService.updateTask(body, headerValue, creator);
- return ResponseResult.success(200, "无人机机场任务添加成功", param.getTraceId(), param.getWaylineId());
+ return ResponseResult.success(200, "无人机机场任务添加成功", param.getTraceId(), param.getJobId());
}
@PostMapping("/queryTaskStatus")
public ResponseResult queryTaskStatus(HttpServletRequest request, @RequestParam String taskid) throws Exception {
--
Gitblit v1.9.3