youxiw2000 / trash · Commits

Commit 10c0daf3f09bd77d20c9b29cebc57db6887b8533

Authored by guzijian
1 parent 8914b3bd
build: skipped

feat: 清运上传进度。

Inline Side-by-side
Showing 20 changed files with 867 additions and 409 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
  View file @10c0daf
... ... @@ -18,8 +18,12 @@ import com.trash.garbage.custom.BizException;
18 18 import com.trash.garbage.global.Result;
19 19 import com.trash.garbage.global.ResultCode;
20 20 import com.trash.garbage.pojo.domain.GarOrder;
  21 +import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
21 22 import com.trash.garbage.pojo.dto.*;
  23 +import com.trash.garbage.pojo.vo.GarOrderMatchAskVo;
  24 +import com.trash.garbage.pojo.vo.OrderDetailTransportVo;
22 25 import com.trash.garbage.pojo.vo.OrderDetailVo;
  26 +import com.trash.garbage.pojo.vo.ScanDriverDetailVo;
23 27 import com.trash.garbage.service.GarOrderService;
24 28 import org.springframework.beans.factory.annotation.Autowired;
25 29 import org.springframework.security.access.prepost.PreAuthorize;
... ... @@ -74,18 +78,40 @@ public class GarbageOrderController {
74 78 return Result.OK(garOrderService.queryOrderDetail(id));
75 79 }
76 80  
  81 +
  82 + @GetMapping("/detail/transport/{id}")
  83 + public Result<OrderDetailTransportVo> queryOrderTransportDetail(@PathVariable("id") String id) {
  84 + return Result.OK(garOrderService.queryOrderTransportDetail(id));
  85 + }
  86 +
77 87 @PutMapping("/update")
78 88 @Log(title = "修改订单状态", businessType = BusinessType.UPDATE)
79 89 public Result<String> updateOrder(@RequestBody OrderUpdateDto dto) {
80 90 return Result.OK(garOrderService.updateOrder(dto));
81 91 }
82 92  
  93 + @PostMapping("/askTransport")
  94 + @Log(title = "确认趟次", businessType = BusinessType.INSERT)
  95 + public Result<String> askTransport(@Validated @RequestBody AskTransportDto dto) {
  96 + return Result.OK(garOrderService.askTransport(dto));
  97 + }
  98 +
  99 + @GetMapping("/scan/detail/{askId}")
  100 + @Log(title = "确认趟次", businessType = BusinessType.INSERT)
  101 + public Result<GarOrderMatchAskVo> scanDetail(@PathVariable("askId")String askId) {
  102 + return Result.OK(garOrderService.scanDetail(askId));
  103 + }
  104 +
83 105 @PostMapping("/evaluate")
84 106 @Log(title = "用户评价", businessType = BusinessType.INSERT)
85 107 public Result<String> evaluateOrder(@Validated @RequestBody EvaluateDto dto) {
86 108 return Result.OK(garOrderService.evaluateOrder(dto));
87 109 }
88 110  
  111 + @GetMapping("/check/code/{validCode}")
  112 + public Result<ScanDriverDetailVo> checkValidCode(@PathVariable("validCode") String validCode) {
  113 + return Result.OK(garOrderService.checkValidCode(validCode));
  114 + }
