修改经纬度信息

liujun001
1 parent ac04b79d
Showing 2 changed files with 25 additions and 18 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/DisposalSiteEntity.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
 package com.trash.garbage.pojo.domain;
  
 import com.baomidou.mybatisplus.annotation.TableName;
+import org.apache.commons.lang3.StringUtils;
  
 /**
  * @author liujun
@@ -201,14 +202,11 @@ public class DisposalSiteEntity implements java.io.Serializable {
 //     */
 //    private String auditStatus;
  
+
     /**
-     * 经度
-     */
-    private Double longitude;
-    /**
-     * 纬度
+     * 经度和纬度
      */
-    private Double latitude;
+    private String addressGps;
  
  
     public Long getId() {
@@ -244,20 +242,12 @@ public class DisposalSiteEntity implements java.io.Serializable {
     }
  
  
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
+    public String getAddressGps() {
+        return addressGps;
     }
  
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
+    public void setAddressGps(String addressGps) {
+        this.addressGps = addressGps;
     }
  
     public String getLocalArea() {
@@ -283,4 +273,20 @@ public class DisposalSiteEntity implements java.io.Serializable {
     public void setConstructionUnitPersonPhone(String constructionUnitPersonPhone) {
         this.constructionUnitPersonPhone = constructionUnitPersonPhone;
     }
+
+    public Double getLongitude() {
+        if (StringUtils.isEmpty(getAddressGps())) {
+            return null;
+        }
+        String value = StringUtils.substringBefore(getAddressGps(), ",");
+        return StringUtils.isEmpty(value) ? null : Double.parseDouble(value);
+    }
+
+    public Double getLatitude() {
+        if (StringUtils.isEmpty(getAddressGps())) {
+            return null;
+        }
+        String value = StringUtils.substringAfter(getAddressGps(), ",");
+        return StringUtils.isEmpty(value) ? null : Double.parseDouble(value);
+    }
 }
@@ -221,6 +221,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             }
             DisposalSiteVo vo = new DisposalSiteVo();
             BeanUtils.copyProperties(en, vo);
+           // vo.setLongitude(en.getLongitude());
             return vo;
         }).filter(obj -> Objects.nonNull(obj)).collect(Collectors.toList());
     }