youxiw2000 / trash · Commits

Commit d9491a6ad3ca4e5903b627fdfb191dad759b668d

Authored by guzijian
1 parent d2cdb377
build: skipped

feat: 新增经纬度

Inline Side-by-side
Showing 7 changed files with 251 additions and 92 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarAddress.java
  View file @d9491a6
... ... @@ -36,6 +36,18 @@ public class GarAddress implements Serializable {
36 36 private String garUserId;
37 37  
38 38 /**
  39 + * 经度
  40 + */
  41 + private Double garLongitude;
  42 +
  43 + /**
  44 + * 纬度
  45 + */
  46 + private Double garLatitude;
  47 +
  48 + private String garCoordinate;
  49 +
  50 + /**
39 51 * 用户地址
40 52 */
41 53 private String garUserAddress;
... ... @@ -82,66 +94,32 @@ public class GarAddress implements Serializable {
82 94 @TableField(exist = false)
83 95 private static final long serialVersionUID = 1L;
84 96  
85   - @Override
86   - public boolean equals(Object that) {
87   - if (this == that) {
88   - return true;
89   - }
90   - if (that == null) {
91   - return false;
92   - }
93   - if (getClass() != that.getClass()) {
94   - return false;
95   - }
96   - GarAddress other = (GarAddress) that;
97   - return (this.getGarAddressId() == null ? other.getGarAddressId() == null : this.getGarAddressId().equals(other.getGarAddressId()))
98   - && (this.getGarUserId() == null ? other.getGarUserId() == null : this.getGarUserId().equals(other.getGarUserId()))
99   - && (this.getGarUserAddress() == null ? other.getGarUserAddress() == null : this.getGarUserAddress().equals(other.getGarUserAddress()))
100   - && (this.getGarUserDefault() == null ? other.getGarUserDefault() == null : this.getGarUserDefault().equals(other.getGarUserDefault()))
101   - && (this.getGarCreateTime() == null ? other.getGarCreateTime() == null : this.getGarCreateTime().equals(other.getGarCreateTime()))
102   - && (this.getGarUpdateTime() == null ? other.getGarUpdateTime() == null : this.getGarUpdateTime().equals(other.getGarUpdateTime()))
103   - && (this.getGarUserContactName() == null ? other.getGarUserContactName() == null : this.getGarUserContactName().equals(other.getGarUserContactName()))
104   - && (this.getGarUserContactTel() == null ? other.getGarUserContactTel() == null : this.getGarUserContactTel().equals(other.getGarUserContactTel()))
105   - && (this.getGarRemark() == null ? other.getGarRemark() == null : this.getGarRemark().equals(other.getGarRemark()));
  97 +
  98 + public String getGarCoordinate() {
  99 + return garCoordinate;
  100 + }
  101 +
  102 + public void setGarCoordinate(String garCoordinate) {
  103 + this.garCoordinate = garCoordinate;
  104 + }
  105 +
  106 + public Double getGarLongitude() {
  107 + return garLongitude;
106 108 }
107 109  
108   - @Override
109   - public int hashCode() {
110   - final int prime = 31;
111   - int result = 1;
112   - result = prime * result + ((getGarAddressId() == null) ? 0 : getGarAddressId().hashCode());
113   - result = prime * result + ((getGarUserId() == null) ? 0 : getGarUserId().hashCode());
114   - result = prime * result + ((getGarUserAddress() == null) ? 0 : getGarUserAddress().hashCode());
115   - result = prime * result + ((getGarUserDefault() == null) ? 0 : getGarUserDefault().hashCode());
116   - result = prime * result + ((getGarCreateTime() == null) ? 0 : getGarCreateTime().hashCode());
117   - result = prime * result + ((getGarUpdateTime() == null) ? 0 : getGarUpdateTime().hashCode());
118   - result = prime * result + ((getGarUserContactName() == null) ? 0 : getGarUserContactName().hashCode());
119   - result = prime * result + ((getGarUserContactTel() == null) ? 0 : getGarUserContactTel().hashCode());
120   - result = prime * result + ((getGarRemark() == null) ? 0 : getGarRemark().hashCode());
121   - return result;
  110 + public void setGarLongitude(Double garLongitude) {
  111 + this.garLongitude = garLongitude;
122 112 }
123 113  
124   - @Override
125   - public String toString() {
126   - StringBuilder sb = new StringBuilder();
127   - sb.append(getClass().getSimpleName());
128   - sb.append(" [");
129   - sb.append("Hash = ").append(hashCode());
130   - sb.append(", garAddressId=").append(garAddressId);
131   - sb.append(", garUserId=").append(garUserId);
132   - sb.append(", garUserAddress=").append(garUserAddress);
133   - sb.append(", garUserDefault=").append(garUserDefault);
134   - sb.append(", garCreateTime=").append(garCreateTime);
135   - sb.append(", garUpdateTime=").append(garUpdateTime);
136   - sb.append(", garUserContactName=").append(garUserContactName);
137   - sb.append(", garUserContactTel=").append(garUserContactTel);
138   - sb.append(", garRemark=").append(garRemark);
139   - sb.append(", serialVersionUID=").append(serialVersionUID);
140   - sb.append("]");
141   - return sb.toString();
  114 + public Double getGarLatitude() {
  115 + return garLatitude;
142 116 }
143 117  
144   - public String getGarAddressId() {
  118 + public void setGarLatitude(Double garLatitude) {
  119 + this.garLatitude = garLatitude;
  120 + }
  121 +
  122 + public String getGarAddressId() {
145 123 return garAddressId;
146 124 }
147 125  
... ... @@ -216,5 +194,22 @@ public class GarAddress implements Serializable {
216 194 public static long getSerialversionuid() {
217 195 return serialVersionUID;
218 196 }
219   -
  197 +
  198 + @Override
  199 + public String toString() {
  200 + return "GarAddress{" +
  201 + "garAddressId='" + garAddressId + '\'' +
  202 + ", garUserId='" + garUserId + '\'' +
  203 + ", garLongitude=" + garLongitude +
  204 + ", garLatitude=" + garLatitude +
  205 + ", garCoordinate='" + garCoordinate + '\'' +
  206 + ", garUserAddress='" + garUserAddress + '\'' +
  207 + ", garUserDefault=" + garUserDefault +
  208 + ", garCreateTime=" + garCreateTime +
  209 + ", garUpdateTime=" + garUpdateTime +
  210 + ", garUserContactName='" + garUserContactName + '\'' +
  211 + ", garUserContactTel='" + garUserContactTel + '\'' +
  212 + ", garRemark='" + garRemark + '\'' +
  213 + '}';
  214 + }
220 215 }
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
  View file @d9491a6
... ... @@ -133,6 +133,18 @@ public class GarOrder implements Serializable {
133 133 */
134 134 private Integer garOrderMatchFlag;
135 135  
  136 + /**
  137 + * 经度
  138 + */
  139 + private Double garLongitude;
  140 +
  141 + /**
  142 + * 纬度
  143 + */
  144 + private Double garLatitude;
  145 +
  146 + private String garCoordinate;
  147 +
136 148 public Integer getGarOrderMatchFlag() {
137 149 return garOrderMatchFlag;
138 150 }
... ... @@ -384,4 +396,28 @@ public class GarOrder implements Serializable {
384 396 public void setCount(Long count) {
385 397 this.count = count;
386 398 }
  399 +
  400 + public Double getGarLongitude() {
  401 + return garLongitude;
  402 + }
  403 +
  404 + public void setGarLongitude(Double garLongitude) {
  405 + this.garLongitude = garLongitude;
  406 + }
  407 +
  408 + public Double getGarLatitude() {
  409 + return garLatitude;
  410 + }
  411 +
  412 + public void setGarLatitude(Double garLatitude) {
  413 + this.garLatitude = garLatitude;
  414 + }
  415 +
  416 + public String getGarCoordinate() {
  417 + return garCoordinate;
  418 + }
  419 +
  420 + public void setGarCoordinate(String garCoordinate) {
  421 + this.garCoordinate = garCoordinate;
  422 + }
387 423 }
388 424 \ No newline at end of file
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/AddressDto.java
  View file @d9491a6
... ... @@ -22,6 +22,36 @@ public class AddressDto {
22 22 private String contactIphoneNumber;
23 23 @NotNull(message = "defaultFlag不能为空")
24 24 private Boolean defaultFlag;
  25 + @NotNull(message = "经度")
  26 + private Double garLongitude;
  27 + @NotNull(message = "纬度")
  28 + private Double garLatitude;
  29 + private String garCoordinate;
  30 +
  31 + public Double getGarLatitude() {
  32 + return garLatitude;
  33 + }
  34 +
  35 + public void setGarLatitude(Double garLatitude) {
  36 + this.garLatitude = garLatitude;
  37 + }
  38 +
  39 + public String getGarCoordinate() {
  40 + return garCoordinate;
  41 + }
  42 +
  43 + public void setGarCoordinate(String garCoordinate) {
  44 + this.garCoordinate = garCoordinate;
  45 + }
  46 +
  47 + public Double getGarLongitude() {
  48 + return garLongitude;
  49 + }
  50 +
  51 + public void setGarLongitude(Double garLongitude) {
  52 + this.garLongitude = garLongitude;
  53 + }
  54 +
25 55 public String getGarAddressId() {
26 56 return garAddressId;
27 57 }
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderDto.java
  View file @d9491a6
... ... @@ -4,6 +4,7 @@ import lombok.Data;
4 4  
5 5 import javax.validation.constraints.NotBlank;
6 6 import javax.validation.constraints.NotEmpty;
  7 +import javax.validation.constraints.NotNull;
7 8 import java.util.List;
8 9  
9 10 /**
... ... @@ -19,6 +20,15 @@ public class OrderDto {
19 20 */
20 21 @NotBlank(message = "地址不能为空")
21 22 private String garOrderAddress;
  23 +
  24 + @NotNull(message = "经度")
  25 + private Double garLongitude;
  26 + @NotNull(message = "纬度")
  27 + private Double garLatitude;
  28 + /**
  29 + * 坐标系
  30 + */
  31 + private String garCoordinate;
22 32 /**
23 33 * 图片列表
24 34 */
... ... @@ -200,5 +210,48 @@ public class OrderDto {
200 210 this.garRemark = garRemark;
201 211 }
202 212  
  213 + public Double getGarLongitude() {
  214 + return garLongitude;
  215 + }
  216 +
  217 + public void setGarLongitude(Double garLongitude) {
  218 + this.garLongitude = garLongitude;
  219 + }
  220 +
  221 + public Double getGarLatitude() {
  222 + return garLatitude;
  223 + }
203 224  
  225 + public void setGarLatitude(Double garLatitude) {
  226 + this.garLatitude = garLatitude;
  227 + }
  228 +
  229 + public String getGarCoordinate() {
  230 + return garCoordinate;
  231 + }
  232 +
  233 + public void setGarCoordinate(String garCoordinate) {
  234 + this.garCoordinate = garCoordinate;
  235 + }
  236 +
  237 + @Override
  238 + public String toString() {
  239 + return "OrderDto{" +
  240 + "garOrderAddress='" + garOrderAddress + '\'' +
  241 + ", garLongitude=" + garLongitude +
  242 + ", garLatitude=" + garLatitude +
  243 + ", garCoordinate='" + garCoordinate + '\'' +
  244 + ", imageUrls=" + imageUrls +
  245 + ", garOrderAddressDetails='" + garOrderAddressDetails + '\'' +
  246 + ", garOrderContactName='" + garOrderContactName + '\'' +
  247 + ", garOrderTrashType='" + garOrderTrashType + '\'' +
  248 + ", garOrderContactTel='" + garOrderContactTel + '\'' +
  249 + ", garOrderCompanyId='" + garOrderCompanyId + '\'' +
  250 + ", garOrderCompanyName='" + garOrderCompanyName + '\'' +
  251 + ", garOrderCompanyTel='" + garOrderCompanyTel + '\'' +
  252 + ", garOrderAgreementTime='" + garOrderAgreementTime + '\'' +
  253 + ", garRemark='" + garRemark + '\'' +
  254 + ", garCarInfoList=" + garCarInfoList +
  255 + '}';
  256 + }
204 257 }
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
  View file @d9491a6
... ... @@ -62,6 +62,19 @@ public class OrderDetailVo {
62 62 private String garOrderAddressDetails;
63 63  
64 64 /**
  65 + * 经度
  66 + */
  67 + private Double garLongitude;
  68 + /**
  69 + * 纬度
  70 + */
  71 + private Double garLatitude;
  72 + /**
  73 + * 坐标系
  74 + */
  75 + private String garCoordinate;
  76 +
  77 + /**
65 78 * 订单姓名
66 79 */
67 80 private String garOrderContactName;
... ... @@ -137,39 +150,6 @@ public class OrderDetailVo {
137 150 this.garHandlerEvaluateFlag = GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue();
138 151 }
139 152  
140   - @Override
141   - public String toString() {
142   - return "OrderDetailVo{" +
143   - "garCancelFlag=" + garCancelFlag +
144   - ", garReason='" + garReason + '\'' +
145   - ", garOrderHandlerId='" + garOrderHandlerId + '\'' +
146   - ", garEvaluateFlag=" + garEvaluateFlag +
147   - ", garHandlerEvaluateFlag=" + garHandlerEvaluateFlag +
148   - ", garOrderHandleName='" + garOrderHandleName + '\'' +
149   - ", garOrderHandleTel='" + garOrderHandleTel + '\'' +
150   - ", garOrderAddress='" + garOrderAddress + '\'' +
151   - ", currentImages=" + currentImages +
152   - ", putOnImages=" + putOnImages +
153   - ", putDownImages=" + putDownImages +
154   - ", garOrderAddressDetails='" + garOrderAddressDetails + '\'' +
155   - ", garOrderContactName='" + garOrderContactName + '\'' +
156   - ", garOrderTrashType='" + garOrderTrashType + '\'' +
157   - ", garCarInfoList=" + garCarInfoList +
158   - ", garOrderHandlerStatus=" + garOrderHandlerStatus +
159   - ", garCreateTime=" + garCreateTime +
160   - ", garOrderContactTel='" + garOrderContactTel + '\'' +
161   - ", garOrderCompanyId='" + garOrderCompanyId + '\'' +
162   - ", garOrderCompanyName='" + garOrderCompanyName + '\'' +
163   - ", garOrderCompanyTel='" + garOrderCompanyTel + '\'' +
164   - ", garOrderAgreementTime='" + garOrderAgreementTime + '\'' +
165   - ", garRemark='" + garRemark + '\'' +
166   - ", handleFlag=" + handleFlag +
167   - ", garOrderMatchFlag=" + garOrderMatchFlag +
168   - ", garOrderStatus=" + garOrderStatus +
169   - ", garHandlerCarCode='" + garHandlerCarCode + '\'' +
170   - '}';
171   - }
172   -
173 153  
174 154 public String getGarHandlerCarCode() {
175 155 return garHandlerCarCode;
... ... @@ -391,4 +371,63 @@ public class OrderDetailVo {
391 371 }
392 372  
393 373  
  374 + public Double getGarLongitude() {
  375 + return garLongitude;
  376 + }
  377 +
  378 + public void setGarLongitude(Double garLongitude) {
  379 + this.garLongitude = garLongitude;
  380 + }
  381 +
  382 + public Double getGarLatitude() {
  383 + return garLatitude;
  384 + }
  385 +
  386 + public void setGarLatitude(Double garLatitude) {
  387 + this.garLatitude = garLatitude;
  388 + }
  389 +
  390 + public String getGarCoordinate() {
  391 + return garCoordinate;
  392 + }
  393 +
  394 + public void setGarCoordinate(String garCoordinate) {
  395 + this.garCoordinate = garCoordinate;
  396 + }
  397 +
  398 + @Override
  399 + public String toString() {
  400 + return "OrderDetailVo{" +
  401 + "garCancelFlag=" + garCancelFlag +
  402 + ", garReason='" + garReason + '\'' +
  403 + ", garOrderHandlerId='" + garOrderHandlerId + '\'' +
  404 + ", garEvaluateFlag=" + garEvaluateFlag +
  405 + ", garHandlerEvaluateFlag=" + garHandlerEvaluateFlag +
  406 + ", garOrderHandleName='" + garOrderHandleName + '\'' +
  407 + ", garOrderHandleTel='" + garOrderHandleTel + '\'' +
  408 + ", garOrderAddress='" + garOrderAddress + '\'' +
  409 + ", currentImages=" + currentImages +
  410 + ", putOnImages=" + putOnImages +
  411 + ", putDownImages=" + putDownImages +
  412 + ", garOrderAddressDetails='" + garOrderAddressDetails + '\'' +
  413 + ", garLongitude=" + garLongitude +
  414 + ", garLatitude=" + garLatitude +
  415 + ", garCoordinate='" + garCoordinate + '\'' +
  416 + ", garOrderContactName='" + garOrderContactName + '\'' +
  417 + ", garOrderTrashType='" + garOrderTrashType + '\'' +
  418 + ", garCarInfoList=" + garCarInfoList +
  419 + ", garOrderHandlerStatus=" + garOrderHandlerStatus +
  420 + ", garCreateTime=" + garCreateTime +
  421 + ", garOrderContactTel='" + garOrderContactTel + '\'' +
  422 + ", garOrderCompanyId='" + garOrderCompanyId + '\'' +
  423 + ", garOrderCompanyName='" + garOrderCompanyName + '\'' +
  424 + ", garOrderCompanyTel='" + garOrderCompanyTel + '\'' +
  425 + ", garOrderAgreementTime='" + garOrderAgreementTime + '\'' +
  426 + ", garRemark='" + garRemark + '\'' +
  427 + ", handleFlag=" + handleFlag +
  428 + ", garOrderMatchFlag=" + garOrderMatchFlag +
  429 + ", garOrderStatus=" + garOrderStatus +
  430 + ", garHandlerCarCode='" + garHandlerCarCode + '\'' +
  431 + '}';
  432 + }
394 433 }
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
  View file @d9491a6
... ... @@ -210,6 +210,9 @@ public class GarUserServiceImpl extends ServiceImpl<GarUserMapper, GarUser>
210 210 address.setGarUserContactName(dto.getContactPerson());
211 211 address.setGarUserContactTel(dto.getContactIphoneNumber());
212 212 address.setGarRemark(dto.getAddressDetail());
  213 + address.setGarLongitude(dto.getGarLongitude());
  214 + address.setGarLatitude(dto.getGarLatitude());
  215 + address.setGarCoordinate(dto.getGarCoordinate());
213 216 handleCurrentAddress(address);
214 217 garAddressService.save(address);
215 218 return "新增地址成功!";
... ...
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
  View file @d9491a6
... ... @@ -28,6 +28,9 @@
28 28 <result property="garEvaluateFlag" column="gar_evaluate_flag" jdbcType="TINYINT"/>
29 29 <result property="garHandlerEvaluateFlag" column="gar_handler_evaluate_flag" jdbcType="TINYINT"/>
30 30 <result property="garOrderMatchFlag" column="gar_order_match_flag" jdbcType="TINYINT"/>
  31 + <result property="garLatitude" column="gar_latitude" jdbcType="DOUBLE"/>
  32 + <result property="garLongitude" column="gar_longitude" jdbcType="DOUBLE"/>
  33 + <result property="garCoordinate" column="gar_coordinate" jdbcType="DOUBLE"/>
31 34 </resultMap>
32 35  
33 36 <sql id="Base_Column_List">
... ... @@ -38,7 +41,7 @@
38 41 gar_order_company_name,gar_order_company_tel,gar_order_handler_status,
39 42 gar_order_agreement_time,gar_create_time,gar_update_time,
40 43 gar_create_by,gar_update_by,gar_remark,gar_reason,gar_cancel_flag,
41   - gar_evaluate_flag,gar_handler_evaluate_flag,gar_order_match_flag
  44 + gar_evaluate_flag,gar_handler_evaluate_flag,gar_order_match_flag,gar_coordinate,gar_longitude,gar_latitude
42 45 </sql>
43 46 <select id="queryCleanNumberByEnterpriseIds" resultType="com.trash.garbage.pojo.domain.GarOrder">
44 47 select gar_order_company_id, count(gar_order_company_id) as count
... ... @@ -52,9 +55,9 @@
52 55 </select>
53 56 <select id="queryOrderListByTelWithType" resultType="com.trash.garbage.pojo.vo.GarOrderDriverVo">
54 57 SELECT
55   - `order`.gar_order_id ,`order`.gar_order_user_id,`order`.gar_order_handler_id,
56   - `order`.gar_order_address,`order`.gar_order_address_details,`order`.gar_order_contact_name,
57   - `order`.gar_order_trash_type,`order`.gar_order_contact_tel,`order`.gar_order_company_id,
  58 + `order`.gar_order_id ,`order`.gar_order_user_id,`order`.gar_order_handler_id,`order`.gar_coordinate,
  59 + `order`.gar_order_address,`order`.gar_order_address_details,`order`.gar_order_contact_name,`order`.gar_longitude,
  60 + `order`.gar_order_trash_type,`order`.gar_order_contact_tel,`order`.gar_order_company_id,`order`.gar_latitude,
58 61 `order`.gar_order_company_name,`order`.gar_order_company_tel,`order`.gar_order_match_flag,
59 62 `order`.gar_order_agreement_time,`order`.gar_remark,`order`.gar_handler_evaluate_flag,`order`.gar_order_handler_status gar_order_status,
60 63 `handler`.gar_order_status gar_order_handler_status,`handler`.gar_cancel_flag,`handler`.gar_reason
... ...