89 115  
90 116 @GetMapping("/query/list")
91 117 public Result<?> queryOrderList(@RequestParam("type") Integer type, @RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize) {
... ... @@ -160,7 +186,7 @@ public class GarbageOrderController {
160 186 }
161 187  
162 188 @GetMapping("/search/history")
163   - public Result<?> querySearchHistory(){
  189 + public Result<?> querySearchHistory() {
164 190 return Result.OK(garOrderService.querySearchHistory());
165 191 }
166 192  
... ...
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMapper.java
  View file @10c0daf
... ... @@ -2,7 +2,10 @@ package com.trash.garbage.mapper;
2 2  
3 3 import com.trash.garbage.pojo.domain.GarOrder;
4 4 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  5 +import com.trash.garbage.pojo.vo.GarOrderDisposalVo;
5 6 import com.trash.garbage.pojo.vo.GarOrderDriverVo;
  7 +import com.trash.garbage.pojo.vo.OrderDetailTransportVo;
  8 +import com.trash.garbage.pojo.vo.ScanDriverDetailVo;
6 9 import org.apache.ibatis.annotations.Param;
7 10  
8 11 import java.util.List;
... ... @@ -17,9 +20,16 @@ public interface GarOrderMapper extends BaseMapper&lt;GarOrder&gt; {
17 20  
18 21 List<GarOrder> queryCleanNumberByEnterpriseIds(@Param("list") List<Long> list,@Param("status") Integer value);
19 22  
20   - List<GarOrderDriverVo> queryOrderListByTelWithType(@Param("garUserTel") String garUserTel, @Param("type") Integer type, @Param("cancelFlag") Integer cancelFlag);
  23 + List<GarOrderDriverVo> queryDriverOrderListByTelWithType(@Param("garUserTel") String garUserTel, @Param("type") Integer type, @Param("cancelFlag") Integer cancelFlag);
21 24  
22 25 GarOrderDriverVo queryOrderByTelWithType(@Param("garUserTel") String garUserTel, @Param("orderId") String orderId, @Param("cancelFlag") Integer value);
  26 +
  27 + List<GarOrderDisposalVo> queryDisposalOrderListByTelWithType(@Param("garUserTel") String garUserTel, @Param("type") Integer type, @Param("cancelFlag") Integer value);
  28 +
  29 + ScanDriverDetailVo queryDriverDetailByTelWithOrderId(@Param("garUserTel") String tel,@Param("orderId") String orderId);
  30 +
  31 + OrderDetailTransportVo queryOrderTransportDetail(@Param("orderId") String id);
  32 +
23 33 }
24 34  
25 35  
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
  View file @10c0daf
... ... @@ -36,10 +36,6 @@ public class GarOrder implements Serializable {
36 36 @JsonIgnore
37 37 private String garOrderUserId;
38 38  
39   - /**
40   - * 负责处理人id
41   - */
42   - private String garOrderHandlerId;
43 39  
44 40 /**
45 41 * 订单地址
... ... @@ -208,17 +204,6 @@ public class GarOrder implements Serializable {
208 204 this.garOrderUserId = garOrderUserId;
209 205 }
210 206  
211   -
212   - public String getGarOrderHandlerId() {
213   - return garOrderHandlerId;
214   - }
215   -
216   -
217   - public void setGarOrderHandlerId(String garOrderHandlerId) {
218   - this.garOrderHandlerId = garOrderHandlerId;
219   - }
220   -
221   -
222 207 public String getGarOrderAddress() {
223 208 return garOrderAddress;
224 209 }
... ... @@ -438,37 +423,4 @@ public class GarOrder implements Serializable {
438 423 this.garRealCarCount = garRealCarCount;
439 424 }
440 425  
441   - @Override
442   - public String toString() {
443   - return "GarOrder{" +
444   - "garOrderId='" + garOrderId + '\'' +
445   - ", count=" + count +
446   - ", garOrderUserId='" + garOrderUserId + '\'' +
447   - ", garOrderHandlerId='" + garOrderHandlerId + '\'' +
448   - ", garOrderAddress='" + garOrderAddress + '\'' +
449   - ", garOrderAddressDetails='" + garOrderAddressDetails + '\'' +
450   - ", garOrderContactName='" + garOrderContactName + '\'' +
451   - ", garOrderTrashType='" + garOrderTrashType + '\'' +
452   - ", garOrderContactTel='" + garOrderContactTel + '\'' +
453   - ", garOrderCompanyId='" + garOrderCompanyId + '\'' +
454   - ", garOrderCompanyName='" + garOrderCompanyName + '\'' +
455   - ", garOrderCompanyTel='" + garOrderCompanyTel + '\'' +
456   - ", garOrderHandlerStatus=" + garOrderHandlerStatus +
457   - ", realCarCount=" + garRealCarCount +
458   - ", garOrderAgreementTime='" + garOrderAgreementTime + '\'' +
459   - ", garCreateTime=" + garCreateTime +
460   - ", garUpdateTime=" + garUpdateTime +
461   - ", garCreateBy='" + garCreateBy + '\'' +
462   - ", garUpdateBy='" + garUpdateBy + '\'' +
463   - ", garRemark='" + garRemark + '\'' +
464   - ", garCancelFlag=" + garCancelFlag +
465   - ", garOrderMatchFlag=" + garOrderMatchFlag +
466   - ", garLongitude=" + garLongitude +
467   - ", garLatitude=" + garLatitude +
468   - ", garCoordinate='" + garCoordinate + '\'' +
469   - ", garEvaluateFlag=" + garEvaluateFlag +
470   - ", garHandlerEvaluateFlag=" + garHandlerEvaluateFlag +
471   - ", garReason='" + garReason + '\'' +
472   - '}';
473   - }
474 426 }
475 427 \ No newline at end of file
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderImage.java
  View file @10c0daf
... ... @@ -68,7 +68,7 @@ public class GarOrderImage implements Serializable {
68 68 private String garUpdateBy;
69 69  
70 70 /**
71   - * 备注
  71 + * gar_ask_id
72 72 */
73 73 private String garRemark;
74 74  
... ... @@ -146,10 +146,6 @@ public class GarOrderImage implements Serializable {
146 146 public void setGarRemark(String garRemark) {
147 147 this.garRemark = garRemark;
148 148 }
149   -
150   - public static long getSerialversionuid() {
151   - return serialVersionUID;
152   - }
153 149  
154 150  
155 151  
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java
  View file @10c0daf
... ... @@ -7,13 +7,16 @@ import com.baomidou.mybatisplus.annotation.TableName;
7 7 import java.io.Serializable;
8 8 import java.util.Date;
9 9 import lombok.Data;
  10 +import lombok.EqualsAndHashCode;
  11 +import lombok.ToString;
10 12  
11 13 /**
12 14 * 匹配处理场所人员表
13 15 * @TableName gar_order_match_ask
14 16 */
15 17 @TableName(value ="gar_order_match_ask")
16   -@Data
  18 +@EqualsAndHashCode
  19 +@ToString
17 20 public class GarOrderMatchAsk implements Serializable {
18 21 /**
19 22 *
... ... @@ -46,6 +49,10 @@ public class GarOrderMatchAsk implements Serializable {
46 49 */
47 50 private String garOrderHandlerCompanyName;
48 51  
  52 + private String garHandlerCarCode;
  53 +
  54 + private String garOrderHandlerId;
  55 +
49 56 /**
50 57 *
51 58 */
... ... @@ -78,70 +85,6 @@ public class GarOrderMatchAsk implements Serializable {
78 85 @TableField(exist = false)
79 86 private static final long serialVersionUID = 1L;
80 87  
81   - @Override
82   - public boolean equals(Object that) {
83   - if (this == that) {
84   - return true;
85   - }
86   - if (that == null) {
87   - return false;
88   - }
89   - if (getClass() != that.getClass()) {
90   - return false;
91   - }
92   - GarOrderMatchAsk other = (GarOrderMatchAsk) that;
93   - return (this.getGarId() == null ? other.getGarId() == null : this.getGarId().equals(other.getGarId()))
94   - && (this.getGarOrderId() == null ? other.getGarOrderId() == null : this.getGarOrderId().equals(other.getGarOrderId()))
95   - && (this.getGarOrderHandlerTel() == null ? other.getGarOrderHandlerTel() == null : this.getGarOrderHandlerTel().equals(other.getGarOrderHandlerTel()))
96   - && (this.getGarOrderHandlerName() == null ? other.getGarOrderHandlerName() == null : this.getGarOrderHandlerName().equals(other.getGarOrderHandlerName()))
97   - && (this.getGarOrderHandlerCompanyId() == null ? other.getGarOrderHandlerCompanyId() == null : this.getGarOrderHandlerCompanyId().equals(other.getGarOrderHandlerCompanyId()))
98   - && (this.getGarOrderHandlerCompanyName() == null ? other.getGarOrderHandlerCompanyName() == null : this.getGarOrderHandlerCompanyName().equals(other.getGarOrderHandlerCompanyName()))
99   - && (this.getGarCreateTime() == null ? other.getGarCreateTime() == null : this.getGarCreateTime().equals(other.getGarCreateTime()))
100   - && (this.getGarUpdateTime() == null ? other.getGarUpdateTime() == null : this.getGarUpdateTime().equals(other.getGarUpdateTime()))
101   - && (this.getGarCreateBy() == null ? other.getGarCreateBy() == null : this.getGarCreateBy().equals(other.getGarCreateBy()))
102   - && (this.getGarUpdateBy() == null ? other.getGarUpdateBy() == null : this.getGarUpdateBy().equals(other.getGarUpdateBy()))
103   - && (this.getGarRemark() == null ? other.getGarRemark() == null : this.getGarRemark().equals(other.getGarRemark()));
104   - }
105   -
106   - @Override
107   - public int hashCode() {
108   - final int prime = 31;
109   - int result = 1;
110   - result = prime * result + ((getGarId() == null) ? 0 : getGarId().hashCode());
111   - result = prime * result + ((getGarOrderId() == null) ? 0 : getGarOrderId().hashCode());
112   - result = prime * result + ((getGarOrderHandlerTel() == null) ? 0 : getGarOrderHandlerTel().hashCode());
113   - result = prime * result + ((getGarOrderHandlerName() == null) ? 0 : getGarOrderHandlerName().hashCode());
114   - result = prime * result + ((getGarOrderHandlerCompanyId() == null) ? 0 : getGarOrderHandlerCompanyId().hashCode());
115   - result = prime * result + ((getGarOrderHandlerCompanyName() == null) ? 0 : getGarOrderHandlerCompanyName().hashCode());
116   - result = prime * result + ((getGarCreateTime() == null) ? 0 : getGarCreateTime().hashCode());
117   - result = prime * result + ((getGarUpdateTime() == null) ? 0 : getGarUpdateTime().hashCode());
118   - result = prime * result + ((getGarCreateBy() == null) ? 0 : getGarCreateBy().hashCode());
119   - result = prime * result + ((getGarUpdateBy() == null) ? 0 : getGarUpdateBy().hashCode());
120   - result = prime * result + ((getGarRemark() == null) ? 0 : getGarRemark().hashCode());
121   - return result;
122   - }
123   -
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(", garId=").append(garId);
131   - sb.append(", garOrderId=").append(garOrderId);
132   - sb.append(", garOrderHandlerTel=").append(garOrderHandlerTel);
133   - sb.append(", garOrderHandlerName=").append(garOrderHandlerName);
134   - sb.append(", garOrderHandlerCompanyId=").append(garOrderHandlerCompanyId);
135   - sb.append(", garOrderHandlerCompanyName=").append(garOrderHandlerCompanyName);
136   - sb.append(", garCreateTime=").append(garCreateTime);
137   - sb.append(", garUpdateTime=").append(garUpdateTime);
138   - sb.append(", garCreateBy=").append(garCreateBy);
139   - sb.append(", garUpdateBy=").append(garUpdateBy);
140   - sb.append(", garRemark=").append(garRemark);
141   - sb.append(", serialVersionUID=").append(serialVersionUID);
142   - sb.append("]");
143   - return sb.toString();
144   - }
145 88  
146 89 public String getGarId() {
147 90 return garId;
... ... @@ -230,4 +173,20 @@ public class GarOrderMatchAsk implements Serializable {
230 173 public void setGarRemark(String garRemark) {
231 174 this.garRemark = garRemark;
232 175 }
  176 +
  177 + public String getGarHandlerCarCode() {
  178 + return garHandlerCarCode;
  179 + }
  180 +
  181 + public void setGarHandlerCarCode(String garHandlerCarCode) {
  182 + this.garHandlerCarCode = garHandlerCarCode;
  183 + }
  184 +
  185 + public String getGarOrderHandlerId() {
  186 + return garOrderHandlerId;
  187 + }
  188 +
  189 + public void setGarOrderHandlerId(String garOrderHandlerId) {
  190 + this.garOrderHandlerId = garOrderHandlerId;
  191 + }
233 192 }
234 193 \ No newline at end of file
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchDisposal.java
  View file @10c0daf
... ... @@ -7,13 +7,18 @@ import com.baomidou.mybatisplus.annotation.TableName;
7 7 import java.io.Serializable;
8 8 import java.util.Date;
9 9 import lombok.Data;
  10 +import lombok.EqualsAndHashCode;
  11 +import lombok.ToString;
  12 +import org.apache.commons.lang3.builder.EqualsBuilder;
  13 +import org.apache.commons.lang3.builder.HashCodeBuilder;
10 14  
11 15 /**
12 16 * 派单分发处理场所表
13 17 * @TableName gar_order_match_dispotal
14 18 */
15 19 @TableName(value ="gar_order_match_disposal")
16   -@Data
  20 +@EqualsAndHashCode
  21 +@ToString
17 22 public class GarOrderMatchDisposal implements Serializable {
18 23 /**
19 24 * 主键
... ... @@ -25,6 +30,10 @@ public class GarOrderMatchDisposal implements Serializable {
25 30 * 订单id
26 31 */
27 32 private String garOrderId;
  33 + /**
  34 + * 处理场所用户id
  35 + */
  36 + private String garOrderDisposalId;
28 37  
29 38 /**
30 39 * 处理场所负责人人手机号
... ... @@ -45,6 +54,9 @@ public class GarOrderMatchDisposal implements Serializable {
45 54 * 公司名
46 55 */
47 56 private String garOrderDisposalCompanyName;
  57 + private Integer garOrderDisposalStatus;
  58 +
  59 +
48 60  
49 61 /**
50 62 *
... ... @@ -78,70 +90,7 @@ public class GarOrderMatchDisposal implements Serializable {
78 90 @TableField(exist = false)
79 91 private static final long serialVersionUID = 1L;
80 92  
81   - @Override
82   - public boolean equals(Object that) {
83   - if (this == that) {
84   - return true;
85   - }
86   - if (that == null) {
87   - return false;
88   - }
89   - if (getClass() != that.getClass()) {
90   - return false;
91   - }
92   - GarOrderMatchDisposal other = (GarOrderMatchDisposal) that;
93   - return (this.getGarId() == null ? other.getGarId() == null : this.getGarId().equals(other.getGarId()))
94   - && (this.getGarOrderId() == null ? other.getGarOrderId() == null : this.getGarOrderId().equals(other.getGarOrderId()))
95   - && (this.getGarOrderDisposalTel() == null ? other.getGarOrderDisposalTel() == null : this.getGarOrderDisposalTel().equals(other.getGarOrderDisposalTel()))
96   - && (this.getGarOrderDisposalName() == null ? other.getGarOrderDisposalName() == null : this.getGarOrderDisposalName().equals(other.getGarOrderDisposalName()))
97   - && (this.getGarOrderDisposalCompanyId() == null ? other.getGarOrderDisposalCompanyId() == null : this.getGarOrderDisposalCompanyId().equals(other.getGarOrderDisposalCompanyId()))
98   - && (this.getGarOrderDisposalCompanyName() == null ? other.getGarOrderDisposalCompanyName() == null : this.getGarOrderDisposalCompanyName().equals(other.getGarOrderDisposalCompanyName()))
99   - && (this.getGarCreateTime() == null ? other.getGarCreateTime() == null : this.getGarCreateTime().equals(other.getGarCreateTime()))
100   - && (this.getGarUpdateTime() == null ? other.getGarUpdateTime() == null : this.getGarUpdateTime().equals(other.getGarUpdateTime()))
101   - && (this.getGarCreateBy() == null ? other.getGarCreateBy() == null : this.getGarCreateBy().equals(other.getGarCreateBy()))
102   - && (this.getGarUpdateBy() == null ? other.getGarUpdateBy() == null : this.getGarUpdateBy().equals(other.getGarUpdateBy()))
103   - && (this.getGarReason() == null ? other.getGarReason() == null : this.getGarReason().equals(other.getGarReason()));
104   - }
105   -
106   - @Override
107   - public int hashCode() {
108   - final int prime = 31;
109   - int result = 1;
110   - result = prime * result + ((getGarId() == null) ? 0 : getGarId().hashCode());
111   - result = prime * result + ((getGarOrderId() == null) ? 0 : getGarOrderId().hashCode());
112   - result = prime * result + ((getGarOrderDisposalTel() == null) ? 0 : getGarOrderDisposalTel().hashCode());
113   - result = prime * result + ((getGarOrderDisposalName() == null) ? 0 : getGarOrderDisposalName().hashCode());
114   - result = prime * result + ((getGarOrderDisposalCompanyId() == null) ? 0 : getGarOrderDisposalCompanyId().hashCode());
115   - result = prime * result + ((getGarOrderDisposalCompanyName() == null) ? 0 : getGarOrderDisposalCompanyName().hashCode());
116   - result = prime * result + ((getGarCreateTime() == null) ? 0 : getGarCreateTime().hashCode());
117   - result = prime * result + ((getGarUpdateTime() == null) ? 0 : getGarUpdateTime().hashCode());
118   - result = prime * result + ((getGarCreateBy() == null) ? 0 : getGarCreateBy().hashCode());
119   - result = prime * result + ((getGarUpdateBy() == null) ? 0 : getGarUpdateBy().hashCode());
120   - result = prime * result + ((getGarReason() == null) ? 0 : getGarReason().hashCode());
121   - return result;
122   - }
123   -
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(", garId=").append(garId);
131   - sb.append(", garOrderId=").append(garOrderId);
132   - sb.append(", garOrderDisposalTel=").append(garOrderDisposalTel);
133   - sb.append(", garOrderDisposalName=").append(garOrderDisposalName);
134   - sb.append(", garOrderDisposalCompanyId=").append(garOrderDisposalCompanyId);
135   - sb.append(", garOrderDisposalCompanyName=").append(garOrderDisposalCompanyName);
136   - sb.append(", garCreateTime=").append(garCreateTime);
137   - sb.append(", garUpdateTime=").append(garUpdateTime);
138   - sb.append(", garCreateBy=").append(garCreateBy);
139   - sb.append(", garUpdateBy=").append(garUpdateBy);
140   - sb.append(", garReason=").append(garReason);
141   - sb.append(", serialVersionUID=").append(serialVersionUID);
142   - sb.append("]");
143   - return sb.toString();
144   - }
  93 +
145 94  
146 95 public String getGarId() {
147 96 return garId;
... ... @@ -230,4 +179,19 @@ public class GarOrderMatchDisposal implements Serializable {
230 179 public void setGarReason(String garReason) {
231 180 this.garReason = garReason;
232 181 }
  182 + public Integer getGarOrderDisposalStatus() {
  183 + return garOrderDisposalStatus;
  184 + }
  185 +
  186 + public void setGarOrderDisposalStatus(Integer garOrderDisposalStatus) {
  187 + this.garOrderDisposalStatus = garOrderDisposalStatus;
  188 + }
  189 +
  190 + public String getGarOrderDisposalId() {
  191 + return garOrderDisposalId;
  192 + }
  193 +
  194 + public void setGarOrderDisposalId(String garOrderDisposalId) {
  195 + this.garOrderDisposalId = garOrderDisposalId;
  196 + }
233 197 }
234 198 \ No newline at end of file
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchHandler.java
  View file @10c0daf
... ... @@ -16,7 +16,6 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
16 16 * @TableName gar_order_match_handler
17 17 */
18 18 @TableName(value ="gar_order_match_handler")
19   -@Data
20 19 public class GarOrderMatchHandler implements Serializable {
21 20 /**
22 21 * 主键
... ... @@ -33,6 +32,10 @@ public class GarOrderMatchHandler implements Serializable {
33 32 * 处理人手机号
34 33 */
35 34 private String garOrderHandlerTel;
  35 + /**
  36 + * 处理人id
  37 + */
  38 + private String garOrderHandlerId;
36 39  
37 40 /**
38 41 * 处理状态
... ... @@ -218,41 +221,11 @@ public class GarOrderMatchHandler implements Serializable {
218 221 this.garReason = garReason;
219 222 }
220 223  
221   -
222   - @Override
223   - public boolean equals(Object o) {
224   - if (this == o) return true;
225   -
226   - if (o == null || getClass() != o.getClass()) return false;
227   -
228   - GarOrderMatchHandler that = (GarOrderMatchHandler) o;
229   -
230   - return new EqualsBuilder().append(getGarId(), that.getGarId()).append(getGarOrderId(), that.getGarOrderId()).append(getGarOrderHandlerTel(), that.getGarOrderHandlerTel()).append(getGarOrderHandlerStatus(), that.getGarOrderHandlerStatus()).append(getGarOrderStatus(), that.getGarOrderStatus()).append(getGarOrderHandlerName(), that.getGarOrderHandlerName()).append(getGarOrderHandlerCompanyId(), that.getGarOrderHandlerCompanyId()).append(getGarOrderHandlerCompanyName(), that.getGarOrderHandlerCompanyName()).append(getGarCreateTime(), that.getGarCreateTime()).append(getGarUpdateTime(), that.getGarUpdateTime()).append(getGarCreateBy(), that.getGarCreateBy()).append(getGarUpdateBy(), that.getGarUpdateBy()).append(getGarReason(), that.getGarReason()).append(getGarCancelFlag(), that.getGarCancelFlag()).append(getGarHandlerCarCode(), that.getGarHandlerCarCode()).isEquals();
231   - }
232   -
233   - @Override
234   - public int hashCode() {
235   - return new HashCodeBuilder(17, 37).append(getGarId()).append(getGarOrderId()).append(getGarOrderHandlerTel()).append(getGarOrderHandlerStatus()).append(getGarOrderStatus()).append(getGarOrderHandlerName()).append(getGarOrderHandlerCompanyId()).append(getGarOrderHandlerCompanyName()).append(getGarCreateTime()).append(getGarUpdateTime()).append(getGarCreateBy()).append(getGarUpdateBy()).append(getGarReason()).append(getGarCancelFlag()).append(getGarHandlerCarCode()).toHashCode();
  224 + public String getGarOrderHandlerId() {
  225 + return garOrderHandlerId;
236 226 }
237 227  
238   - @Override
239   - public String toString() {
240   - return "GarOrderMatchHandler{" +
241   - "garId='" + garId + '\'' +
242   - ", garOrderId='" + garOrderId + '\'' +
243   - ", garOrderHandlerTel='" + garOrderHandlerTel + '\'' +
244   - ", garOrderHandlerStatus=" + garOrderHandlerStatus +
245   - ", garOrderStatus=" + garOrderStatus +
246   - ", garOrderHandlerName='" + garOrderHandlerName + '\'' +
247   - ", garOrderHandlerCompanyId='" + garOrderHandlerCompanyId + '\'' +
248   - ", garOrderHandlerCompanyName='" + garOrderHandlerCompanyName + '\'' +
249   - ", garCreateTime=" + garCreateTime +
250   - ", garUpdateTime=" + garUpdateTime +
251   - ", garCreateBy='" + garCreateBy + '\'' +
252   - ", garUpdateBy='" + garUpdateBy + '\'' +
253   - ", garRemark='" + garReason + '\'' +
254   - ", garCancelFlag=" + garCancelFlag +
255   - ", garHandlerCarCode='" + garHandlerCarCode + '\'' +
256   - '}';
  228 + public void setGarOrderHandlerId(String garOrderHandlerId) {
  229 + this.garOrderHandlerId = garOrderHandlerId;
257 230 }
258 231 }
259 232 \ No newline at end of file
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/AskTransportDto.java 0 → 100644
  View file @10c0daf
  1 +package com.trash.garbage.pojo.dto;
  2 +
  3 +import lombok.EqualsAndHashCode;
  4 +import lombok.ToString;
  5 +
  6 +import javax.validation.constraints.NotBlank;
  7 +import javax.validation.constraints.NotEmpty;
  8 +import java.util.List;
  9 +
  10 +/**
  11 + * @author 20412
  12 + */
  13 +@ToString
  14 +@EqualsAndHashCode
  15 +public class AskTransportDto {
  16 + @NotBlank(message = "订单号不能为空")
  17 + private String garOrderId;
  18 + @NotBlank(message = "驾驶员id为不能为空")
  19 + private String garOrderHandlerId;
  20 + @NotBlank(message = "垃圾类型不能为空")
  21 + private String garOrderTrashType;
  22 + @NotBlank(message = "车牌号不能为空")
  23 + private String garHandlerCarCode;
  24 + private String garOrderHandlerName;
  25 + @NotBlank(message = "company不能为空")
  26 + private String garOrderHandlerCompanyId;
  27 + @NotBlank(message = "company不能为空")
  28 + private String garOrderHandlerCompanyName;
  29 + @NotBlank(message = "驾驶员联系方式不能为空")
  30 + private String garOrderHandlerTel;
  31 + @NotBlank(message = "公司负责人联系方式不能为空")
  32 + private String garOrderCompanyTel;
  33 + @NotEmpty(message = "请上传全景图片")
  34 + private List<String> fillImageList;
  35 +
  36 + public String getGarOrderHandlerCompanyName() {
  37 + return garOrderHandlerCompanyName;
  38 + }
  39 +
  40 + public void setGarOrderHandlerCompanyName(String garOrderHandlerCompanyName) {
  41 + this.garOrderHandlerCompanyName = garOrderHandlerCompanyName;
  42 + }
  43 +
  44 + public List<String> getFillImageList() {
  45 + return fillImageList;
  46 + }
  47 +
  48 + public void setFillImageList(List<String> fillImageList) {
  49 + this.fillImageList = fillImageList;
  50 + }
  51 +
  52 + public String getGarOrderId() {
  53 + return garOrderId;
  54 + }
  55 +
  56 + public void setGarOrderId(String garOrderId) {
  57 + this.garOrderId = garOrderId;
  58 + }
  59 +
  60 + public String getGarOrderHandlerId() {
  61 + return garOrderHandlerId;
  62 + }
  63 +
  64 + public void setGarOrderHandlerId(String garOrderHandlerId) {
  65 + this.garOrderHandlerId = garOrderHandlerId;
  66 + }
  67 +
  68 + public String getGarOrderTrashType() {
  69 + return garOrderTrashType;
  70 + }
  71 +
  72 + public void setGarOrderTrashType(String garOrderTrashType) {
  73 + this.garOrderTrashType = garOrderTrashType;
  74 + }
  75 +
  76 + public String getGarHandlerCarCode() {
  77 + return garHandlerCarCode;
  78 + }
  79 +
  80 + public void setGarHandlerCarCode(String garHandlerCarCode) {
  81 + this.garHandlerCarCode = garHandlerCarCode;
  82 + }
  83 +
  84 + public String getGarOrderHandlerName() {
  85 + return garOrderHandlerName;
  86 + }
  87 +
  88 + public void setGarOrderHandlerName(String garOrderHandlerName) {
  89 + this.garOrderHandlerName = garOrderHandlerName;
  90 + }
  91 +
  92 + public String getGarOrderHandlerCompanyId() {
  93 + return garOrderHandlerCompanyId;
  94 + }
  95 +
  96 + public void setGarOrderHandlerCompanyId(String garOrderHandlerCompanyId) {
  97 + this.garOrderHandlerCompanyId = garOrderHandlerCompanyId;
  98 + }
  99 +
  100 + public String getGarOrderHandlerTel() {
  101 + return garOrderHandlerTel;
  102 + }
  103 +
  104 + public void setGarOrderHandlerTel(String garOrderHandlerTel) {
  105 + this.garOrderHandlerTel = garOrderHandlerTel;
  106 + }
  107 +
  108 + public String getGarOrderCompanyTel() {
  109 + return garOrderCompanyTel;
  110 + }
  111 +
  112 + public void setGarOrderCompanyTel(String garOrderCompanyTel) {
  113 + this.garOrderCompanyTel = garOrderCompanyTel;
  114 + }
  115 +}
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/DispatchDto.java
  View file @10c0daf
1 1 package com.trash.garbage.pojo.dto;
2 2  
3   -import lombok.Data;
4   -import org.apache.commons.lang3.builder.EqualsBuilder;
5   -import org.apache.commons.lang3.builder.HashCodeBuilder;
  3 +import lombok.EqualsAndHashCode;
  4 +import lombok.ToString;
6 5  
7 6 import java.util.List;
8 7  
9   -@Data
  8 +@ToString
  9 +@EqualsAndHashCode
10 10 public class DispatchDto {
11 11 private String garOrderId;
12 12 private List<DispatchDetail> dispatchList;
13 13  
14 14  
15   - @Data
  15 + @ToString
  16 + @EqualsAndHashCode
16 17 public static class DispatchDetail{
17 18 private String carCode;
18 19 private String tel;
19 20 private String name;
  21 + private String id;
  22 +
  23 + public String getId() {
  24 + return id;
  25 + }
  26 +
  27 + public void setId(String id) {
  28 + this.id = id;
  29 + }
20 30  
21 31 public String getCarCode() {
22 32 return carCode;
... ... @@ -42,35 +52,8 @@ public class DispatchDto {
42 52 this.name = name;
43 53 }
44 54  
45   - @Override
46   - public String toString() {
47   - return "DispatchDetail{" +
48   - "carCode='" + carCode + '\'' +
49   - ", tel='" + tel + '\'' +
50   - ", name='" + name + '\'' +
51   - '}';
52   - }
53   -
54   -
55   - @Override
56   - public boolean equals(Object o) {
57   - if (this == o) return true;
58   -
59   - if (o == null || getClass() != o.getClass()) return false;
60   -
61   - DispatchDetail that = (DispatchDetail) o;
62   -
63   - return new EqualsBuilder().append(getCarCode(), that.getCarCode()).append(getTel(), that.getTel()).append(getName(), that.getName()).isEquals();
64   - }
65   -
66   - @Override
67   - public int hashCode() {
68   - return new HashCodeBuilder(17, 37).append(getCarCode()).append(getTel()).append(getName()).toHashCode();
69   - }
70 55 }
71 56  
72   -
73   -
74 57 public String getGarOrderId() {
75 58 return garOrderId;
76 59 }
... ... @@ -88,27 +71,4 @@ public class DispatchDto {
88 71 }
89 72  
90 73  
91   - @Override
92   - public String toString() {
93   - return "DispatchDto{" +
94   - "garOrderId='" + garOrderId + '\'' +
95   - ", detailList=" + dispatchList +
96   - '}';
97   - }
98   -
99   - @Override
100   - public boolean equals(Object o) {
101   - if (this == o) return true;
102   -
103   - if (o == null || getClass() != o.getClass()) return false;
104   -
105   - DispatchDto that = (DispatchDto) o;
106   -
107   - return new EqualsBuilder().append(getGarOrderId(), that.getGarOrderId()).append(getDispatchList(), that.getDispatchList()).isEquals();
108   - }
109   -
110   - @Override
111   - public int hashCode() {
112   - return new HashCodeBuilder(17, 37).append(getGarOrderId()).append(getDispatchList()).toHashCode();
113   - }
114 74 }
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/DisposalDispatchDto.java
  View file @10c0daf
1 1 package com.trash.garbage.pojo.dto;
2 2  
3   -import lombok.Data;
4   -import org.apache.commons.lang3.builder.EqualsBuilder;
5   -import org.apache.commons.lang3.builder.HashCodeBuilder;
  3 +import lombok.EqualsAndHashCode;
  4 +import lombok.ToString;
6 5  
7 6 import java.util.List;
8 7  
9   -@Data
  8 +@EqualsAndHashCode
  9 +@ToString
10 10 public class DisposalDispatchDto {
11 11 private String garOrderId;
12 12 private List<DispatchDetail> dispatchList;
13 13  
14   -
15   - @Data
  14 + @ToString
  15 + @EqualsAndHashCode
16 16 public static class DispatchDetail{
17 17 private String tel;
18 18 private String name;
  19 + private String companyName;
  20 + private String companyId;
  21 + private String id;
  22 +
  23 + public String getId() {
  24 + return id;
  25 + }
  26 +
  27 + public void setId(String id) {
  28 + this.id = id;
  29 + }
  30 +
  31 + public String getCompanyId() {
  32 + return companyId;
  33 + }
  34 +
  35 + public void setCompanyId(String companyId) {
  36 + this.companyId = companyId;
  37 + }
  38 +
  39 + public String getCompanyName() {
  40 + return companyName;
  41 + }
19 42  
  43 + public void setCompanyName(String companyName) {
  44 + this.companyName = companyName;
  45 + }
20 46  
21 47 public String getTel() {
22 48 return tel;
... ... @@ -34,34 +60,8 @@ public class DisposalDispatchDto {
34 60 this.name = name;
35 61 }
36 62  
37   - @Override
38   - public String toString() {
39   - return "DispatchDetail{" +
40   - ", tel='" + tel + '\'' +
41   - ", name='" + name + '\'' +
42   - '}';
43   - }
44   -
45   -
46   - @Override
47   - public boolean equals(Object o) {
48   - if (this == o) return true;
49   -
50   - if (o == null || getClass() != o.getClass()) return false;
51   -
52   - DispatchDetail that = (DispatchDetail) o;
53   -
54   - return new EqualsBuilder().append(getTel(), that.getTel()).append(getName(), that.getName()).isEquals();
55   - }
56   -
57   - @Override
58   - public int hashCode() {
59   - return new HashCodeBuilder(17, 37).append(getTel()).append(getName()).toHashCode();
60   - }
61 63 }
62 64  
63   -
64   -
65 65 public String getGarOrderId() {
66 66 return garOrderId;
67 67 }
... ... @@ -79,27 +79,4 @@ public class DisposalDispatchDto {
79 79 }
80 80  
81 81  
82   - @Override
83   - public String toString() {
84   - return "DispatchDto{" +
85   - "garOrderId='" + garOrderId + '\'' +
86   - ", detailList=" + dispatchList +
87   - '}';
88   - }
89   -
90   - @Override
91   - public boolean equals(Object o) {
92   - if (this == o) return true;
93   -
94   - if (o == null || getClass() != o.getClass()) return false;
95   -
96   - DisposalDispatchDto that = (DisposalDispatchDto) o;
97   -
98   - return new EqualsBuilder().append(getGarOrderId(), that.getGarOrderId()).append(getDispatchList(), that.getDispatchList()).isEquals();
99   - }
100   -
101   - @Override
102   - public int hashCode() {
103   - return new HashCodeBuilder(17, 37).append(getGarOrderId()).append(getDispatchList()).toHashCode();
104   - }
105 82 }
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/DispatchDriverVo.java
  View file @10c0daf
... ... @@ -44,16 +44,7 @@ public class DispatchDriverVo {
44 44 private Boolean checked;
45 45  
46 46 private String garHandlerCarCode;
47   -
48   - @Override
49   - public String toString() {
50   - return "Personnel{" +
51   - "name='" + name + '\'' +
52   - ", tel='" + tel + '\'' +
53   - ", checked=" + checked +
54   - ", garHandlerCarCode='" + garHandlerCarCode + '\'' +
55   - '}';
56   - }
  47 + private String garId;
57 48  
58 49 public String getGarHandlerCarCode() {
59 50 return garHandlerCarCode;
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/GarOrderDisposalVo.java 0 → 100644
  View file @10c0daf
  1 +package com.trash.garbage.pojo.vo;
  2 +
  3 +import com.fasterxml.jackson.annotation.JsonFormat;
  4 +import com.trash.garbage.pojo.domain.GarOrder;
  5 +import lombok.EqualsAndHashCode;
  6 +import lombok.ToString;
  7 +import org.springframework.format.annotation.DateTimeFormat;
  8 +
  9 +import java.util.Date;
  10 +
  11 +/**
  12 + * @author 20412
  13 + */
  14 +@EqualsAndHashCode
  15 +@ToString
  16 +public class GarOrderDisposalVo extends GarOrder {
  17 + private Integer garOrderDisposalStatus;
  18 + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
  19 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
  20 + private Date garCreateTime;
  21 +
  22 + @Override
  23 + public Date getGarCreateTime() {
  24 + return garCreateTime;
  25 + }
  26 +
  27 + @Override
  28 + public void setGarCreateTime(Date garCreateTime) {
  29 + this.garCreateTime = garCreateTime;
  30 + }
  31 +
  32 + public Integer getGarOrderDisposalStatus() {
  33 + return garOrderDisposalStatus;
  34 + }
  35 +
  36 + public void setGarOrderDisposalStatus(Integer garOrderDisposalStatus) {
  37 + this.garOrderDisposalStatus = garOrderDisposalStatus;
  38 + }
  39 +}
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/GarOrderMatchAskVo.java 0 → 100644
  View file @10c0daf
  1 +package com.trash.garbage.pojo.vo;
  2 +
  3 +import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
  4 +
  5 +import java.util.List;
  6 +
  7 +public class GarOrderMatchAskVo extends GarOrderMatchAsk {
  8 + private List<String> fillImageList;
  9 +
  10 + public List<String> getFillImageList() {
  11 + return fillImageList;
  12 + }
  13 +
  14 + public void setFillImageList(List<String> fillImageList) {
  15 + this.fillImageList = fillImageList;
  16 + }
  17 +}
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailTransportVo.java 0 → 100644
  View file @10c0daf
  1 +package com.trash.garbage.pojo.vo;
  2 +
  3 +import lombok.EqualsAndHashCode;
  4 +import lombok.ToString;
  5 +
  6 +import java.util.List;
  7 +
  8 +@ToString
  9 +@EqualsAndHashCode
  10 +public class OrderDetailTransportVo {
  11 + private String garOrderId;
  12 + private String garRealCarCount;
  13 + private List<String> currentImages;
  14 + /**
  15 + * 承接经营单位
  16 + */
  17 + private String garOrderCompanyId;
  18 + private String garOrderContactTel;
  19 +
  20 + /**
  21 + * 公司名称
  22 + */
  23 + private String garOrderCompanyName;
  24 + private String garOrderCompanyTel;
  25 + /**
  26 + * 清运人名
  27 + */
  28 + private String garOrderHandleName;
  29 +
  30 + /**
  31 + * 联系方式
  32 + */
  33 + private String garOrderHandleTel;
  34 + /**
  35 + * 垃圾类型
  36 + */
  37 + private String garOrderTrashType;
  38 + /**
  39 + * 订单详细地址
  40 + */
  41 + private String garOrderAddressDetails;
  42 + private String garOrderAddress;
  43 + private String garRemark;
  44 +
  45 + /**
  46 + * 经度
  47 + */
  48 + private Double garLongitude;
  49 + /**
  50 + * 纬度
  51 + */
  52 + private Double garLatitude;
  53 + /**
  54 + * 坐标系
  55 + */
  56 + private String garCoordinate;
  57 + /**
  58 + * 清运清单
  59 + */
  60 + private List<TransportDetail> transportDetails;
  61 +
  62 + @ToString
  63 + @EqualsAndHashCode
  64 + public static class TransportDetail {
  65 + private String fillImage;
  66 + private String garAskId;
  67 + private String garHandlerCarCode;
  68 +
  69 + public String getFillImage() {
  70 + return fillImage;
  71 + }
  72 +
  73 + public void setFillImage(String fillImage) {
  74 + this.fillImage = fillImage;
  75 + }
  76 +
  77 + public String getGarAskId() {
  78 + return garAskId;
  79 + }
  80 +
  81 + public void setGarAskId(String garAskId) {
  82 + this.garAskId = garAskId;
  83 + }
  84 +
  85 + public String getGarHandlerCarCode() {
  86 + return garHandlerCarCode;
  87 + }
  88 +
  89 + public void setGarHandlerCarCode(String garHandlerCarCode) {
  90 + this.garHandlerCarCode = garHandlerCarCode;
  91 + }
  92 + }
  93 +
  94 + public String getGarOrderId() {
  95 + return garOrderId;
  96 + }
  97 +
  98 + public void setGarOrderId(String garOrderId) {
  99 + this.garOrderId = garOrderId;
  100 + }
  101 +
  102 + public List<String> getCurrentImages() {
  103 + return currentImages;
  104 + }
  105 +
  106 + public void setCurrentImages(List<String> currentImages) {
  107 + this.currentImages = currentImages;
  108 + }
  109 +
  110 + public String getGarOrderCompanyId() {
  111 + return garOrderCompanyId;
  112 + }
  113 +
  114 + public void setGarOrderCompanyId(String garOrderCompanyId) {
  115 + this.garOrderCompanyId = garOrderCompanyId;
  116 + }
  117 +
  118 + public String getGarOrderCompanyName() {
  119 + return garOrderCompanyName;
  120 + }
  121 +
  122 + public void setGarOrderCompanyName(String garOrderCompanyName) {
  123 + this.garOrderCompanyName = garOrderCompanyName;
  124 + }
  125 +
  126 + public String getGarOrderHandleName() {
  127 + return garOrderHandleName;
  128 + }
  129 +
  130 + public void setGarOrderHandleName(String garOrderHandleName) {
  131 + this.garOrderHandleName = garOrderHandleName;
  132 + }
  133 +
  134 + public String getGarOrderHandleTel() {
  135 + return garOrderHandleTel;
  136 + }
  137 +
  138 + public void setGarOrderHandleTel(String garOrderHandleTel) {
  139 + this.garOrderHandleTel = garOrderHandleTel;
  140 + }
  141 +
  142 + public String getGarOrderTrashType() {
  143 + return garOrderTrashType;
  144 + }
  145 +
  146 + public void setGarOrderTrashType(String garOrderTrashType) {
  147 + this.garOrderTrashType = garOrderTrashType;
  148 + }
  149 +
  150 + public String getGarOrderAddressDetails() {
  151 + return garOrderAddressDetails;
  152 + }
  153 +
  154 + public void setGarOrderAddressDetails(String garOrderAddressDetails) {
  155 + this.garOrderAddressDetails = garOrderAddressDetails;
  156 + }
  157 +
  158 + public Double getGarLongitude() {
  159 + return garLongitude;
  160 + }
  161 +
  162 + public void setGarLongitude(Double garLongitude) {
  163 + this.garLongitude = garLongitude;
  164 + }
  165 +
  166 + public Double getGarLatitude() {
  167 + return garLatitude;
  168 + }
  169 +
  170 + public void setGarLatitude(Double garLatitude) {
  171 + this.garLatitude = garLatitude;
  172 + }
  173 +
  174 + public String getGarCoordinate() {
  175 + return garCoordinate;
  176 + }
  177 +
  178 + public void setGarCoordinate(String garCoordinate) {
  179 + this.garCoordinate = garCoordinate;
  180 + }
  181 +
  182 + public List<TransportDetail> getTransportDetails() {
  183 + return transportDetails;
  184 + }
  185 +
  186 + public void setTransportDetails(List<TransportDetail> transportDetails) {
  187 + this.transportDetails = transportDetails;
  188 + }
  189 +
  190 + public String getGarOrderAddress() {
  191 + return garOrderAddress;
  192 + }
  193 +
  194 + public void setGarOrderAddress(String garOrderAddress) {
  195 + this.garOrderAddress = garOrderAddress;
  196 + }
  197 +
  198 + public String getGarRealCarCount() {
  199 + return garRealCarCount;
  200 + }
  201 +
  202 + public String getGarRemark() {
  203 + return garRemark;
  204 + }
  205 +
  206 + public void setGarRemark(String garRemark) {
  207 + this.garRemark = garRemark;
  208 + }
  209 +
  210 + public void setGarRealCarCount(String garRealCarCount) {
  211 + this.garRealCarCount = garRealCarCount;
  212 + }
  213 +
  214 + public String getGarOrderContactTel() {
  215 + return garOrderContactTel;
  216 + }
  217 +
  218 + public void setGarOrderContactTel(String garOrderContactTel) {
  219 + this.garOrderContactTel = garOrderContactTel;
  220 + }
  221 +
  222 + public String getGarOrderCompanyTel() {
  223 + return garOrderCompanyTel;
  224 + }
  225 +
  226 + public void setGarOrderCompanyTel(String garOrderCompanyTel) {
  227 + this.garOrderCompanyTel = garOrderCompanyTel;
  228 + }
  229 +}
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
  View file @10c0daf
... ... @@ -31,7 +31,7 @@ public class OrderDetailVo {
31 31 private Integer garHandlerEvaluateFlag;
32 32  
33 33 /**
34   - * 处理人名
  34 + * 清运人名
35 35 */
36 36 private String garOrderHandleName;
37 37  
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/ScanDriverDetailVo.java 0 → 100644
  View file @10c0daf
  1 +package com.trash.garbage.pojo.vo;
  2 +
  3 +import com.trash.garbage.pojo.domain.GarOrder;
  4 +import lombok.EqualsAndHashCode;
  5 +import lombok.ToString;
  6 +
  7 +/**
  8 + * @author 20412
  9 + */
  10 +@ToString
  11 +@EqualsAndHashCode
  12 +public class ScanDriverDetailVo extends GarOrder {
  13 + private String garOrderHandlerName;
  14 + private String garOrderHandlerTel;
  15 + private String garHandlerCarCode;
  16 + private String garOrderHandlerId;
  17 +
  18 +
  19 + public String getGarOrderHandlerId() {
  20 + return garOrderHandlerId;
  21 + }
  22 +
  23 + public void setGarOrderHandlerId(String garOrderHandlerId) {
  24 + this.garOrderHandlerId = garOrderHandlerId;
  25 + }
  26 +
  27 + public String getGarHandlerCarCode() {
  28 + return garHandlerCarCode;
  29 + }
  30 +
  31 + public void setGarHandlerCarCode(String garHandlerCarCode) {
  32 + this.garHandlerCarCode = garHandlerCarCode;
  33 + }
  34 +
  35 + public String getGarOrderHandlerName() {
  36 + return garOrderHandlerName;
  37 + }
  38 +
  39 + public void setGarOrderHandlerName(String garOrderHandlerName) {
  40 + this.garOrderHandlerName = garOrderHandlerName;
  41 + }
  42 +
  43 + public String getGarOrderHandlerTel() {
  44 + return garOrderHandlerTel;
  45 + }
  46 +
  47 + public void setGarOrderHandlerTel(String garOrderHandlerTel) {
  48 + this.garOrderHandlerTel = garOrderHandlerTel;
  49 + }
  50 +
  51 +
  52 +}
... ...
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderService.java
  View file @10c0daf
... ... @@ -5,11 +5,10 @@ import com.github.pagehelper.PageInfo;
5 5 import com.trash.enterprise.domain.TransportationEnterprise;
6 6 import com.trash.garbage.pojo.domain.GarOrder;
7 7 import com.trash.garbage.pojo.domain.GarOrderEvaluate;
  8 +import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
8 9 import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
9 10 import com.trash.garbage.pojo.dto.*;
10   -import com.trash.garbage.pojo.vo.DispatchDisposalVo;
11   -import com.trash.garbage.pojo.vo.DispatchDriverVo;
12   -import com.trash.garbage.pojo.vo.OrderDetailVo;
  11 +import com.trash.garbage.pojo.vo.*;
13 12  
14 13 import java.util.List;
15 14  
... ... @@ -81,4 +80,12 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
81 80 void dispatchDisposalOrders(DisposalDispatchDto dto);
82 81  
83 82 List<DispatchDisposalVo> queryDisposalDispatch(String orderId);
  83 +
  84 + ScanDriverDetailVo checkValidCode(String validCOde);
  85 +
  86 + String askTransport(AskTransportDto dto);
  87 +
  88 + OrderDetailTransportVo queryOrderTransportDetail(String id);
  89 +
  90 + GarOrderMatchAskVo scanDetail(String askId);
84 91 }
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
  View file @10c0daf
1 1 package com.trash.garbage.service.impl;
2 2  
3   -import java.util.*;
4   -import java.util.stream.Collectors;
5   -
  3 +import cn.hutool.core.collection.CollectionUtil;
  4 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  5 +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
  6 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  7 +import com.github.pagehelper.PageHelper;
  8 +import com.github.pagehelper.PageInfo;
6 9 import com.trash.common.core.redis.RedisCache;
  10 +import com.trash.common.utils.SecurityUtils;
7 11 import com.trash.common.utils.ServletUtils;
8   -import com.trash.disposalSite.domain.DisposalSite;
9   -import com.trash.disposalSite.service.IDisposalSiteService;
  12 +import com.trash.driver.domain.vo.DriverVo;
  13 +import com.trash.driver.service.IDriverService;
10 14 import com.trash.enterprise.domain.TransportationEnterprise;
11 15 import com.trash.enterprise.service.ITransportationEnterpriseService;
12 16 import com.trash.garbage.custom.BizException;
  17 +import com.trash.garbage.global.GlobalStatus;
13 18 import com.trash.garbage.global.ResultCode;
  19 +import com.trash.garbage.mapper.GarOrderMapper;
14 20 import com.trash.garbage.pojo.domain.*;
15 21 import com.trash.garbage.pojo.dto.*;
16 22 import com.trash.garbage.pojo.vo.*;
... ... @@ -18,23 +24,14 @@ import com.trash.garbage.service.*;
18 24 import com.trash.garbage.utils.SMSUtils;
19 25 import com.trash.garbage.utils.ValidateCodeUtil;
20 26 import org.apache.commons.lang3.StringUtils;
  27 +import org.springframework.beans.BeanUtils;
21 28 import org.springframework.beans.factory.annotation.Autowired;
22 29 import org.springframework.stereotype.Service;
23 30 import org.springframework.transaction.annotation.Transactional;
24   -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
25   -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
26   -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
27   -import com.github.pagehelper.PageHelper;
28   -import com.github.pagehelper.PageInfo;
29   -import com.trash.common.utils.SecurityUtils;
30   -import com.trash.common.utils.bean.BeanUtils;
31   -import com.trash.driver.domain.vo.DriverVo;
32   -import com.trash.driver.service.IDriverService;
33   -import com.trash.garbage.global.GlobalStatus;
34   -import com.trash.garbage.mapper.GarOrderMapper;
35   -import cn.hutool.core.collection.CollectionUtil;
36 31  
37 32 import javax.annotation.Resource;
  33 +import java.util.*;
  34 +import java.util.stream.Collectors;
38 35  
39 36 /**
40 37 * @author 20412
... ... @@ -53,6 +50,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
53 50 private GarOrderImageService garOrderImageService;
54 51  
55 52 @Autowired
  53 + private GarOrderMatchAskService askService;
  54 +
  55 + @Autowired
56 56 private GarAddressService garAddressService;
57 57  
58 58 @Autowired
... ... @@ -88,7 +88,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
88 88 public String saveOrder(OrderDto dto) {
89 89 String userId = SecurityUtils.getLoginUser().getUser().getUserId();
90 90 GarOrder order = new GarOrder();
91   - BeanUtils.copyBeanProp(order, dto);
  91 + BeanUtils.copyProperties(dto, order, "garOrderCompanyId");
92 92 order.setGarOrderUserId(userId);
93 93 order.setGarOrderHandlerStatus(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue());
94 94 order.setGarCancelFlag(GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
... ... @@ -147,7 +147,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
147 147 OrderDetailVo vo = new OrderDetailVo();
148 148 GarOrderDriverVo orderVo = baseMapper.queryOrderByTelWithType(user.getGarUserTel(), orderId, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
149 149 vo.setHandleFlag(true);
150   - BeanUtils.copyBeanProp(vo, orderVo);
  150 + BeanUtils.copyProperties(orderVo, vo);
151 151 // 获取图片
152 152 List<GarOrderImage> imageAll = new ArrayList<>();
153 153 List<GarOrderImage> currentImageList = garOrderImageService.list(new LambdaQueryWrapper<GarOrderImage>()
... ... @@ -184,12 +184,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
184 184 OrderDetailVo vo = new OrderDetailVo();
185 185 if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())) {
186 186 vo.setHandleFlag(true);
187   - // 防止其他人员处理订单
188   - if (!order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue()) && !order.getGarOrderHandlerId().equals(user.getGarUserId())) {
189   - vo.setHandleFlag(false);
190   - }
191 187 }
192   - BeanUtils.copyBeanProp(vo, order);
  188 + BeanUtils.copyProperties(order, vo);
193 189 // 获取图片
194 190 List<GarOrderImage> imageList = garOrderImageService.list(qwi);
195 191 for (GarOrderImage image : imageList) {
... ... @@ -215,7 +211,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
215 211 public PageInfo queryOrderList(Integer type, Integer pageNo, Integer pageSize) {
216 212 String userId = SecurityUtils.getLoginUser().getUser().getUserId();
217 213 GarUser user = garUserService.getById(userId);
218   - // 居民用户
  214 + // 用户
219 215 if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription())) {
220 216 LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
221 217 qw.orderByAsc(GarOrder::getGarUpdateTime, GarOrder::getGarOrderHandlerStatus);
... ... @@ -246,13 +242,13 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
246 242 if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)
247 243 || GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
248 244 || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
249   - List<GarOrderDriverVo> orderList = baseMapper.queryOrderListByTelWithType(user.getGarUserTel(), type, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
  245 + List<GarOrderDriverVo> orderList = baseMapper.queryDriverOrderListByTelWithType(user.getGarUserTel(), type, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
250 246 PageInfo<GarOrderDriverVo> pageInfo = new PageInfo<GarOrderDriverVo>(orderList, pageSize);
251 247 return pageInfo;
252 248 }
253 249 // 全部
254 250 if (GlobalStatus.GarOrderStatus.ALL_ORDER.getValue().equals(type)) {
255   - List<GarOrderDriverVo> orderList = baseMapper.queryOrderListByTelWithType(user.getGarUserTel(), null, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
  251 + List<GarOrderDriverVo> orderList = baseMapper.queryDriverOrderListByTelWithType(user.getGarUserTel(), null, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
256 252 PageInfo<GarOrderDriverVo> pageInfo = new PageInfo<GarOrderDriverVo>(orderList, pageSize);
257 253 return pageInfo;
258 254 }
... ... @@ -275,6 +271,16 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
275 271 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
276 272 return pageInfo;
277 273 }
  274 + // 处置场所
  275 + else if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription())) {
  276 + PageHelper.startPage(pageNo, pageSize);
  277 + if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
  278 + || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
  279 + List<GarOrderDisposalVo> orderList = baseMapper.queryDisposalOrderListByTelWithType(user.getGarUserTel(), type, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
  280 + PageInfo<GarOrderDisposalVo> pageInfo = new PageInfo<GarOrderDisposalVo>(orderList, pageSize);
  281 + return pageInfo;
  282 + }
  283 + }
278 284 return null;
279 285 }
280 286  
... ... @@ -289,7 +295,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
289 295 }
290 296 // 处理分发订单 驾驶员
291 297 else if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription())) {
292   - // TODO 处理场所负责人
  298 + // TODO 驾驶员
293 299 return handlerDispatchOrderStatus(dto, user);
294 300 }
295 301 //
... ... @@ -315,38 +321,47 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
315 321 // return "订单已完成";
316 322 // }
317 323 // 根据传入的validCode 和订单id去生成一条清运记录 一条记录生成一个validCode
318   - if (checkValidCode(dto.getGarOrderHandleTel(), dto.getGarOrderId(), dto.getValidCode())) {
319   - // TODO 生成记录
320   - GarOrderMatchAsk ask = new GarOrderMatchAsk();
321   - BeanUtils.copyProperties(order, ask, "garCreateTime", "garUpdateTime", "garCreateBy", "garUpdateBy");
322   - String code = ValidateCodeUtil.generatorCode(6);
323   -
324   - redisCache.setCacheMapValue(dto.getGarOrderHandleTel(), dto.getGarOrderId(),code);
325   - matchAskService.save(ask);
326   - return "当前趟次记录成功";
327   - }
  324 + // TODO 生成记录
  325 +// GarOrderMatchAsk ask = new GarOrderMatchAsk();
  326 +// BeanUtils.copyProperties(order, ask, "garCreateTime", "garUpdateTime", "garCreateBy", "garUpdateBy");
  327 +// String code = ValidateCodeUtil.generatorCode(6);
  328 +// redisCache.setCacheMapValue(dto.getGarOrderHandleTel(), dto.getGarOrderId(), code);
  329 +// matchAskService.save(ask);
  330 +// return "当前趟次记录成功";
328 331 // TODO 记录数
329 332 // update order count
330 333 throw new BizException(ResultCode.CODE_500);
331 334 }
332 335  
333   - private boolean checkValidCode(String tel, String orderId, String code) {
334   - String validCode = redisCache.getCacheMapValue(tel, orderId);
335   - return code.equals(validCode);
  336 + private boolean checkCode(String code) {
  337 + if (StringUtils.isNotBlank(code)) {
  338 + String[] params = code.split(",");
  339 + if (params.length == 3) {
  340 + String validCode = redisCache.getCacheMapValue(params[0], params[1]);
  341 + return code.equals(validCode);
  342 + }
  343 + }
  344 + return false;
336 345 }
337 346  
338 347  
339 348 @Deprecated
340 349 private String handlerDispatchOrderStatus(OrderUpdateDto dto, GarUser user) {
341 350 GarOrderDriverVo order = baseMapper.queryOrderByTelWithType(user.getGarUserTel(), dto.getGarOrderId(), GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
  351 + String tel = user.getGarUserTel();
342 352 // 公司所属 待清运- 》 清运中
  353 + // 接受订单的时候把自己的id更新到handler表中
343 354 if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue())
344 355 || GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(dto.getHandleType())) {
345 356 LambdaUpdateWrapper<GarOrderMatchHandler> uw = new LambdaUpdateWrapper<>();
346 357 uw.eq(GarOrderMatchHandler::getGarOrderId, dto.getGarOrderId())
347   - .eq(GarOrderMatchHandler::getGarOrderHandlerTel, user.getGarUserTel())
348   - .set(GarOrderMatchHandler::getGarOrderStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue());
  358 + .eq(GarOrderMatchHandler::getGarOrderHandlerTel, tel)
  359 + .set(GarOrderMatchHandler::getGarOrderStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue())
  360 + .set(GarOrderMatchHandler::getGarOrderHandlerId, user.getGarUserId());
349 361 handlerService.update(uw);
  362 + // TODO 以订单id和人员手机号 hash key返回前端生成二维码 存放到redis中
  363 + String code = tel + "," + order.getGarOrderId() + "," + ValidateCodeUtil.generatorCode(6);
  364 + redisCache.setCacheMapValue(tel, order.getGarOrderId(), code);
350 365 return "已接受订单";
351 366 }
352 367 throw new BizException(ResultCode.CODE_500);
... ... @@ -374,13 +389,13 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
374 389 // 公司所属 待清运- 》 清运中
375 390 if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue())
376 391 || GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(dto.getHandleType())) {
377   - if (StringUtils.isNotEmpty(order.getGarOrderHandlerId())) {
  392 + if (StringUtils.isNotEmpty(order.getGarOrderCompanyId())) {
378 393 throw new BizException(ResultCode.CODE_500, "订单已经接受了");
379 394 }
380 395 LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
381 396 uw.eq(GarOrder::getGarOrderId, dto.getGarOrderId())
382 397 .set(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue())
383   - .set(GarOrder::getGarOrderHandlerId, user.getGarUserId());
  398 + .set(GarOrder::getGarOrderCompanyId, user.getGarUserId());
384 399 update(uw);
385 400 // TODO 短信提醒
386 401 smsUtils.sendMessage(order.getGarOrderContactTel(), "运输公司已接受订单号为 " + order.getGarOrderId() + " 的订单。");
... ... @@ -488,7 +503,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
488 503 qwi.eq(GarOrderImage::getGarOrderId, id);
489 504 OrderDetailVo vo = new OrderDetailVo();
490 505 List<DriverVo> driverVos = null;
491   - BeanUtils.copyBeanProp(vo, order);
  506 + BeanUtils.copyProperties(order, vo);
492 507 List<GarOrderImage> imageList = garOrderImageService.list(qwi);
493 508 for (GarOrderImage image : imageList) {
494 509 if (GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue().equals(image.getGarOrderImageType())) {
... ... @@ -639,12 +654,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
639 654 }
640 655 handlerService.saveBatch(handlerList);
641 656 order.setGarOrderMatchFlag(GlobalStatus.GarOrderStatus.MATCH_YES.getValue());
642   - // TODO 以订单id和人员手机号 hash key返回前端生成二维码 存放到redis中
643 657 List<String> tels = handlerList.stream().map(GarOrderMatchHandler::getGarOrderHandlerTel).collect(Collectors.toList());
644   - for (String tel : tels) {
645   - String code = ValidateCodeUtil.generatorCode(6);
646   - redisCache.setCacheMapValue(tel, order.getGarOrderId(), code);
647   - }
648 658 // TODO 短信通知
649 659 smsUtils.sendMessage(tels, "您有新的清运任务！请打开小程序查看当前任务。");
650 660 updateById(order);
... ... @@ -660,6 +670,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
660 670 handler.setGarOrderHandlerStatus(order.getGarOrderHandlerStatus());
661 671 handler.setGarOrderHandlerCompanyName(order.getGarOrderCompanyName());
662 672 handler.setGarOrderHandlerCompanyId(order.getGarOrderCompanyId());
  673 +// handler.setGarOrderHandlerId(detail.getId());
663 674 handler.setGarOrderStatus(GlobalStatus.GarOrderStatus.DISPATCH_HANDLE_NEW.getValue());
664 675 return handler;
665 676 }
... ... @@ -725,20 +736,101 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
725 736 disposal.setGarOrderDisposalTel(detail.getTel());
726 737 disposal.setGarOrderDisposalName(detail.getName());
727 738 disposal.setGarOrderId(order.getGarOrderId());
728   - disposal.setGarOrderDisposalCompanyName(order.getGarOrderCompanyName());
729   - disposal.setGarOrderDisposalCompanyId(order.getGarOrderCompanyId());
  739 + disposal.setGarOrderDisposalCompanyName(detail.getCompanyName());
  740 + disposal.setGarOrderDisposalName(detail.getName());
  741 + disposal.setGarOrderDisposalCompanyId(detail.getCompanyId());
  742 +// disposal.setGarOrderDisposalId(detail.getId());
  743 + disposal.setGarOrderDisposalStatus(GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue());
730 744 return disposal;
731 745 }
732 746  
733 747 @Override
734 748 public List<DispatchDisposalVo> queryDisposalDispatch(String orderId) {
735 749 // TODO
736   -// String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber();
  750 + // String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber();
737 751 // 选中的司机处理场所
738 752 List<DispatchDisposalVo> voList = disposalService.queryDisposalListWithDispatchStatus(orderId, null);
739 753 return voList;
740 754 }
741 755  
  756 + @Override
  757 + public ScanDriverDetailVo checkValidCode(String validCode) {
  758 + // TODO check code
  759 + if (checkCode(validCode)) {
  760 + String[] params = validCode.split(",");
  761 + ScanDriverDetailVo vo = baseMapper.queryDriverDetailByTelWithOrderId(params[0], params[1]);
  762 + return vo;
  763 + }
  764 + throw new BizException(ResultCode.CODE_400, "二维码验证不通过");
  765 + }
  766 +
  767 + @Override
  768 + public String askTransport(AskTransportDto dto) {
  769 + GarOrderMatchAsk ask = new GarOrderMatchAsk();
  770 + BeanUtils.copyProperties(dto, ask);
  771 + matchAskService.save(ask);
  772 + // TODO 判断是否运载完毕 已经到预估趟次则不在生成验证码
  773 + String tel = dto.getGarOrderHandlerTel();
  774 + String orderId = dto.getGarOrderId();
  775 + String code = tel + "," + orderId + "," + ValidateCodeUtil.generatorCode(6);
  776 +// redisCache.setCacheMapValue(tel, orderId, code);*
  777 + // 保存图片url
  778 + List<GarOrderImage> imageList = new ArrayList<>(dto.getFillImageList().size());
  779 + for (String fillImageUrl : dto.getFillImageList()) {
  780 + GarOrderImage image = new GarOrderImage();
  781 + image.setGarOrderImageType(GlobalStatus.GarOrderStatus.IMAGE_TYPE_FILL_CAR.getValue());
  782 + image.setGarOrderId(orderId);
  783 + image.setGarOrderImageUrl(fillImageUrl);
  784 + image.setGarRemark(ask.getGarId());
  785 + imageList.add(image);
  786 + }
  787 + garOrderImageService.saveBatch(imageList);
  788 + return "当前趟次记录成功";
  789 + }
  790 +
  791 + @Override
  792 + public OrderDetailTransportVo queryOrderTransportDetail(String id) {
  793 + // 根据当前订单id查订单数据 - 查扫码趟次数据
  794 + OrderDetailTransportVo vo = baseMapper.queryOrderTransportDetail(id);
  795 + vo.setCurrentImages(new ArrayList<>());
  796 + // 全景图片
  797 + LambdaQueryWrapper<GarOrderImage> qw = new LambdaQueryWrapper<>();
  798 + qw.eq(GarOrderImage::getGarOrderId, id)
  799 + .in(GarOrderImage::getGarOrderImageType,
  800 + Arrays.asList(GlobalStatus.GarOrderStatus.IMAGE_TYPE_FILL_CAR.getValue(), GlobalStatus.GarOrderStatus.IMAGE_TYPE_CURRENT.getValue()));
  801 + List<GarOrderImage> imageList = garOrderImageService.list(qw);
  802 + for (GarOrderImage image : imageList) {
  803 + // 现场照片
  804 + if (image.getGarOrderImageType().equals(GlobalStatus.GarOrderStatus.IMAGE_TYPE_CURRENT.getValue())) {
  805 + vo.getCurrentImages().add(image.getGarOrderImageUrl());
  806 + }
  807 + // 全景图片
  808 + else {
  809 + for (OrderDetailTransportVo.TransportDetail detail : vo.getTransportDetails()) {
  810 + if (detail.getGarAskId().equals(image.getGarRemark())) {
  811 + detail.setFillImage(image.getGarOrderImageUrl());
  812 + break;
  813 + }
  814 + }
  815 + }
  816 + }
  817 + return vo;
  818 + }
  819 +
  820 + @Override
  821 + public GarOrderMatchAskVo scanDetail(String askId) {
  822 + GarOrderMatchAsk ask = askService.getById(askId);
  823 + GarOrderMatchAskVo vo = new GarOrderMatchAskVo();
  824 + BeanUtils.copyProperties(ask, vo);
  825 + // 图片url
  826 + LambdaQueryWrapper<GarOrderImage> qw = new LambdaQueryWrapper<>();
  827 + qw.eq(GarOrderImage::getGarOrderId, ask.getGarOrderId())
  828 + .eq(GarOrderImage::getGarOrderImageType, GlobalStatus.GarOrderStatus.IMAGE_TYPE_FILL_CAR.getValue());
  829 + List<String> fillImageList = garOrderImageService.list(qw).stream().map(GarOrderImage::getGarOrderImageUrl).collect(Collectors.toList());
  830 + vo.setFillImageList(fillImageList);
  831 + return vo;
  832 + }
  833 +
742 834 private void handleCleanNumber(TransportationEnterpriseVo vo, List<GarOrder> orderList) {
743 835 Long cleanNumber = 0L;
744 836 for (GarOrder order : orderList) {
... ...
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
  View file @10c0daf
... ... @@ -7,7 +7,6 @@
7 7 <resultMap id="BaseResultMap" type="com.trash.garbage.pojo.domain.GarOrder">
8 8 <id property="garOrderId" column="gar_order_id" jdbcType="VARCHAR"/>
9 9 <result property="garOrderUserId" column="gar_order_user_id" jdbcType="VARCHAR"/>
10   - <result property="garOrderHandlerId" column="gar_order_handler_id" jdbcType="VARCHAR"/>
11 10 <result property="garOrderAddress" column="gar_order_address" jdbcType="VARCHAR"/>
12 11 <result property="garOrderAddressDetails" column="gar_order_address_details" jdbcType="VARCHAR"/>
13 12 <result property="garOrderContactName" column="gar_order_contact_name" jdbcType="VARCHAR"/>
... ... @@ -33,10 +32,31 @@
33 32 <result property="garCoordinate" column="gar_coordinate" jdbcType="DOUBLE"/>
34 33 <result property="garRealCarCount" column="gar_real_car_count" jdbcType="INTEGER"/>
35 34 </resultMap>
  35 + <resultMap id="TransportDetailVo" type="com.trash.garbage.pojo.vo.OrderDetailTransportVo">
  36 + <id property="garOrderId" column="gar_order_id" jdbcType="VARCHAR"/>
  37 + <result property="garOrderAddress" column="gar_order_address" jdbcType="VARCHAR"/>
  38 + <result property="garOrderAddressDetails" column="gar_order_address_details" jdbcType="VARCHAR"/>
  39 + <result property="garOrderTrashType" column="gar_order_trash_type" jdbcType="VARCHAR"/>
  40 + <result property="garOrderContactTel" column="gar_order_contact_tel" jdbcType="VARCHAR"/>
  41 + <result property="garOrderCompanyId" column="gar_order_company_id" jdbcType="VARCHAR"/>
  42 + <result property="garOrderCompanyName" column="gar_order_company_name" jdbcType="VARCHAR"/>
  43 + <result property="garOrderCompanyTel" column="gar_order_company_tel" jdbcType="VARCHAR"/>
  44 + <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
  45 + <result property="garLatitude" column="gar_latitude" jdbcType="DOUBLE"/>
  46 + <result property="garLongitude" column="gar_longitude" jdbcType="DOUBLE"/>
  47 + <result property="garCoordinate" column="gar_coordinate" jdbcType="DOUBLE"/>
  48 + <result property="garRealCarCount" column="gar_real_car_count" jdbcType="INTEGER"/>
  49 + <collection property="transportDetails"
  50 + ofType="com.trash.garbage.pojo.vo.OrderDetailTransportVo$TransportDetail">
  51 + <result property="garHandlerCarCode" column="gar_handler_car_code"/>
  52 + <result property="fillImage" column="fill_image"/>
  53 + <result property="garAskId" column="gar_ask_id"/>
  54 + </collection>
  55 + </resultMap>
36 56  
37 57 <sql id="Base_Column_List">
38 58 gar_order_id
39   - ,gar_order_user_id,gar_order_handler_id,
  59 + ,gar_order_user_id,
40 60 gar_order_address,gar_order_address_details,gar_order_contact_name,
41 61 gar_order_trash_type,gar_order_contact_tel,gar_order_company_id,
42 62 gar_order_company_name,gar_order_company_tel,gar_order_handler_status,
... ... @@ -59,14 +79,16 @@
59 79 and 1 = 0
60 80 </if>
61 81 </select>
62   - <select id="queryOrderListByTelWithType" resultType="com.trash.garbage.pojo.vo.GarOrderDriverVo">
  82 + <select id="queryDriverOrderListByTelWithType" resultType="com.trash.garbage.pojo.vo.GarOrderDriverVo">
63 83 SELECT
64   - `order`.gar_order_id ,`order`.gar_order_user_id,`order`.gar_order_handler_id,`order`.gar_coordinate,
  84 + `order`.gar_order_id ,`order`.gar_order_user_id,`order`.gar_coordinate,
65 85 `order`.gar_order_address,`order`.gar_order_address_details,`order`.gar_order_contact_name,`order`.gar_longitude,
66 86 `order`.gar_order_trash_type,`order`.gar_order_contact_tel,`order`.gar_order_company_id,`order`.gar_latitude,
67 87 `order`.gar_order_company_name,`order`.gar_order_company_tel,`order`.gar_order_match_flag,
68   - `order`.gar_order_agreement_time,`order`.gar_remark,`order`.gar_handler_evaluate_flag,`order`.gar_order_handler_status gar_order_status,
69   - `handler`.gar_order_status gar_order_handler_status,`handler`.gar_cancel_flag,`handler`.gar_reason,`order`.gar_real_car_count
  88 + `order`.gar_order_agreement_time,`order`.gar_remark,`order`.gar_handler_evaluate_flag,`order`.gar_order_handler_status
  89 + gar_order_status,
  90 + `handler`.gar_order_status
  91 + gar_order_handler_status,`handler`.gar_cancel_flag,`handler`.gar_reason,`order`.gar_real_car_count
70 92 FROM gar_order `order`
71 93 INNER JOIN gar_order_match_handler `handler` ON `order`.gar_order_id = `handler`.gar_order_id
72 94 <where>
... ... @@ -81,14 +103,17 @@
81 103 </select>
82 104 <select id="queryOrderByTelWithType" resultType="com.trash.garbage.pojo.vo.GarOrderDriverVo">
83 105 SELECT
84   - `order`.gar_order_id ,`order`.gar_order_user_id,`order`.gar_order_handler_id,`order`.gar_latitude,
  106 + `order`.gar_order_id ,`order`.gar_order_user_id,`order`.gar_latitude,
85 107 `order`.gar_order_address,`order`.gar_order_address_details,`order`.gar_order_contact_name,`order`.gar_longitude,
86 108 `order`.gar_order_trash_type,`order`.gar_order_contact_tel,`order`.gar_order_company_id,`order`.gar_coordinate,
87 109 `order`.gar_order_company_name,`order`.gar_order_company_tel,`order`.gar_order_match_flag,`order`.gar_real_car_count,
88   - `order`.gar_order_agreement_time,`order`.gar_remark,`order`.gar_handler_evaluate_flag,`order`.gar_order_handler_status gar_order_status,
89   - `handler`.gar_order_status gar_order_handler_status,`handler`.gar_cancel_flag,`handler`.gar_reason,`handler`.gar_handler_car_code
  110 + `order`.gar_order_agreement_time,`order`.gar_remark,`order`.gar_handler_evaluate_flag,`order`.gar_order_handler_status
  111 + gar_order_status,
  112 + `handler`.gar_order_status
  113 + gar_order_handler_status,`handler`.gar_cancel_flag,`handler`.gar_reason,`handler`.gar_handler_car_code
90 114 FROM gar_order `order`
91   - INNER JOIN gar_order_match_handler `handler` ON `order`.gar_order_id = `handler`.gar_order_id AND `order`.gar_order_id = #{orderId}
  115 + INNER JOIN gar_order_match_handler `handler` ON `order`.gar_order_id = `handler`.gar_order_id AND
  116 + `order`.gar_order_id = #{orderId}
92 117 <where>
93 118 `handler`.gar_order_handler_tel = #{garUserTel}
94 119 <if test="cancelFlag != null">
... ... @@ -96,4 +121,77 @@
96 121 </if>
97 122 </where>
98 123 </select>
  124 + <select id="queryDisposalOrderListByTelWithType" resultType="com.trash.garbage.pojo.vo.GarOrderDisposalVo">
  125 + SELECT
  126 + `order`.gar_order_id,
  127 + `order`.gar_order_user_id,
  128 + `order`.gar_coordinate,
  129 + `order`.gar_order_address,
  130 + `order`.gar_order_address_details,
  131 + `order`.gar_order_contact_name,
  132 + `order`.gar_longitude,
  133 + `order`.gar_order_trash_type,
  134 + `order`.gar_order_contact_tel,
  135 + `order`.gar_order_company_id,
  136 + `order`.gar_latitude,
  137 + `order`.gar_order_company_name,
  138 + `order`.gar_order_company_tel,
  139 + `order`.gar_order_agreement_time,
  140 + `disposal`.gar_create_time,
  141 + `disposal`.gar_order_disposal_status,
  142 + `order`.gar_real_car_count
  143 + FROM
  144 + gar_order `order`
  145 + INNER JOIN gar_order_match_disposal `disposal` ON `order`.gar_order_id = `disposal`.gar_order_id
  146 + <where>
  147 + `disposal`.gar_order_disposal_tel = #{garUserTel}
  148 + <if test="type != null">
  149 + AND `disposal`.gar_order_disposal_status = #{type}
  150 + </if>
  151 + </where>
  152 + </select>
  153 + <select id="queryDriverDetailByTelWithOrderId" resultType="com.trash.garbage.pojo.vo.ScanDriverDetailVo">
  154 + SELECT
  155 + `order`.gar_order_id ,`order`.gar_order_user_id,`order`.gar_latitude,
  156 + `order`.gar_order_address,`order`.gar_order_address_details,`order`.gar_order_contact_name,`order`.gar_longitude,
  157 + `order`.gar_order_trash_type,`order`.gar_order_contact_tel,`order`.gar_order_company_id,`order`.gar_coordinate,
  158 + `order`.gar_order_company_name,`order`.gar_order_company_tel,`handler`.gar_create_time,
  159 + `order`.gar_order_handler_status
  160 + gar_order_status,`handler`.gar_handler_car_code,`handler`.gar_order_handler_name,
  161 + `handler`.gar_handler_car_code,
  162 + `handler`.gar_order_handler_tel,
  163 + `handler`.gar_order_handler_id
  164 + FROM gar_order `order`
  165 + INNER JOIN gar_order_match_handler `handler` ON `order`.gar_order_id = `handler`.gar_order_id AND
  166 + `order`.gar_order_id = #{orderId}
  167 + <where>
  168 + `handler`.gar_order_handler_tel = #{garUserTel}
  169 + </where>
  170 + </select>
  171 + <select id="queryOrderTransportDetail" resultMap="TransportDetailVo">
  172 + SELECT `order`.gar_order_id,
  173 + `order`.gar_order_user_id,
  174 + `order`.gar_coordinate,
  175 + `order`.gar_order_address,
  176 + `order`.gar_order_address_details,
  177 + `order`.gar_order_contact_name,
  178 + `order`.gar_longitude,
  179 + `order`.gar_order_trash_type,
  180 + `order`.gar_order_contact_tel,
  181 + `order`.gar_order_company_id,
  182 + `order`.gar_latitude,
  183 + `order`.gar_order_company_name,
  184 + `order`.gar_order_company_tel,
  185 + `order`.gar_order_agreement_time,
  186 + `disposal`.gar_create_time,
  187 + `disposal`.gar_order_disposal_status,
  188 + `order`.gar_real_car_count,
  189 + `ask`.gar_id gar_ask_id,
  190 + `ask`.gar_handler_car_code,
  191 + `ask`.gar_order_handler_id
  192 + FROM gar_order `order`
  193 + LEFT JOIN gar_order_match_disposal `disposal` ON `order`.gar_order_id = `disposal`.gar_order_id
  194 + LEFT JOIN gar_order_match_ask `ask` ON `ask`.gar_order_id = `order`.gar_order_id
  195 + WHERE `order`.gar_order_id = #{orderId}
  196 + </select>
99 197 </mapper>
... ...
trash-garbage/src/main/resources/mapper/GarOrderMatchDisposalMapper.xml
  View file @10c0daf
... ... @@ -16,6 +16,7 @@
16 16 <result property="garCreateBy" column="gar_create_by" jdbcType="VARCHAR"/>
17 17 <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
18 18 <result property="garReason" column="gar_reason" jdbcType="VARCHAR"/>
  19 + <result property="garOrderDisposalStatus" column="gar_order_disposal_status" jdbcType="VARCHAR"/>
19 20 </resultMap>
20 21  
21 22  
... ... @@ -35,7 +36,7 @@
35 36 ,gar_order_id,gar_order_disposal_tel,
36 37 gar_order_disposal_name,gar_order_disposal_company_id,gar_order_disposal_company_name,
37 38 gar_create_time,gar_update_time,gar_create_by,
38   - gar_update_by,gar_reason
  39 + gar_update_by,gar_reason,gar_order_status
39 40 </sql>
40 41 <select id="queryDisposalListWithDispatchStatus" resultMap="DispatchDisposalVo">
41 42 SELECT disposal.`name` AS `name`,
... ...