From 2db1aa88e8ab53096a936163d686b90d8e056a99 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 21 Aug 2024 23:18:33 +0800
Subject: [PATCH] 国土对接返回信息加密
---
src/main/java/com/dji/sample/droneairport/controller/RegistController.java | 13 ++++++++-----
1 files changed, 8 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 7bec1ad..8d4c472 100644
--- a/src/main/java/com/dji/sample/droneairport/controller/RegistController.java
+++ b/src/main/java/com/dji/sample/droneairport/controller/RegistController.java
@@ -18,6 +18,7 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.Map;
+import java.util.UUID;
import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -52,7 +53,7 @@
public ResponseResult droneStatus(@RequestParam String deviceid, HttpServletResponse response) throws Exception {
Map<String, String> info=registService.getDroneState(deviceid);
response.setHeader("x-lc-secret", info.get("serect"));
- return ResponseResult.success(info.get("text"));
+ return ResponseResult.success(200,"获取无人机机场状态成功！",info.get("text"),UUID.randomUUID().toString());
}
@PostMapping("/AddTask")
@@ -62,7 +63,7 @@
String creator = customClaim.getUsername();
Map<String, String> info = registService.AddTask(body, headerValue, creator);
response.setHeader("x-lc-secret", info.get("serect"));
- return ResponseResult.success(200, "无人机机场任务添加成功", info.get("traceId"), info.get("jobId"));
+ return ResponseResult.success(200, "无人机机场任务添加成功", info.get("taskid"),info.get("traceId"));
}
@PostMapping("/updateTask")
@@ -72,12 +73,14 @@
String creator = customClaim.getUsername();
Map<String, String> info = registService.updateTask(body, headerValue, creator);
response.setHeader("x-lc-secret", info.get("serect"));
- return ResponseResult.success(200, "无人机机场任务更新成功", info.get("traceId"), info.get("jobId"));
+ return ResponseResult.success(200, "无人机机场任务更新成功",info.get("taskid"), info.get("traceId"));
}
@GetMapping("/cancelTask")
- public ResponseResult cancelTask(@RequestParam String taskid) {
- return ResponseResult.success(registService.cancelTask(taskid));
+ public ResponseResult cancelTask(@RequestParam String taskid,HttpServletResponse response) throws InvalidCipherTextException, IOException {
+ Map<String, String> info=registService.cancelTask(taskid);
+ response.setHeader("x-lc-secret", info.get("serect"));
+ return ResponseResult.success(200,"无人机任务取消成功",info.get("taskid"), UUID.randomUUID().toString());
}
@PostMapping("/queryTaskStatus")
public ResponseResult queryTaskStatus(HttpServletRequest request, @RequestParam String taskid) throws Exception {
--
Gitblit v1.9.3