From c2c38da7834d3571d79a36821eba5243335815d3 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 19 十月 2023 14:06:06 +0800
Subject: [PATCH] RTU
---
ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java | 33 +++++++++++++++------------------
1 files changed, 15 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 07d1185..f6f979e 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,16 @@
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.ruoyi.common.core.controller.BaseController;
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.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.*;
@@ -51,22 +37,33 @@
@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(@RequestParam String url, @RequestParam String data) {
+ 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);
}
@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();
+ }
+
}
--
Gitblit v1.9.3