From 1fd977cfd8f16fe3d50777aa24cea0cc2f39b560 Mon Sep 17 00:00:00 2001
From: yuyang <2265829957@qq.com>
Date: Thu, 16 Sep 2021 16:58:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E7=AB=99=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E8=82=8C=E7=BB=8F=E7=BA=AC=E5=BA=A6=EF=BC=8C=E8=B7=9D=E7=A6=BB?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8E=8B=E7=BC=A9=E4=B8=BA2=E4=BD=8D?=
 =?UTF-8?q?=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/XhpcChargingStationMapper.xml    | 7 +++++--
 .../java/com/xhpc/common/domain/XhpcChargingStation.java   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml
index 98251245..acb750ab 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml
+++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml
@@ -252,6 +252,8 @@
         select
         cs.charging_station_id as chargingStationId,
         cs.name as name,
+        cs.longitude as longitude,
+        cs.latitude as latitude,
         cs.parking_instructions as parkingInstructions,
         cs.detailed_address as detailedAddress,
         cs.service_facilities as serviceFacilities,
@@ -274,7 +276,7 @@
         = 'service_facilities' and parent_id > 0 and del_flag = 0) as serviceFacilitiesName,
         ROUND(ACOS(SIN((#{latitude} * 3.141593) / 180 ) *SIN((cs.latitude * 3.141593) / 180 ) +
         COS((#{latitude} * 3.141593) / 180 ) * COS((cs.latitude * 3.141593) / 180 ) *
-        COS((#{longitude} * 3.141593) / 180 - (cs.longitude * 3.141593) / 180 ) ) * 6370.9968,4)AS distance
+        COS((#{longitude} * 3.141593) / 180 - (cs.longitude * 3.141593) / 180 ) ) * 6370.9968,2)AS distance
         from xhpc_charging_station as cs
         where cs.del_flag =0 and cs.status =0
         and FIND_IN_SET(#{clientVisible},cs.client_visible)>0
@@ -307,6 +309,7 @@
 
     <select id="getWXXhpcChargingStationMessage" resultType="java.util.Map">
         select charging_station_id as chargingStationId,
+                longitude,latitude,
                (select type
                 from xhpc_charging_pile
                 where charging_station_id = charging_station_id
@@ -324,7 +327,7 @@
                img_id                                                                                          as imgId,
                remark                                                                                          as remark,
                ROUND(ACOS(SIN((#{latitude} * 3.141593) / 180) * SIN((latitude * 3.141593) / 180) + COS((#{latitude} * 3.141593) / 180) * COS((latitude * 3.141593) / 180) * COS((#{longitude} * 3.141593) / 180 - (longitude * 3.141593) / 180)) * 6370.9968,
-            4) AS distance
+            2) AS distance
         from xhpc_charging_station
 
         where charging_station_id = #{chargingStationId}
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java
index 26a64a0b..37f3adf1 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java
@@ -57,7 +57,7 @@ public class XhpcChargingStation extends BaseEntity {
     @Excel(name = "详细地址")
     private String detailedAddress;
 
-    /** 进度 */
+    /** 经度 */
     @Excel(name = "经度")
     private String longitude;