Merge branch 'master' of http://git.elinkit.com.cn:7070/r/esua-epdc-cloud

esua-epdc/epdc-cloud-commons-shibei

@@ -1 +1 @@
-Subproject commit 18e985c9efe71b9d9dcbb4760bc9a2dcbc643617
+Subproject commit 6cde84ffe71cdfa12f64f4755ec73ba4660e4d7b

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -31,6 +31,7 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
 import com.elink.esua.epdc.commons.tools.constant.StrConstant;
+import com.elink.esua.epdc.commons.tools.dto.LocateInfo;
 import com.elink.esua.epdc.commons.tools.enums.*;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
@@ -5697,8 +5698,16 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             }
             // 查询网格信息
             GisFormDTO gisFormDTO = new GisFormDTO();
-            gisFormDTO.setLongitude(longitude);
-            gisFormDTO.setLatitude(latitude);
+            // 坐标系转换：GCJ-02坐标系WGS84
+            LocateInfo locateInfo = GCJ02_WGS84.gcj02_To_Wgs84(Double.valueOf(latitude), Double.valueOf(longitude));
+            if (null != locateInfo) {
+                gisFormDTO.setLongitude(String.valueOf(locateInfo.getLongitude()));
+                gisFormDTO.setLatitude(String.valueOf(locateInfo.getLatitude()));
+            } else {
+                log.warn("新新向党接收随手拍,坐标系转换为空，原经纬度：" + longitude + "," + latitude);
+                gisFormDTO.setLongitude(longitude);
+                gisFormDTO.setLatitude(latitude);
+            }
             Result<GisGridDTO> gisGridRes = adminFeignClient.getGridByCoordinate(gisFormDTO);
             if (!gisGridRes.success() || null == gisGridRes.getData()) {
                 internalRemark = "根据经纬度获取网格信息失败:" + gisGridRes.getMsg();