From ba1e219d97e123b91657dc424f13a2fdeaa85d21 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Mon, 21 Aug 2023 13:37:01 +0800
Subject: [PATCH] 修改兴趣点列表井号模糊查询
---
ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java | 117 +++++++++++++---------------------------------------------
1 files changed, 27 insertions(+), 90 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 a78bb9e..ea8ad38 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,24 +1,18 @@
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.utils.forest.UavClient;
+import com.ruoyi.device.uav.service.UavService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.binary.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import javax.crypto.Cipher;
-import javax.crypto.spec.SecretKeySpec;
+import javax.annotation.PostConstruct;
import java.util.*;
-import org.apache.commons.codec.binary.Base64;
+
+import static org.springframework.http.HttpMethod.*;
/**
* 相机设备Controller
@@ -31,102 +25,45 @@
@RequestMapping("/device/uav")
@Api(tags = "无人机外部接口")
public class ArdUavController extends BaseController {
- public static final String USERNAME = "ardbailu";
- public static final String PASSWORD = "ardkj12345";
- public static final String SALT = "0123456789012345";
-
- //token 登陆后每次请求,在header中携带
- private String token = null;
- private ObjectMapper om = new ObjectMapper();
@Autowired
- private UavClient uavClient;
+ private UavService uavService;
- public void uavLogin() {
- String codedPassword = this.Encrypt(PASSWORD, SALT);
- String body = "{\"username\":\"" + USERNAME + "\",\"password\":\"" + codedPassword + "\"}";
- try {
- String res = uavClient.post("login", null, body);
- Map resMap = om.readValue(res, Map.class);
- Map data = (Map) resMap.get("data");
- this.token = (String) data.get("access_token");
- } catch (ForestNetworkException e) {
- e.printStackTrace();
- } catch (JsonMappingException e) {
- throw new RuntimeException(e);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
+ @PostConstruct
+ public void created() {
+ this.uavService.login();
}
- public String getToken() {
- if (StringUtil.isEmpty(this.token)) {
- this.uavLogin();
- }
- return this.token;
- }
@GetMapping("/")
@ApiOperation("无人机get接口")
public Object get(@RequestParam String url, @RequestParam String data) {
- String res = null;
- String token = getToken();
- try {
- res = uavClient.get(url, token, data);
- } catch (ForestNetworkException e) {
- if (e.getStatusCode() == 401) {
- this.uavLogin();
- token = getToken();
- res = uavClient.get(url, token, data);
- }
- }
-
- return res;
+ return this.uavService.doUavRequest(GET, url, data);
}
@PostMapping("/")
@ApiOperation("无人机post接口")
- public Object post(@RequestParam String url, @RequestParam String data) {
- String res = null;
- String token = getToken();
- try {
- res = uavClient.post(url, token, data);
- } catch (ForestNetworkException e) {
- if (e.getStatusCode() == 401) {
- this.uavLogin();
- token = getToken();
- res = uavClient.post(url, token, data);
- }
- }catch (Exception e){
- System.out.println(e.getMessage());
- }
-
- return res;
+ 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);
}
- public String Encrypt(String sSrc, String sKey) {
- if (sKey == null) {
- System.out.print("Key为空null");
- return null;
- }
- // 判断Key是否为16位
- if (sKey.length() != 16) {
- System.out.print("Key长度不是16位");
- return null;
- }
- byte[] encrypted = null;
- try {
- byte[] raw = sKey.getBytes("utf-8");
- SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
- Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");//"算法/模式/补码方式"
- cipher.init(Cipher.ENCRYPT_MODE, skeySpec);
- encrypted = cipher.doFinal(sSrc.getBytes("utf-8"));
- } catch (Exception e) {
- e.printStackTrace();
- ;
- }
- return new Base64().encodeToString(encrypted);//此处使用BASE64做转码功能，同时能起到2次加密的作用。
+ @DeleteMapping("/")
+ @ApiOperation("无人机delete接口")
+ 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("无人机delete接口")
+ public Object getToken() {
+
+ return this.uavService.getToken();
+ }
+
+
}
--
Gitblit v1.9.3