流程梳理

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

@@ -4,7 +4,6 @@ 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.*;
@@ -18,7 +17,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -124,7 +122,7 @@ public class WorkerController {
     @PostMapping("/add_truck_check_info")
     public Result add_truck_check_info(@RequestBody TruckCheckInfo truckCheckInfo) {
         log.info("上报车辆检查信息,/tms/worker/add_truck_check_info，参数:{}", JSON.toJSONString(truckCheckInfo));
-        if (truckCheckInfo == null || truckCheckInfo.getTruckId() == null || truckCheckInfo.getStartTime() == null || truckCheckInfo.getEndTime() == null) {
+        if (truckCheckInfo == null || truckCheckInfo.getType() == null || truckCheckInfo.getTruckId() == null || truckCheckInfo.getStartTime() == null || truckCheckInfo.getEndTime() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO SAVE OR UPDATE
@@ -138,7 +136,9 @@ public class WorkerController {
     @PostMapping("/work_log_list")
     public Result work_log_list(@RequestBody PageParam<WorkLog> pageParam) {
         log.info("获取行车日志列表,/tms/worker/work_log_list，参数:{}", JSON.toJSONString(pageParam));
-
+        if (pageParam == null || pageParam.getParam() == null || pageParam.getParam().getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
         Page<WorkLog> page = new Page<>(pageParam.getPage(), pageParam.getSize());
         IPage<WorkLog> records = workLogService.page(page, Wrappers.query(pageParam.getParam()));
         return new Result<>(records);
@@ -148,7 +148,10 @@ public class WorkerController {
     @PostMapping("/add_zhuangche_wait")
     public Result add_zhuangche_wait(@RequestBody WorkOrder workOrder) {
         log.info("装车等待上报,/tms/worker/add_zhuangche_wait，参数:{}", JSON.toJSONString(workOrder));
-        Boolean flag = workOrderService.save(workOrder);
+        if (workOrder == null || workOrder.getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
         return new Result<>(flag);
     }
 
@@ -156,7 +159,10 @@ public class WorkerController {
     @PostMapping("/add_xieche_wait")
     public Result add_xieche_wait(@RequestBody WorkOrder workOrder) {
         log.info("卸车等待上报,/tms/worker/add_xieche_wait，参数:{}", JSON.toJSONString(workOrder));
-        Boolean flag = workOrderService.save(workOrder);
+        if (workOrder == null || workOrder.getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
         return new Result<>(flag);
     }
 
@@ -164,8 +170,10 @@ public class WorkerController {
     @PostMapping("/add_zhuangche_result")
     public Result add_zhuangche_result(@RequestBody WorkOrder workOrder) {
         log.info("装车成果上报,/tms/worker/add_zhuangche_result，参数:{}", JSON.toJSONString(workOrder));
-
-        Boolean flag = workOrderService.save(workOrder);
+        if (workOrder == null || workOrder.getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
         return new Result<>(flag);
     }
 
@@ -173,7 +181,94 @@ public class WorkerController {
     @PostMapping("/add_xieche_result")
     public Result add_xieche_result(@RequestBody WorkOrder workOrder) {
         log.info("卸车成果上报,/tms/worker/add_xieche_result，参数:{}", JSON.toJSONString(workOrder));
-        Boolean flag = workOrderService.save(workOrder);
+        if (workOrder == null || workOrder.getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "开始执行运单", notes = "点击开始执行运单按钮")
+    @PostMapping("/start_order")
+    public Result start_order(@RequestBody WorkOrder workOrder) {
+        log.info("开始执行运单,/tms/worker/start_order，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        //TODO 1.车辆进入出车前检车状态，2.订单进入前往装车点状态，3.并记行车日志，4.创建行程周期
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "完成出车前检查，开始装卸车作业", notes = "点击完成出车前检查，开始作业按钮")
+    @PostMapping("/start_work")
+    public Result start_work(@RequestBody WorkOrder workOrder) {
+        log.info("完成出车前检查，开始作业,/tms/worker/start_work，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        //TODO 1.车辆进入作业中状态，2.订单进入前往装车点状态，3.并记行车日志
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "上报已到达装卸车点", notes = "点击上报已到达装卸车点")
+    @PostMapping("/start_wait")
+    public Result start_wait(@RequestBody WorkOrder workOrder) {
+        log.info("上报已到达装卸车点，/tms/worker/start_wait，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null || workOrder.getType() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        //TODO 1.车辆进入作业中状态，2.订单进入装车等待状态，3.并记行车日志
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "上报成果", notes = "点击上报成果")
+    @PostMapping("/submit_result")
+    public Result submit_result(@RequestBody WorkOrder workOrder) {
+        log.info("上报成果，/tms/worker/submit_result，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null || workOrder.getType() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        //TODO 1.车辆进入作业中状态，2.订单进入成果报备中状态，3.并记行车日志
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "确认完成运单", notes = "点击确认完成运单")
+    @PostMapping("/finish_order")
+    public Result finish_order(@RequestBody WorkOrder workOrder) {
+        log.info("确认完成运单，/tms/worker/finish_order，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null || workOrder.getType() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        //TODO 1.车辆进入收车中状态，2.订单完成状态，3.并记行车日志
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "上报已到达收车点", notes = "点击上报已到达收车点")
+    @PostMapping("/arrive_terminal")
+    public Result arrive_shouchedian(@RequestBody WorkOrder workOrder) {
+        log.info("上报已到达收车点，/tms/worker/arrive_shouchedian，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null || workOrder.getType() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        //TODO 1.车辆进入收车后检查状态，2.订单完成状态，3.并记行车日志
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "完成检查，结束此次行程", notes = "点击完成检查，结束此次行程")
+    @PostMapping("/finish_work")
+    public Result finish_work(@RequestBody WorkOrder workOrder) {
+        log.info("上报已到达收车点，/tms/worker/arrive_shouchedian，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null || workOrder.getType() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        //TODO 1.车辆进入已经收车状态，2.订单完成状态，3.并记行车日志，4.结束当前行程周期（从收车中到出车检查也结束当前行程周期）
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
         return new Result<>(flag);
     }
 }