Commit 5ec81c079841d580eab0765657abd67dc9260372
1 parent
a43d273b
m
Showing
2 changed files
with
30 additions
and
19 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
| 1 | package com.trash.garbage.controller; | 1 | package com.trash.garbage.controller; |
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | +import java.io.IOException; | ||
| 5 | +import java.util.HashMap; | ||
| 6 | +import java.util.List; | ||
| 7 | +import java.util.Map; | ||
| 8 | + | ||
| 9 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 10 | +import org.springframework.security.access.prepost.PreAuthorize; | ||
| 11 | +import org.springframework.validation.annotation.Validated; | ||
| 12 | +import org.springframework.web.bind.annotation.GetMapping; | ||
| 13 | +import org.springframework.web.bind.annotation.PathVariable; | ||
| 14 | +import org.springframework.web.bind.annotation.PostMapping; | ||
| 15 | +import org.springframework.web.bind.annotation.PutMapping; | ||
| 16 | +import org.springframework.web.bind.annotation.RequestBody; | ||
| 17 | +import org.springframework.web.bind.annotation.RequestMapping; | ||
| 18 | +import org.springframework.web.bind.annotation.RequestParam; | ||
| 19 | +import org.springframework.web.bind.annotation.RestController; | ||
| 20 | +import org.springframework.web.multipart.MultipartFile; | ||
| 21 | + | ||
| 4 | import com.github.pagehelper.PageHelper; | 22 | import com.github.pagehelper.PageHelper; |
| 5 | import com.trash.common.annotation.Log; | 23 | import com.trash.common.annotation.Log; |
| 6 | import com.trash.common.config.trashConfig; | 24 | import com.trash.common.config.trashConfig; |
| @@ -18,19 +36,19 @@ import com.trash.garbage.custom.BizException; | @@ -18,19 +36,19 @@ import com.trash.garbage.custom.BizException; | ||
| 18 | import com.trash.garbage.global.Result; | 36 | import com.trash.garbage.global.Result; |
| 19 | import com.trash.garbage.global.ResultCode; | 37 | import com.trash.garbage.global.ResultCode; |
| 20 | import com.trash.garbage.pojo.domain.GarOrder; | 38 | import com.trash.garbage.pojo.domain.GarOrder; |
| 21 | -import com.trash.garbage.pojo.dto.*; | ||
| 22 | -import com.trash.garbage.pojo.vo.*; | 39 | +import com.trash.garbage.pojo.dto.AskTransportDto; |
| 40 | +import com.trash.garbage.pojo.dto.DispatchDto; | ||
| 41 | +import com.trash.garbage.pojo.dto.DisposalDispatchDto; | ||
| 42 | +import com.trash.garbage.pojo.dto.EvaluateDto; | ||
| 43 | +import com.trash.garbage.pojo.dto.OrderDto; | ||
| 44 | +import com.trash.garbage.pojo.dto.OrderUpdateDto; | ||
| 45 | +import com.trash.garbage.pojo.dto.OrderWebDto; | ||
| 46 | +import com.trash.garbage.pojo.dto.UploadDto; | ||
| 47 | +import com.trash.garbage.pojo.vo.GarOrderMatchAskVo; | ||
| 48 | +import com.trash.garbage.pojo.vo.OrderDetailTransportVo; | ||
| 49 | +import com.trash.garbage.pojo.vo.OrderDetailVo; | ||
| 50 | +import com.trash.garbage.pojo.vo.ScanDriverDetailVo; | ||
| 23 | import com.trash.garbage.service.GarOrderService; | 51 | import com.trash.garbage.service.GarOrderService; |
| 24 | -import org.springframework.beans.factory.annotation.Autowired; | ||
| 25 | -import org.springframework.security.access.prepost.PreAuthorize; | ||
| 26 | -import org.springframework.validation.annotation.Validated; | ||
| 27 | -import org.springframework.web.bind.annotation.*; | ||
| 28 | -import org.springframework.web.multipart.MultipartFile; | ||
| 29 | - | ||
| 30 | -import java.io.IOException; | ||
| 31 | -import java.util.HashMap; | ||
| 32 | -import java.util.List; | ||
| 33 | -import java.util.Map; | ||
| 34 | 52 | ||
| 35 | /** | 53 | /** |
| 36 | * 订单控制 | 54 | * 订单控制 |
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderEvaluate.java
| @@ -185,11 +185,4 @@ public class GarOrderEvaluate implements Serializable { | @@ -185,11 +185,4 @@ public class GarOrderEvaluate implements Serializable { | ||
| 185 | return serialVersionUID; | 185 | return serialVersionUID; |
| 186 | } | 186 | } |
| 187 | 187 | ||
| 188 | - public Integer getCountTheNumber() { | ||
| 189 | - return countTheNumber; | ||
| 190 | - } | ||
| 191 | - | ||
| 192 | - public void setCountTheNumber(Integer countTheNumber) { | ||
| 193 | - this.countTheNumber = countTheNumber; | ||
| 194 | - } | ||
| 195 | } | 188 | } |
| 196 | \ No newline at end of file | 189 | \ No newline at end of file |