From 55a4112533c958492078a5a94c90667e6cf5969c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 13 四月 2024 10:39:22 +0800
Subject: [PATCH] 修改获取附近车辆bug 修改默认所有相机启动引导队列
---
ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java | 103 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 85 insertions(+), 18 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java b/ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java
index 076f54f..579a9ed 100644
--- a/ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java
@@ -1,30 +1,19 @@
package com.ruoyi.device.uav.controller;
-import com.dtflys.forest.exceptions.ForestNetworkException;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.pagehelper.util.StringUtil;
+import com.alibaba.fastjson.JSON;
import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.device.uav.service.UavService;
-import com.ruoyi.utils.forest.UavClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.binary.StringUtils;
-import org.jetbrains.annotations.Nullable;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.annotation.PostConstruct;
-import javax.crypto.Cipher;
-import javax.crypto.spec.SecretKeySpec;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.util.*;
-import org.apache.commons.codec.binary.Base64;
import static org.springframework.http.HttpMethod.*;
@@ -43,22 +32,28 @@
@Autowired
private UavService uavService;
+ @Value("${uav.enabled}")
+ private Boolean uavEnabled;
+
@PostConstruct
public void created() {
+ if(!uavEnabled){//鏃犱汉鏈哄姞鍏ュ紑鍏�
+ return;
+ }
this.uavService.login();
}
@GetMapping("/")
@ApiOperation("鏃犱汉鏈篻et鎺ュ彛")
- public Object get(@RequestParam String url, @RequestParam String data) {
- return this.uavService.doUavRequest(GET, url, data);
+ public Object get(@RequestParam String url) {
+ return this.uavService.doUavRequest(GET, url, "{}");
}
@PostMapping("/")
@ApiOperation("鏃犱汉鏈簆ost鎺ュ彛")
- public Object post(@RequestBody Map<String,String> param) {
+ public Object post(@RequestBody Map<String, String> param) {
String url = param.get("url");
String data = param.get("data");
return this.uavService.doUavRequest(POST, url, data);
@@ -66,9 +61,81 @@
@DeleteMapping("/")
@ApiOperation("鏃犱汉鏈篸elete鎺ュ彛")
- public Object delete(@RequestParam String url, @RequestParam String data) {
+ public Object delete(@RequestBody Map<String, String> param) {
+ String url = param.get("url");
+ String data = param.get("data");
return this.uavService.doUavRequest(DELETE, url, data);
}
+ @GetMapping("/getToken")
+ @ApiOperation("鏃犱汉鏈篸elete鎺ュ彛")
+ public Object getToken() {
+ return this.uavService.getToken();
+ }
+
+ @PostMapping("/checkPointValid")
+ @ApiOperation("鏃犱汉鏈烘娴嬭埅鐐规湁鏁堟�ф帴鍙�")
+ public Object checkPointValid(@RequestBody Map<String,Map<String,Object>> param) {
+ String url = "wayline/api/v1/waylines/planning/check_point_valid";
+ return this.uavService.checkPointValid(url, param);
+ }
+
+ @PostMapping("/checkLineValid")
+ @ApiOperation("鏃犱汉鏈烘娴嬬嚎璺湁鏁堟�ф帴鍙�")
+ public Object checkLineValid(@RequestBody Map<String,List<Map<String,String>>> param) {
+ String url = "wayline/api/v1/waylines/planning/check_line_valid";
+ return this.uavService.checkLineValid(url, param);
+ }
+
+ @GetMapping("/getWorkspaceId")
+ @ApiOperation("鑾峰彇宸ヤ綔绌洪棿涓婚敭")
+ public AjaxResult getWorkspaceId() {
+ try{
+ String workspaceId = this.uavService.getWorkspaceId();
+ if(workspaceId != null){
+ return AjaxResult.success(workspaceId);
+ }else{
+ return AjaxResult.success("");
+ }
+ }catch(Exception e){
+ e.printStackTrace();
+ return AjaxResult.error();
+ }
+ }
+
+ @PostMapping("/addWaylinesPlanning")
+ @ApiOperation("鏂板鑸嚎")
+ public Object addWaylinesPlanning(@RequestBody Map<String,Object> param) {
+ String url = "wayline/api/v1/waylines/planning";
+ return this.uavService.addWaylinesPlanning(url, param);
+ }
+
+ @PostMapping("/deleteWaylinesPlanning")
+ @ApiOperation("鍒犻櫎鑸嚎")
+ public Object deleteWaylinesPlanning(@RequestBody Map<String,String> param) {
+ String url = "wayline/api/v1/waylines/delete/";
+ return this.uavService.deleteWaylinesPlanning(url, param);
+ }
+
+ @PutMapping("/updateWaylinesPlanning")
+ @ApiOperation("淇敼鑸嚎")
+ public Object updateWaylinesPlanning(@RequestBody Map<String,Object> param) {
+ String url = "wayline/api/v1/waylines/update";
+ return this.uavService.updateWaylinesPlanning(url, param);
+ }
+
+ @PostMapping("/addAlarm")
+ @ApiOperation("鍗曠偣浠诲姟")
+ public Object addAlarm(@RequestBody Map<String,Object> param) {
+ String url = "manage/api/v1/alarms/add";
+ return this.uavService.addAlarm(url, param);
+ }
+
+ @PostMapping("/saveCurrentGroup")
+ @ApiOperation("鍚屾")
+ public Object saveCurrentGroup(@RequestBody Map<String,Object> param) {
+ String url = "wayline/api/v1/waylines/planning/save_current_group";
+ return this.uavService.saveCurrentGroup(url, param);
+ }
}
--
Gitblit v1.9.3