From e49d26ed810f3dc3167103e6ced0025b6c72907a Mon Sep 17 00:00:00 2001
From: zhangjian <zhangjianrock@163.com>
Date: 星期四, 21 九月 2023 11:51:41 +0800
Subject: [PATCH] 修改服务IP地址

---
 ard-work/src/main/java/com/ruoyi/utils/gis/GisUtil.java             |   13 +++++++++++--
 ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java        |    2 +-
 ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java |    4 +++-
 3 files changed, 15 insertions(+), 4 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 d09c55b..27136cf 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
@@ -54,7 +54,8 @@
         //鎵цmethod
         this.getToken();//鑾峰彇token楠岃瘉,楠岃瘉token鏈夋晥鎬�
         try {
-            res = (String) requestMethod.invoke(this.uavClient, url, this.getToken(), data);
+            String token = this.getToken();
+            res = (String) requestMethod.invoke(this.uavClient, url, token, data);
         } catch (IllegalAccessException e) {
             System.out.println("doUavRequest 璁块棶澶辫触" + e.getMessage());
         } catch (InvocationTargetException e) {
@@ -102,6 +103,7 @@
             }
         } catch (ForestRuntimeException e) {
             log.error("鏃犱汉鏈鸿繛鎺ヨ秴鏃�" + e.getMessage());
+            e.printStackTrace();
         } catch (JsonMappingException e) {
             e.printStackTrace();
         } catch (JsonProcessingException e) {
diff --git a/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java b/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java
index 6a2b4db..5605f51 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java
@@ -9,7 +9,7 @@
     @Get("http://www.baidu.com")
     String test();
 
-    public static String IP = "http://112.98.126.2:7030/";
+    public static String IP = "http://112.98.126.2:7100/";
 
     @Get(IP + "${url}")
     String GET(@Var("url") String url, @Header("x-auth-token") String token, @JSONBody String body);
diff --git a/ard-work/src/main/java/com/ruoyi/utils/gis/GisUtil.java b/ard-work/src/main/java/com/ruoyi/utils/gis/GisUtil.java
index 8c669d5..85979a9 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/gis/GisUtil.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/gis/GisUtil.java
@@ -182,7 +182,7 @@
     public static void main(String[] args) {
         // 125.097531,46.60029, 125.124731,46.584808
         //鐩告満浣嶇疆
-        double[] camera = {125.146964331147,46.5580925811216,102};//缁忓害,绾害,楂樺害
+       /* double[] camera = {125.146964331147,46.5580925811216,102};//缁忓害,绾害,楂樺害
         //鐪嬪悜鐨勪綅缃�
         double[] lookAt = {125.155449,46.555108,0};//缁忓害,绾害,楂樺害
 
@@ -190,7 +190,16 @@
         double viewWidth = 150;//鐩告満瑙嗗煙瀹藉害
 
         double[] ptz = GisUtil.getCameraPTZ(camera, lookAt, viewAngle, viewWidth);
-        System.out.println("ptz:" + Arrays.toString(ptz));
+        System.out.println("ptz:" + Arrays.toString(ptz));*/
+      //  double[] camera = {125.153903999999997,46.5600799999999992,258.430000000000007};
+        GlobalCoordinates camera = new GlobalCoordinates(46.5600799999999992,125.153903999999997);
+        double p = 212.70155;
+        double distance = 4048.886568114861;
+
+        GlobalCoordinates point = getGlobalCoordinates(camera, p, distance);
+        System.out.println("point:");
+        System.out.println("lon:"+point.getLongitude());
+        System.out.println("lat:"+point.getLatitude());
 
     }
 }

--
Gitblit v1.9.3