From 97bb97c13ad63c40a8baf73b0f5e08d93c0e7559 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 18 十一月 2022 16:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/MapDistance.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/MapDistance.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/MapDistance.java
index 3969c81..d685e79 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/MapDistance.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/MapDistance.java
@@ -1,5 +1,7 @@
 package com.panzhihua.service_community.util;
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -9,6 +11,7 @@
  * @Date: 2022/11/11 15:21
  * @Description: 经纬度处理
  */
+@Slf4j
 public class MapDistance {
     private static double EARTH_RADIUS = 6378.137;
 
@@ -73,14 +76,15 @@
      * 最大经度 maxLng
      * 最大纬度 minLat
      */
-    public static Map<Object,Object> getAround(String latStr, String lngStr, String raidus) {
+    public static Map<Object,Object> getAround(String latStr, String lngStr, double raidusMile) {
+        log.info("latStr:"+latStr+",lngStr:"+lngStr+",raidusMile:"+raidusMile);
         Map<Object,Object> map = new HashMap<Object,Object>();
 
         Double latitude = Double.parseDouble(latStr);// 传值给经度
         Double longitude = Double.parseDouble(lngStr);// 传值给纬度
 
         Double degree = (24901 * 1609) / 360.0; // 获取每度
-        double raidusMile = Double.parseDouble(raidus);
+//        double raidusMile = Double.parseDouble(raidus);
 
         Double mpdLng = Double.parseDouble((degree * Math.cos(latitude * (Math.PI / 180))+"").replace("-", ""));
         Double dpmLng = 1 / mpdLng;
@@ -113,10 +117,10 @@
         System.out.println(getDistance("30.57568","103.962128","30.636726","103.957232"));
 
         //103.842654,30.560987
-        System.out.println(getAround("103.842654", "30.560987", "5000"));
+        System.out.println(getAround("107.075277", "30.456085", 5000d));
         //117.01028712333508(Double), 117.22593287666493(Double),
         //36.44829619896034(Double), 36.92138380103966(Double)
-
+        //104.03035080138962(String), 104.12020319861038(String), 30.271352899925574(String), 30.64081710007443(String)
         distanceOfTwoPoints("30.57568","103.962128","30.636726","103.957232");
     }
 

--
Gitblit v1.7.1