押运员表修改

src/main/java/com/aoyang/tms/controller/RestInfoController.java

@@ -35,13 +35,6 @@ public class RestInfoController {
     @Resource
     private RestInfoService restInfoService;
 
-    @ApiOperation(value = "上报途中休息信息",notes="开始时间、结束时间必传")
-    @PostMapping("/add")
-    public Result add(@RequestBody RestInfo restInfo) {
-        Boolean flag = restInfoService.save(restInfo);
-        return new Result<>(flag);
-    }
-
     @ApiOperation(value = "获取途中休息信息列表",notes="")
     @PostMapping("/list")
     public Result list(@RequestBody PageParam<RestInfo> pageParam) {

src/main/java/com/aoyang/tms/controller/TruckCheckInfoController.java

@@ -36,16 +36,6 @@ public class TruckCheckInfoController {
     @Resource
     private TruckCheckInfoService truckCheckInfoService;
 
-    @ApiOperation(value = "上报出车前车辆检查信息",notes="新增或修改车辆检车信息")
-    @PostMapping("/add")
-    public Result add(@RequestBody TruckCheckInfo truckCheckInfo) {
-        //TODO SAVE OR UPDATE
-        //TODO 信息全了，则需要更改车辆状态，待执行到出车作业中
-        //不同类型，验证信息不一样
-        Boolean flag = truckCheckInfoService.save(truckCheckInfo);
-        return new Result<>(flag);
-    }
-
     @ApiOperation(value = "查找车辆检查信息",notes="")
     @PostMapping("/find")
     public Result<TruckCheckInfo> find(@RequestBody TruckCheckInfo truckRepairInfo) {

src/main/java/com/aoyang/tms/controller/TruckRepairInfoController.java

@@ -41,13 +41,6 @@ public class TruckRepairInfoController {
         return new Result<>(new TruckRepairInfo());
     }
 
-    @ApiOperation(value = "上报车辆途中维修信息",notes="新增或修改都用同一个接口,新增后返回带主键id的实体")
-    @PostMapping("/add")
-    public Result<TruckRepairInfo> add(@RequestBody TruckRepairInfo truckRepairInfo) {
-        //TODO SAVE OR UPDATE
-        //TODO 信息全了，则需要更改车辆状态，待执行到出车作业中
-        return new Result<>(new TruckRepairInfo());
-    }
 
     @ApiOperation(value = "获取truck_repair_info列表",notes="")
     @PostMapping("/list")

src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -4,18 +4,22 @@ import com.alibaba.fastjson.JSON;
 import com.aoyang.common.param.PageParam;
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.common.ErrCodeEnum;
+import com.aoyang.tms.controller.param.WorkOrderPageParam;
 import com.aoyang.tms.controller.vo.WorkOrderVO;
 import com.aoyang.tms.controller.vo.WorkerInfo;
-import com.aoyang.tms.entity.WorkOrder;
-import com.aoyang.tms.service.CommonService;
-import com.aoyang.tms.service.WorkOrderService;
+import com.aoyang.tms.entity.*;
+import com.aoyang.tms.service.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Description: 作业人员相关接口
@@ -31,9 +35,17 @@ public class WorkerController {
 
     @Resource
     private WorkOrderService workOrderService;
-
+    @Resource
+    private RestInfoService restInfoService;
+    @Resource
+    private WorkCycleService workCycleService;
     @Resource
     private CommonService commonService;
+    @Resource
+    private TruckCheckInfoService truckCheckInfoService;
+    @Resource
+    private WorkLogService workLogService;
+
 
     @ApiOperation(value = "运力详情", notes = "卡车id必传，包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
     @PostMapping("/find_truck_info")
@@ -47,12 +59,81 @@ public class WorkerController {
         return new Result<>(workerInfo1);
     }
 
-    @ApiOperation(value = "运单列表", notes = "获取司机或押运员的运单列表")
-    @PostMapping("/find_work_order_page")
-    public Result<IPage<WorkOrderVO>> findWorkOrderList(@RequestHeader(value = "orgId") Long orgId,
-                                                        @RequestHeader(value = "userId") Long userId, @RequestBody PageParam<WorkOrder> pageParam) {
-        IPage<WorkOrderVO> records = null;
+    @ApiOperation(value = "运单列表", notes = "移动端获取司机或押运员的待执行或执行中的运单列表")
+    @PostMapping("/find_work_order_list")
+    public Result<List<WorkOrderVO>> findWorkOrderList(@RequestHeader(value = "orgId") Long orgId,
+                                                       @RequestHeader(value = "userId") Long userId, @RequestBody PageParam<WorkOrder> pageParam) {
+        List<WorkOrderVO> records = new ArrayList<WorkOrderVO>();
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "历史行车列表", notes = "必传参数:truckId")
+    @PostMapping("/work_cycle_page")
+    public Result work_cycle_page(@RequestBody PageParam<WorkCycle> pageParam) {
+        Page<WorkCycle> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<WorkCycle> records = workCycleService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "上报途中休息信息",notes="开始时间、结束时间必传")
+    @PostMapping("/add_rest_info")
+    public Result add_rest_info(@RequestBody RestInfo restInfo) {
+        Boolean flag = restInfoService.save(restInfo);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "上报车辆途中维修信息",notes="新增或修改都用同一个接口,新增后返回带主键id的实体")
+    @PostMapping("/add_truck_repair_info")
+    public Result<TruckRepairInfo> add_truck_repair_info(@RequestBody TruckRepairInfo truckRepairInfo) {
+        //TODO SAVE OR UPDATE
+        //TODO 信息全了，则需要更改车辆状态，待执行到出车作业中
+        return new Result<>(new TruckRepairInfo());
+    }
+
+    @ApiOperation(value = "上报车辆检查信息",notes="新增或修改车辆检车信息")
+    @PostMapping("/add_truck_check_info")
+    public Result add_truck_check_info(@RequestBody TruckCheckInfo truckCheckInfo) {
+        //TODO SAVE OR UPDATE
+        //TODO 信息全了，则需要更改车辆状态，待执行到出车作业中
+        //不同类型，验证信息不一样
+        Boolean flag = truckCheckInfoService.save(truckCheckInfo);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "获取行车日志列表",notes="卡车id必传")
+    @PostMapping("/work_log_list")
+    public Result work_log_list(@RequestBody PageParam<WorkLog> pageParam) {
+        Page<WorkLog> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<WorkLog> records = workLogService.page(page, Wrappers.query(pageParam.getParam()));
         return new Result<>(records);
     }
 
+    @ApiOperation(value = "装车等待上报", notes = "")
+    @PostMapping("/add_zhuangche_wait")
+    public Result add_zhuangche_wait(@RequestBody WorkOrder workOrder) {
+        Boolean flag = workOrderService.save(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "卸车等待上报", notes = "")
+    @PostMapping("/add_xieche_wait")
+    public Result add_xieche_wait(@RequestBody WorkOrder workOrder) {
+        Boolean flag = workOrderService.save(workOrder);
+        return new Result<>(flag);
+    }
+
+
+    @ApiOperation(value = "装车成果上报", notes = "")
+    @PostMapping("/add_zhuangche_result")
+    public Result add_zhuangche_result(@RequestBody WorkOrder workOrder) {
+        Boolean flag = workOrderService.save(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "卸车成果上报", notes = "")
+    @PostMapping("/add_xieche_result")
+    public Result add_xieche_result(@RequestBody WorkOrder workOrder) {
+        Boolean flag = workOrderService.save(workOrder);
+        return new Result<>(flag);
+    }
 }

src/main/java/com/aoyang/tms/controller/vo/WorkOrderVO.java

@@ -32,6 +32,14 @@ public class WorkOrderVO extends WorkOrder implements Serializable {
     @ApiModelProperty(value = "已读未读状态,0未读，1已读")
     private Integer readFlag;
 
+
+    @ApiModelProperty(value = "车辆状态,已收车0,出车前检查1,出车作业中2,收车中3,收车后检查4")
+    private Integer truckStatus;
+
+    @ApiModelProperty(value = "已用时，单位分钟")
+    private int time;
+
+
     @ApiModelProperty(value = "装卸车点经度")
     @TableField("longitude")
     private String longitude;

src/main/java/com/aoyang/tms/controller/vo/WorkerInfo.java

@@ -89,5 +89,9 @@ public class WorkerInfo {
     @ApiModelProperty(value = "位置时间")
     private String localTime;
 
+    @ApiModelProperty(value = "上次位置更新时间")
+    private String lastTime;
+
+
 
 }