From 3430a3dd889ba51d06cbdb77014aa63d0a070e48 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 16 Aug 2024 16:38:08 +0800
Subject: [PATCH] 优化国土对接接口
---
src/main/java/com/dji/sample/droneairport/controller/RegistController.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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..f4dbad9 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;
@@ -28,12 +29,12 @@
// public ResponseResult resgitePort(@RequestBody RegistDto param) {
// return ResponseResult.success(registService.registPort(param));
// }
- @PostMapping("/authorization")
- public ResponseResult checkDeviceOnline(@RequestBody String body, HttpServletRequest request) throws Exception {
- String headerValue = request.getHeader("x-lc-secret");
- return registService.authorization(body, headerValue);
-
- }
+// @PostMapping("/authorization")
+// public ResponseResult checkDeviceOnline(@RequestBody String body, HttpServletRequest request) throws Exception {
+// String headerValue = request.getHeader("x-lc-secret");
+// return registService.authorization(body, headerValue);
+//
+// }
@PostMapping("/addDevice/{workspace_id}")
public ResponseResult registeDrone(@PathVariable(name = "workspace_id") String workspaceId) {
@@ -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,15 +66,18 @@
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 {
- return ResponseResult.success(registService.queryTaskStatus(taskid));
+ return registService.queryTaskStatus(taskid);
}
@GetMapping("/getResult/{taskId}")
public ResponseResult getResult(@PathVariable(name = "taskId") String taskId) {
- return ResponseResult.success(registService.findDbFilesByTaskId(taskId));
+ return ResponseResult.success(200, "无人机成果获取成功！",registService.findDbFilesByTaskId(taskId));
}
-
+ @PostMapping("/test")
+ public ResponseResult test(@RequestBody String param) {
+ return ResponseResult.success(param);
+ }
}
--
Gitblit v1.9.3