feat: 新增经纬度

guzijian
1 parent d2cdb377
Showing 7 changed files with 251 additions and 92 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarAddress.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/AddressDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
@@ -36,6 +36,18 @@ public class GarAddress implements Serializable {
     private String garUserId;
     /**
+     * 经度
+     */
+    private Double garLongitude;
+
+    /**
+     * 纬度
+     */
+    private Double garLatitude;
+
+	private String garCoordinate;
+
+    /**
      * 用户地址
      */
     private String garUserAddress;
@@ -82,66 +94,32 @@ public class GarAddress implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        GarAddress other = (GarAddress) that;
-        return (this.getGarAddressId() == null ? other.getGarAddressId() == null : this.getGarAddressId().equals(other.getGarAddressId()))
-                && (this.getGarUserId() == null ? other.getGarUserId() == null : this.getGarUserId().equals(other.getGarUserId()))
-                && (this.getGarUserAddress() == null ? other.getGarUserAddress() == null : this.getGarUserAddress().equals(other.getGarUserAddress()))
-                && (this.getGarUserDefault() == null ? other.getGarUserDefault() == null : this.getGarUserDefault().equals(other.getGarUserDefault()))
-                && (this.getGarCreateTime() == null ? other.getGarCreateTime() == null : this.getGarCreateTime().equals(other.getGarCreateTime()))
-                && (this.getGarUpdateTime() == null ? other.getGarUpdateTime() == null : this.getGarUpdateTime().equals(other.getGarUpdateTime()))
-                && (this.getGarUserContactName() == null ? other.getGarUserContactName() == null : this.getGarUserContactName().equals(other.getGarUserContactName()))
-                && (this.getGarUserContactTel() == null ? other.getGarUserContactTel() == null : this.getGarUserContactTel().equals(other.getGarUserContactTel()))
-                && (this.getGarRemark() == null ? other.getGarRemark() == null : this.getGarRemark().equals(other.getGarRemark()));
+
+	public String getGarCoordinate() {
+		return garCoordinate;
+	}
+
+	public void setGarCoordinate(String garCoordinate) {
+		this.garCoordinate = garCoordinate;
+	}
+
+	public Double getGarLongitude() {
+        return garLongitude;
     }
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getGarAddressId() == null) ? 0 : getGarAddressId().hashCode());
-        result = prime * result + ((getGarUserId() == null) ? 0 : getGarUserId().hashCode());
-        result = prime * result + ((getGarUserAddress() == null) ? 0 : getGarUserAddress().hashCode());
-        result = prime * result + ((getGarUserDefault() == null) ? 0 : getGarUserDefault().hashCode());
-        result = prime * result + ((getGarCreateTime() == null) ? 0 : getGarCreateTime().hashCode());
-        result = prime * result + ((getGarUpdateTime() == null) ? 0 : getGarUpdateTime().hashCode());
-        result = prime * result + ((getGarUserContactName() == null) ? 0 : getGarUserContactName().hashCode());
-        result = prime * result + ((getGarUserContactTel() == null) ? 0 : getGarUserContactTel().hashCode());
-        result = prime * result + ((getGarRemark() == null) ? 0 : getGarRemark().hashCode());
-        return result;
+    public void setGarLongitude(Double garLongitude) {
+        this.garLongitude = garLongitude;
     }
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", garAddressId=").append(garAddressId);
-        sb.append(", garUserId=").append(garUserId);
-        sb.append(", garUserAddress=").append(garUserAddress);
-        sb.append(", garUserDefault=").append(garUserDefault);
-        sb.append(", garCreateTime=").append(garCreateTime);
-        sb.append(", garUpdateTime=").append(garUpdateTime);
-        sb.append(", garUserContactName=").append(garUserContactName);
-        sb.append(", garUserContactTel=").append(garUserContactTel);
-        sb.append(", garRemark=").append(garRemark);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
+    public Double getGarLatitude() {
+        return garLatitude;
     }
