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/service/UavService.java | 271 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 271 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java b/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java
index 3ce9f56..8720596 100644
--- a/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java
+++ b/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java
@@ -13,6 +13,7 @@
import com.ruoyi.sy.controller.ArdSyCarController;
import com.ruoyi.utils.forest.UavClient;
import lombok.extern.slf4j.Slf4j;
+import okhttp3.*;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.collections4.map.HashedMap;
import org.java_websocket.WebSocket;
@@ -58,13 +59,21 @@
private String token;
+ private String workspaceId;
+
@Autowired
private UavClient uavClient;
@Autowired
private RedisCache redisCache;
+ @Value("${uav.enabled}")
+ private Boolean uavEnabled;
+
@PostConstruct
public void created() {
+ if(!uavEnabled){//鏃犱汉鏈哄姞鍏ュ紑鍏�
+ return;
+ }
getUavConfig();
this.login();
@@ -77,6 +86,10 @@
this.username = ConfigUtils.getConfigValue("uav_username");
this.password = ConfigUtils.getConfigValue("uav_password");
this.salt = ConfigUtils.getConfigValue("uav_salt");
+ /*this.host = "http://112.98.126.2:6100/";
+ this.username = "znstest";
+ this.password = "znstest";
+ this.salt = "0123456789012345";*/
if (StringUtils.isEmpty(this.host) || StringUtils.isEmpty(this.username) || StringUtils.isEmpty(this.password) || StringUtils.isEmpty(this.salt)) {
throw new RuntimeException("鏃犱汉鏈哄弬鏁伴厤缃己澶�:");
}
@@ -128,6 +141,7 @@
//token璧嬪��
this.token = token;
+ this.workspaceId = (String) uavUser.get("workspace_id");
} catch (ForestNetworkException fe) {
if (fe.getStatusCode() == 401) {//token澶辨晥,閲嶆柊鐧诲綍
this.login();
@@ -136,6 +150,7 @@
token = (String) uavUser.get("access_token");
//token璧嬪��
this.token = token;
+ this.workspaceId = (String) uavUser.get("workspace_id");
return token;
}
}
@@ -546,4 +561,260 @@
}
return new Base64().encodeToString(encrypted);//姝ゅ浣跨敤BASE64鍋氳浆鐮佸姛鑳斤紝鍚屾椂鑳借捣鍒�2娆″姞瀵嗙殑浣滅敤銆�
}
+
+ public Object checkPointValid(String url, Map<String,Map<String,Object>> data) {
+ String token = this.getToken();
+ url = this.host + url;
+ Map<String,Object> resultMap = checkPointValid(url,token, data);
+ return resultMap;
+ }
+
+ public Map<String,Object> checkPointValid(String url,String access_token,Map<String,Map<String,Object>> map){
+ MediaType mediaType = MediaType.parse("application/json; charset=utf-8");
+ OkHttpClient okHttpClient = new OkHttpClient();
+
+ RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(map));
+
+ Request request = new Request.Builder().url(url).post(body).addHeader("x-auth-token",access_token).build();
+
+ Response response = null;
+ try {
+ response = okHttpClient.newCall(request).execute();
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ ResponseBody responseBody = response.body();
+
+ try {
+ String message = responseBody.string();// 鍝嶅簲浣�
+ Map<String,Object> map0 = (Map<String, Object>) JSON.parse(message);
+ return map0;
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ return new HashMap();
+ }
+ }
+
+ public Object checkLineValid(String url, Map<String,List<Map<String,String>>> data) {
+ String token = this.getToken();
+ url = this.host + url;
+ Map<String,Object> resultMap = checkLineValid(url,token, data);
+ return resultMap;
+ }
+
+ public Map<String,Object> checkLineValid(String url,String access_token,Map<String,List<Map<String,String>>> map){
+ MediaType mediaType = MediaType.parse("application/json; charset=utf-8");
+ OkHttpClient okHttpClient = new OkHttpClient();
+
+ RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(map));
+
+ Request request = new Request.Builder().url(url).post(body).addHeader("x-auth-token",access_token).build();
+
+ Response response = null;
+ try {
+ response = okHttpClient.newCall(request).execute();
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ ResponseBody responseBody = response.body();
+
+ try {
+ String message = responseBody.string();// 鍝嶅簲浣�
+ Map<String,Object> map0 = (Map<String, Object>) JSON.parse(message);
+ return map0;
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ return new HashMap();
+ }
+ }
+
+ public String getWorkspaceId(){
+ String token = this.getToken();
+ return this.workspaceId;
+ }
+
+ public Object addWaylinesPlanning(String url, Map<String,Object> data) {
+ String token = this.getToken();
+ url = this.host + url;
+ Map<String,Object> resultMap = addWaylinesPlanning(url,token, data);
+ return resultMap;
+ }
+
+ public Map<String,Object> addWaylinesPlanning(String url,String access_token,Map<String,Object> map){
+ MediaType mediaType = MediaType.parse("application/json; charset=utf-8");
+ OkHttpClient okHttpClient = new OkHttpClient();
+
+ RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(map));
+
+ Request request = new Request.Builder().url(url).post(body).addHeader("x-auth-token",access_token).build();
+
+ Response response = null;
+ try {
+ response = okHttpClient.newCall(request).execute();
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ ResponseBody responseBody = response.body();
+
+ try {
+ String message = responseBody.string();// 鍝嶅簲浣�
+ Map<String,Object> map0 = (Map<String, Object>) JSON.parse(message);
+ return map0;
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ return new HashMap();
+ }
+ }
+
+ public Object deleteWaylinesPlanning(String url, Map<String,String> data) {
+ String token = this.getToken();
+ String waylineId = data.get("waylineId");
+ url = this.host + url + waylineId;
+ Map<String,Object> resultMap = deleteWaylinesPlanning(url,token);
+ return resultMap;
+ }
+
+ public static Map<String,Object> deleteWaylinesPlanning(String url,String access_token){
+ OkHttpClient okHttpClient = new OkHttpClient();
+
+ Request request = new Request.Builder().url(url).delete().addHeader("x-auth-token",access_token).build();
+
+ Response response = null;
+ try {
+ response = okHttpClient.newCall(request).execute();
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ ResponseBody responseBody = response.body();
+
+ try {
+ String message = responseBody.string();// 鍝嶅簲浣�
+ Map<String,Object> map0 = (Map<String, Object>) JSON.parse(message);
+ return map0;
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ return new HashMap();
+ }
+ }
+
+ public Object updateWaylinesPlanning(String url, Map<String,Object> data) {
+ String token = this.getToken();
+ url = this.host + url;
+ Map<String,Object> resultMap = updateWaylinesPlanning(url,token, data);
+ return resultMap;
+ }
+
+ public Map<String,Object> updateWaylinesPlanning(String url,String access_token,Map<String,Object> map){
+ MediaType mediaType = MediaType.parse("application/json; charset=utf-8");
+ OkHttpClient okHttpClient = new OkHttpClient();
+
+ RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(map));
+
+ Request request = new Request.Builder().url(url).post(body).addHeader("x-auth-token",access_token).build();
+
+ Response response = null;
+ try {
+ response = okHttpClient.newCall(request).execute();
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ ResponseBody responseBody = response.body();
+
+ try {
+ String message = responseBody.string();// 鍝嶅簲浣�
+ Map<String,Object> map0 = (Map<String, Object>) JSON.parse(message);
+ return map0;
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ return new HashMap();
+ }
+ }
+
+ public Object addAlarm(String url, Map<String,Object> data) {
+ String token = this.getToken();
+ url = this.host + url;
+ data.put("userName",this.username);
+ Map<String,Object> resultMap = addAlarm(url,token, data);
+ return resultMap;
+ }
+
+ public Map<String,Object> addAlarm(String url,String access_token,Map<String,Object> map){
+ MediaType mediaType = MediaType.parse("application/json; charset=utf-8");
+ OkHttpClient okHttpClient = new OkHttpClient();
+
+ RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(map));
+
+ Request request = new Request.Builder().url(url).post(body).addHeader("x-auth-token",access_token).build();
+
+ Response response = null;
+ try {
+ response = okHttpClient.newCall(request).execute();
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ ResponseBody responseBody = response.body();
+
+ try {
+ String message = responseBody.string();// 鍝嶅簲浣�
+ Map<String,Object> map0 = (Map<String, Object>) JSON.parse(message);
+ return map0;
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ return new HashMap();
+ }
+ }
+
+ public Object saveCurrentGroup(String url, Map<String,Object> data) {
+ String token = this.getToken();
+ url = this.host + url;
+ Map<String,Object> resultMap = addWaylinesPlanning(url,token, data);
+ return resultMap;
+ }
+
+ public Map<String,Object> saveCurrentGroup(String url,String access_token,Map<String,Object> map){
+ MediaType mediaType = MediaType.parse("application/json; charset=utf-8");
+ OkHttpClient okHttpClient = new OkHttpClient();
+
+ RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(map));
+
+ Request request = new Request.Builder().url(url).post(body).addHeader("x-auth-token",access_token).build();
+
+ Response response = null;
+ try {
+ response = okHttpClient.newCall(request).execute();
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ ResponseBody responseBody = response.body();
+
+ try {
+ String message = responseBody.string();// 鍝嶅簲浣�
+ Map<String,Object> map0 = (Map<String, Object>) JSON.parse(message);
+ return map0;
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ return new HashMap();
+ }
+ }
}
--
Gitblit v1.9.3