Jelajahi Sumber

接口缩减

guoyong 4 tahun lalu
induk
melakukan
b8d9d53a0f

+ 2 - 2
src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -36,7 +36,7 @@ public class WorkerController {
     @ApiOperation(value = "运力详情", notes = "包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
     @PostMapping("/find_truck_info")
     public Result<WorkerInfo> find_truck_info(@RequestHeader(value = "orgId") Long orgId,
-                                              @RequestHeader(value = "userId") Long userId) {
+                                              @RequestHeader(value = "userId") Long userId, @RequestBody WorkerInfo workerInfo) {
         return new Result<>(new WorkerInfo());
     }
 
@@ -52,7 +52,7 @@ public class WorkerController {
     @ApiOperation(value = "运单详情", notes = "获取司机或押运员的运单列表")
     @PostMapping("/find_work_order_info")
     public Result<WorkOrderVO> find_work_order_info(@RequestHeader(value = "orgId") Long orgId,
-                                                    @RequestHeader(value = "userId") Long userId, @RequestBody PageParam<WorkOrder> pageParam) {
+                                                    @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {
         return new Result<>(new WorkOrderVO());
     }
 

+ 4 - 4
src/main/java/com/aoyang/tms/controller/vo/WorkerInfo.java

@@ -14,6 +14,10 @@ import lombok.Data;
 @Data
 public class WorkerInfo {
 
+    @ApiModelProperty(value = "卡车id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
     @ApiModelProperty(value = "司机1id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long driverIdOne;
@@ -35,10 +39,6 @@ public class WorkerInfo {
     @ApiModelProperty(value = "押运员姓名")
     private String escortName;
 
-    @ApiModelProperty(value = "卡车id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long truckId;
-
     @ApiModelProperty(value = "车牌号")
     private String carNumber;