From 800cd06bd490444adc45e1d1e5d31ddba9ed9659 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 07 Aug 2024 17:14:58 +0800
Subject: [PATCH] 完成机场设备授权和机场无人机的状态获取
---
src/main/java/com/dji/sample/droneairport/controller/RegistController.java | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 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 5d9640f..ef23d62 100644
--- a/src/main/java/com/dji/sample/droneairport/controller/RegistController.java
+++ b/src/main/java/com/dji/sample/droneairport/controller/RegistController.java
@@ -1,41 +1,44 @@
package com.dji.sample.droneairport.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dji.sample.common.model.ResponseResult;
-import com.dji.sample.droneairport.model.param.AddDeviceParam;
-import com.dji.sample.droneairport.model.param.RegistParam;
+import com.dji.sample.droneairport.dao.DeviceExpanSionDao;
+import com.dji.sample.droneairport.model.Entity.DeviceExpanSionEntity;
+import com.dji.sample.droneairport.model.dto.AddDeviceDto;
import com.dji.sample.droneairport.service.RegistService;
+import com.dji.sample.manage.service.impl.DeviceRedisServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
@RequestMapping("/droneAirport")
@RestController
public class RegistController {
@Autowired
private RegistService registService;
+ @Autowired
+ private DeviceExpanSionDao expanSionDao;
- @PostMapping("/RegistService")
- public ResponseResult resgitePort(@RequestBody RegistParam param) {
- return ResponseResult.success(registService.registPort(param));
- }
+ @Autowired
+ private DeviceRedisServiceImpl deviceRedisService;
- @PostMapping("/addDevice")
- public ResponseResult registeDrone(@RequestBody AddDeviceParam param) {
- param.setBrand("大疆");
- param.setDeviceid("1581F6QAD241500BDZ3J");
- param.setModel("M3D");
- param.setHeight(15);
- param.setLatitude(25.8917271933111);
- param.setLongitude(116.02094292569765);
- param.setRadius(7000);
- param.setRegioncode("360781");
- return ResponseResult.success(registService.addDrone(param));
+ // @PostMapping("/RegistService")
+// 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("/test")
- public ResponseResult test(@RequestBody AddDeviceParam param) {
- return ResponseResult.success(param);
+ @PostMapping("/addDevice/{workspace_id}")
+ public ResponseResult registeDrone(@PathVariable(name = "workspace_id") String workspaceId) {
+ return ResponseResult.success(registService.addDrone(workspaceId));
}
- @GetMapping("/getDroneStatus")
- public ResponseResult droneStatus(@RequestParam String deviceid){
+ @GetMapping("/getDroneStatus/{deviceid}")
+ public ResponseResult droneStatus(@PathVariable (name = "deviceid") String deviceid , HttpServletRequest request) throws Exception {
return ResponseResult.success(registService.getDroneState(deviceid));
}
}
--
Gitblit v1.9.3