-	public String getGarAddressId() {
+    public void setGarLatitude(Double garLatitude) {
+        this.garLatitude = garLatitude;
+    }
+
+    public String getGarAddressId() {
 		return garAddressId;
 	}
@@ -216,5 +194,22 @@ public class GarAddress implements Serializable {
 	public static long getSerialversionuid() {
 		return serialVersionUID;
 	}
-   
+
+	@Override
+	public String toString() {
+		return "GarAddress{" +
+				"garAddressId='" + garAddressId + '\'' +
+				", garUserId='" + garUserId + '\'' +
+				", garLongitude=" + garLongitude +
+				", garLatitude=" + garLatitude +
+				", garCoordinate='" + garCoordinate + '\'' +
+				", garUserAddress='" + garUserAddress + '\'' +
+				", garUserDefault=" + garUserDefault +
+				", garCreateTime=" + garCreateTime +
+				", garUpdateTime=" + garUpdateTime +
+				", garUserContactName='" + garUserContactName + '\'' +
+				", garUserContactTel='" + garUserContactTel + '\'' +
+				", garRemark='" + garRemark + '\'' +
+				'}';
+	}
 }
@@ -133,6 +133,18 @@ public class GarOrder implements Serializable {
 	 */
 	private Integer garOrderMatchFlag;
+	/**
+	 * 经度
+	 */
+	private Double garLongitude;
+
+	/**
+	 * 纬度
+	 */
+	private Double garLatitude;
+
+	private String garCoordinate;
+
 	public Integer getGarOrderMatchFlag() {
 		return garOrderMatchFlag;
 	}
@@ -384,4 +396,28 @@ public class GarOrder implements Serializable {
 	public void setCount(Long count) {
 		this.count = count;
 	}
+
+	public Double getGarLongitude() {
+		return garLongitude;
+	}
+
+	public void setGarLongitude(Double garLongitude) {
+		this.garLongitude = garLongitude;
+	}
+
+	public Double getGarLatitude() {
+		return garLatitude;
+	}
+
+	public void setGarLatitude(Double garLatitude) {
+		this.garLatitude = garLatitude;
+	}
+
+	public String getGarCoordinate() {
+		return garCoordinate;
+	}
+
+	public void setGarCoordinate(String garCoordinate) {
+		this.garCoordinate = garCoordinate;
+	}
 }
 \ No newline at end of file
@@ -22,6 +22,36 @@ public class AddressDto {
     private String contactIphoneNumber;
     @NotNull(message = "defaultFlag不能为空")
     private Boolean defaultFlag;
+	@NotNull(message = "经度")
+	private Double garLongitude;
+	@NotNull(message = "纬度")
+	private Double garLatitude;
+	private String garCoordinate;
+
+	public Double getGarLatitude() {
+		return garLatitude;
+	}
+
+	public void setGarLatitude(Double garLatitude) {
+		this.garLatitude = garLatitude;
+	}
+
+	public String getGarCoordinate() {
+		return garCoordinate;
+	}
+
+	public void setGarCoordinate(String garCoordinate) {
+		this.garCoordinate = garCoordinate;
+	}
+
+	public Double getGarLongitude() {
+		return garLongitude;
+	}
+
+	public void setGarLongitude(Double garLongitude) {
+		this.garLongitude = garLongitude;
+	}
+
 	public String getGarAddressId() {
 		return garAddressId;
 	}
@@ -4,6 +4,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 /**
@@ -19,6 +20,15 @@ public class OrderDto {
      */
     @NotBlank(message = "地址不能为空")
     private String garOrderAddress;
+
+    @NotNull(message = "经度")
+    private Double garLongitude;
+    @NotNull(message = "纬度")
+    private Double garLatitude;
+    /**
+     * 坐标系
+     */
+    private String garCoordinate;
     /**
      * 图片列表
      */
@@ -200,5 +210,48 @@ public class OrderDto {
         this.garRemark = garRemark;
     }
+    public Double getGarLongitude() {
+        return garLongitude;
+    }
+
+    public void setGarLongitude(Double garLongitude) {
+        this.garLongitude = garLongitude;
+    }
+
+    public Double getGarLatitude() {
+        return garLatitude;
+    }
+    public void setGarLatitude(Double garLatitude) {
+        this.garLatitude = garLatitude;
+    }
+
+    public String getGarCoordinate() {
+        return garCoordinate;
+    }
+
+    public void setGarCoordinate(String garCoordinate) {
+        this.garCoordinate = garCoordinate;
+    }
+
+    @Override
+    public String toString() {
+        return "OrderDto{" +
+                "garOrderAddress='" + garOrderAddress + '\'' +
+                ", garLongitude=" + garLongitude +
+                ", garLatitude=" + garLatitude +
+                ", garCoordinate='" + garCoordinate + '\'' +
+                ", imageUrls=" + imageUrls +
+                ", garOrderAddressDetails='" + garOrderAddressDetails + '\'' +
+                ", garOrderContactName='" + garOrderContactName + '\'' +
+                ", garOrderTrashType='" + garOrderTrashType + '\'' +
+                ", garOrderContactTel='" + garOrderContactTel + '\'' +
+                ", garOrderCompanyId='" + garOrderCompanyId + '\'' +
+                ", garOrderCompanyName='" + garOrderCompanyName + '\'' +
+                ", garOrderCompanyTel='" + garOrderCompanyTel + '\'' +
+                ", garOrderAgreementTime='" + garOrderAgreementTime + '\'' +
+                ", garRemark='" + garRemark + '\'' +
+                ", garCarInfoList=" + garCarInfoList +
+                '}';
+    }
 }
@@ -62,6 +62,19 @@ public class OrderDetailVo {
     private String garOrderAddressDetails;
     /**
+     * 经度
+     */
+    private Double garLongitude;
+    /**
+     * 纬度
+     */
+    private Double garLatitude;
+    /**
+     * 坐标系
+     */
+    private String garCoordinate;
+
+    /**
      * 订单姓名
      */
     private String garOrderContactName;
@@ -137,39 +150,6 @@ public class OrderDetailVo {
         this.garHandlerEvaluateFlag = GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue();
     }
-    @Override
-    public String toString() {
-        return "OrderDetailVo{" +
-                "garCancelFlag=" + garCancelFlag +
-                ", garReason='" + garReason + '\'' +
-                ", garOrderHandlerId='" + garOrderHandlerId + '\'' +
-                ", garEvaluateFlag=" + garEvaluateFlag +
-                ", garHandlerEvaluateFlag=" + garHandlerEvaluateFlag +
-                ", garOrderHandleName='" + garOrderHandleName + '\'' +
-                ", garOrderHandleTel='" + garOrderHandleTel + '\'' +
-                ", garOrderAddress='" + garOrderAddress + '\'' +
-                ", currentImages=" + currentImages +
-                ", putOnImages=" + putOnImages +
-                ", putDownImages=" + putDownImages +
-                ", garOrderAddressDetails='" + garOrderAddressDetails + '\'' +
-                ", garOrderContactName='" + garOrderContactName + '\'' +
-                ", garOrderTrashType='" + garOrderTrashType + '\'' +
-                ", garCarInfoList=" + garCarInfoList +
-                ", garOrderHandlerStatus=" + garOrderHandlerStatus +
-                ", garCreateTime=" + garCreateTime +
-                ", garOrderContactTel='" + garOrderContactTel + '\'' +
-                ", garOrderCompanyId='" + garOrderCompanyId + '\'' +
-                ", garOrderCompanyName='" + garOrderCompanyName + '\'' +
-                ", garOrderCompanyTel='" + garOrderCompanyTel + '\'' +
-                ", garOrderAgreementTime='" + garOrderAgreementTime + '\'' +
-                ", garRemark='" + garRemark + '\'' +
-                ", handleFlag=" + handleFlag +
-                ", garOrderMatchFlag=" + garOrderMatchFlag +
-                ", garOrderStatus=" + garOrderStatus +
-                ", garHandlerCarCode='" + garHandlerCarCode + '\'' +
-                '}';
-    }
-
     public String getGarHandlerCarCode() {
         return garHandlerCarCode;
@@ -391,4 +371,63 @@ public class OrderDetailVo {
     }
+    public Double getGarLongitude() {
+        return garLongitude;
+    }
+
+    public void setGarLongitude(Double garLongitude) {
+        this.garLongitude = garLongitude;
+    }
+
+    public Double getGarLatitude() {
+        return garLatitude;
+    }
+
+    public void setGarLatitude(Double garLatitude) {
+        this.garLatitude = garLatitude;
+    }
+
+    public String getGarCoordinate() {
+        return garCoordinate;
+    }
+
+    public void setGarCoordinate(String garCoordinate) {
+        this.garCoordinate = garCoordinate;
+    }
+
+    @Override
+    public String toString() {
+        return "OrderDetailVo{" +
+                "garCancelFlag=" + garCancelFlag +
+                ", garReason='" + garReason + '\'' +
+                ", garOrderHandlerId='" + garOrderHandlerId + '\'' +
+                ", garEvaluateFlag=" + garEvaluateFlag +
+                ", garHandlerEvaluateFlag=" + garHandlerEvaluateFlag +
+                ", garOrderHandleName='" + garOrderHandleName + '\'' +
+                ", garOrderHandleTel='" + garOrderHandleTel + '\'' +
+                ", garOrderAddress='" + garOrderAddress + '\'' +
+                ", currentImages=" + currentImages +
+                ", putOnImages=" + putOnImages +
+                ", putDownImages=" + putDownImages +
+                ", garOrderAddressDetails='" + garOrderAddressDetails + '\'' +
+                ", garLongitude=" + garLongitude +
+                ", garLatitude=" + garLatitude +
+                ", garCoordinate='" + garCoordinate + '\'' +
+                ", garOrderContactName='" + garOrderContactName + '\'' +
+                ", garOrderTrashType='" + garOrderTrashType + '\'' +
+                ", garCarInfoList=" + garCarInfoList +
+                ", garOrderHandlerStatus=" + garOrderHandlerStatus +
+                ", garCreateTime=" + garCreateTime +
+                ", garOrderContactTel='" + garOrderContactTel + '\'' +
+                ", garOrderCompanyId='" + garOrderCompanyId + '\'' +
+                ", garOrderCompanyName='" + garOrderCompanyName + '\'' +
+                ", garOrderCompanyTel='" + garOrderCompanyTel + '\'' +
+                ", garOrderAgreementTime='" + garOrderAgreementTime + '\'' +
+                ", garRemark='" + garRemark + '\'' +
+                ", handleFlag=" + handleFlag +
+                ", garOrderMatchFlag=" + garOrderMatchFlag +
+                ", garOrderStatus=" + garOrderStatus +
+                ", garHandlerCarCode='" + garHandlerCarCode + '\'' +
+                '}';
+    }
 }
@@ -210,6 +210,9 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         address.setGarUserContactName(dto.getContactPerson());
         address.setGarUserContactTel(dto.getContactIphoneNumber());
         address.setGarRemark(dto.getAddressDetail());
+        address.setGarLongitude(dto.getGarLongitude());
+        address.setGarLatitude(dto.getGarLatitude());
+        address.setGarCoordinate(dto.getGarCoordinate());
         handleCurrentAddress(address);
         garAddressService.save(address);
         return "新增地址成功!";
@@ -28,6 +28,9 @@
         <result property="garEvaluateFlag" column="gar_evaluate_flag" jdbcType="TINYINT"/>
         <result property="garHandlerEvaluateFlag" column="gar_handler_evaluate_flag" jdbcType="TINYINT"/>
         <result property="garOrderMatchFlag" column="gar_order_match_flag" jdbcType="TINYINT"/>
+        <result property="garLatitude" column="gar_latitude" jdbcType="DOUBLE"/>
+        <result property="garLongitude" column="gar_longitude" jdbcType="DOUBLE"/>
+        <result property="garCoordinate" column="gar_coordinate" jdbcType="DOUBLE"/>
     </resultMap>
     <sql id="Base_Column_List">
@@ -38,7 +41,7 @@
         gar_order_company_name,gar_order_company_tel,gar_order_handler_status,
         gar_order_agreement_time,gar_create_time,gar_update_time,
         gar_create_by,gar_update_by,gar_remark,gar_reason,gar_cancel_flag,
-        gar_evaluate_flag,gar_handler_evaluate_flag,gar_order_match_flag
+        gar_evaluate_flag,gar_handler_evaluate_flag,gar_order_match_flag,gar_coordinate,gar_longitude,gar_latitude
     </sql>
     <select id="queryCleanNumberByEnterpriseIds" resultType="com.trash.garbage.pojo.domain.GarOrder">
         select gar_order_company_id, count(gar_order_company_id) as count
@@ -52,9 +55,9 @@
     </select>
     <select id="queryOrderListByTelWithType" resultType="com.trash.garbage.pojo.vo.GarOrderDriverVo">
         SELECT
-        `order`.gar_order_id ,`order`.gar_order_user_id,`order`.gar_order_handler_id,
-        `order`.gar_order_address,`order`.gar_order_address_details,`order`.gar_order_contact_name,
-        `order`.gar_order_trash_type,`order`.gar_order_contact_tel,`order`.gar_order_company_id,
+        `order`.gar_order_id ,`order`.gar_order_user_id,`order`.gar_order_handler_id,`order`.gar_coordinate,
+        `order`.gar_order_address,`order`.gar_order_address_details,`order`.gar_order_contact_name,`order`.gar_longitude,
+        `order`.gar_order_trash_type,`order`.gar_order_contact_tel,`order`.gar_order_company_id,`order`.gar_latitude,
         `order`.gar_order_company_name,`order`.gar_order_company_tel,`order`.gar_order_match_flag,
         `order`.gar_order_agreement_time,`order`.gar_remark,`order`.gar_handler_evaluate_flag,`order`.gar_order_handler_status gar_order_status,
         `handler`.gar_order_status gar_order_handler_status,`handler`.gar_cancel_flag,`handler`.gar_reason