workerService

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

@@ -37,8 +37,6 @@ public class WorkerController {
     @Resource
     private RestInfoService restInfoService;
     @Resource
-    private WorkCycleService workCycleService;
-    @Resource
     private WorkSpotService workSpotService;
     @Resource
     private CommonService commonService;
@@ -49,6 +47,9 @@ public class WorkerController {
     @Resource
     private WorkOrderReadinfoService workOrderReadinfoService;
 
+    @Resource
+    private WorkerService workerService;
+
 
     @ApiOperation(value = "运力详情", notes = "卡车id必传，包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
     @PostMapping("/find_truck_info")
@@ -137,7 +138,7 @@ public class WorkerController {
     @PostMapping("/add_truck_repair_info")
     public Result<TruckRepairInfo> add_truck_repair_info(@RequestBody TruckRepairInfo truckRepairInfo) {
         log.info("上报车辆途中维修信息,/tms/worker/add_rest_info，参数:{}", JSON.toJSONString(truckRepairInfo));
-        if (truckRepairInfo == null || truckRepairInfo.getTruckId() == null) {
+        if (truckRepairInfo == null || truckRepairInfo.getTruckId() == null || truckRepairInfo.getStartTime() == null || truckRepairInfo.getEndTime() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO SAVE OR UPDATE
@@ -214,85 +215,85 @@ public class WorkerController {
 
     @ApiOperation(value = "1.开始执行运单", notes = "点击开始执行运单按钮")
     @PostMapping("/start_order")
-    public Result startOrder(@RequestHeader(value = "userId") Long userId,@RequestBody WorkOrder workOrder) {
+    public Result startOrder(@RequestHeader(value = "userId") Long userId,@RequestHeader(value = "userName") String userName,  @RequestBody WorkOrder workOrder) {
         log.info("开始执行运单,/tms/worker/start_order，参数:{}", JSON.toJSONString(workOrder));
         if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO 1.车辆进入出车前检车状态，2.订单进入前往装车点状态，3.并记行车日志，4.创建行程周期
-        Boolean flag = workOrderService.updateById(workOrder);
+        Boolean flag = workerService.startOrder(userId,userName, workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "2.完成出车前检查，开始装卸车作业", notes = "点击完成出车前检查，开始作业按钮")
     @PostMapping("/start_work")
-    public Result starWork(@RequestHeader(value = "userId") Long userId,@RequestBody WorkOrder workOrder) {
+    public Result starWork(@RequestHeader(value = "userId") Long userId,@RequestHeader(value = "userName") String userName,  @RequestBody WorkOrder workOrder) {
         log.info("完成出车前检查，开始作业,/tms/worker/start_work，参数:{}", JSON.toJSONString(workOrder));
         if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO 1.车辆进入作业中状态，2.订单进入前往装车点状态，3.并记行车日志
-        Boolean flag = workOrderService.updateById(workOrder);
+        Boolean flag = workerService.starWork(userId,userName, workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "3.上报已到达装卸车点", notes = "点击上报已到达装卸车点")
     @PostMapping("/start_wait")
-    public Result startWait(@RequestHeader(value = "userId") Long userId,@RequestBody WorkOrder workOrder) {
+    public Result startWait(@RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody WorkOrder workOrder) {
         log.info("上报已到达装卸车点，/tms/worker/start_wait，参数:{}", JSON.toJSONString(workOrder));
         if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO 1.车辆进入作业中状态，2.订单进入装车等待状态，3.并记行车日志
-        Boolean flag = workOrderService.updateById(workOrder);
+        Boolean flag = workerService.startWait(userId,userName, workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "4.上报成果", notes = "点击上报成果")
     @PostMapping("/submit_result")
-    public Result submitResult(@RequestHeader(value = "userId") Long userId,@RequestBody WorkOrder workOrder) {
+    public Result submitResult(@RequestHeader(value = "userId") Long userId,@RequestHeader(value = "userName") String userName,  @RequestBody WorkOrder workOrder) {
         log.info("上报成果，/tms/worker/submit_result，参数:{}", JSON.toJSONString(workOrder));
         if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO 1.车辆进入作业中状态，2.订单进入成果报备中状态，3.并记行车日志
-        Boolean flag = workOrderService.updateById(workOrder);
+        Boolean flag = workerService.submitResult(userId,userName, workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "4.确认完成运单", notes = "点击确认完成运单")
     @PostMapping("/finish_order")
-    public Result finishOrder(@RequestHeader(value = "userId") Long userId,@RequestBody WorkOrder workOrder) {
+    public Result finishOrder(@RequestHeader(value = "userId") Long userId,@RequestHeader(value = "userName") String userName,  @RequestBody WorkOrder workOrder) {
         log.info("确认完成运单，/tms/worker/finish_order，参数:{}", JSON.toJSONString(workOrder));
         if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO 1.车辆进入收车中状态，2.订单完成状态，3.并记行车日志
-        Boolean flag = workOrderService.updateById(workOrder);
+        Boolean flag = workerService.finishOrder(userId,userName, workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "6.上报已到达收车点", notes = "点击上报已到达收车点")
     @PostMapping("/arrive_terminal")
-    public Result arriveTerminal(@RequestHeader(value = "userId") Long userId,@RequestBody WorkOrder workOrder) {
+    public Result arriveTerminal(@RequestHeader(value = "userId") Long userId,@RequestHeader(value = "userName") String userName,  @RequestBody WorkOrder workOrder) {
         log.info("上报已到达收车点，/tms/worker/arrive_shouchedian，参数:{}", JSON.toJSONString(workOrder));
         if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO 1.车辆进入收车后检查状态，2.订单完成状态，3.并记行车日志
-        Boolean flag = workOrderService.updateById(workOrder);
+        Boolean flag = workerService.arriveTerminal(userId,userName, workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "7.完成检查，结束此次行程", notes = "点击完成检查，结束此次行程")
     @PostMapping("/finish_work")
-    public Result finishWork(@RequestHeader(value = "userId") Long userId,@RequestBody WorkOrder workOrder) {
+    public Result finishWork(@RequestHeader(value = "userId") Long userId,@RequestHeader(value = "userName") String userName,  @RequestBody WorkOrder workOrder) {
         log.info("上报已到达收车点，/tms/worker/arrive_shouchedian，参数:{}", JSON.toJSONString(workOrder));
         if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO 1.车辆进入已经收车状态，2.订单完成状态，3.并记行车日志，4.结束当前行程周期（从收车中到出车检查也结束当前行程周期）
-        Boolean flag = workOrderService.updateById(workOrder);
+        Boolean flag = workerService.finishWork(userId,userName, workOrder);
         return new Result<>(flag);
     }
 }

src/main/java/com/aoyang/tms/service/WorkerService.java

@@ -18,12 +18,65 @@ import java.time.LocalDateTime;
  */
 public interface WorkerService {
 
-    Boolean startOrder(Long userId, WorkOrder workOrder);
-    Boolean starWork(Long userId, WorkOrder workOrder);
-    Boolean startWait(Long userId, WorkOrder workOrder);
-    Boolean submitResult(Long userId, WorkOrder workOrder);
-    Boolean finishOrder(Long userId, WorkOrder workOrder);
-    Boolean arriveTerminal(Long userId, WorkOrder workOrder);
-    Boolean finishWork(Long userId, WorkOrder workOrder);
+    /**
+     * @Author guoyong
+     * @Description 开始执行运单
+     * @Date  2022/4/23
+     * @Param
+     * @return
+    **/
+    Boolean startOrder(Long userId, String userName,WorkOrder workOrder);
+    /**
+     * @Author guoyong
+     * @Description 完成出车前检查，开始装卸车作业
+     * @Date  2022/4/23
+     * @Param
+     * @return
+    **/
+    Boolean starWork(Long userId,String userName, WorkOrder workOrder);
+    /**
+     * @Author guoyong
+     * @Description 上报已到达装卸车点
+     * @Date  2022/4/23
+     * @Param
+     * @return
+    **/
+    Boolean startWait(Long userId, String userName,WorkOrder workOrder);
+
+    /**
+     * @Author guoyong
+     * @Description 上报成果
+     * @Date  2022/4/23
+     * @Param
+     * @return
+    **/
+    Boolean submitResult(Long userId, String userName,WorkOrder workOrder);
+
+    /**
+     * @Author guoyong
+     * @Description 确认完成运单
+     * @Date  2022/4/23
+     * @Param
+     * @return
+    **/
+    Boolean finishOrder(Long userId, String userName,WorkOrder workOrder);
+
+    /**
+     * @Author guoyong
+     * @Description 上报已到达收车点
+     * @Date  2022/4/23
+     * @Param
+     * @return
+    **/
+    Boolean arriveTerminal(Long userId, String userName,WorkOrder workOrder);
+
+    /**
+     * @Author guoyong
+     * @Description 完成检查，结束此次行程
+     * @Date  2022/4/23
+     * @Param
+     * @return
+    **/
+    Boolean finishWork(Long userId, String userName,WorkOrder workOrder);
 
 }

src/main/java/com/aoyang/tms/service/impl/WorkerServiceImpl.java

@@ -0,0 +1,63 @@
+package com.aoyang.tms.service.impl;
+
+import com.aoyang.tms.entity.WorkOrder;
+import com.aoyang.tms.service.WorkCycleService;
+import com.aoyang.tms.service.WorkerService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description: 作业端相关接口
+ * @Author guoyong
+ * @Date 2022/4/23 15:37
+ * @Version 1.0
+ */
+@Service
+public class WorkerServiceImpl implements WorkerService {
+
+    @Resource
+    private WorkCycleService workCycleService;
+
+    @Override
+    public Boolean startOrder(Long userId,String userName, WorkOrder workOrder) {
+        Boolean flag = true;
+        return flag;
+    }
+
+    @Override
+    public Boolean starWork(Long userId,String userName, WorkOrder workOrder) {
+        Boolean flag = true;
+        return flag;
+    }
+
+    @Override
+    public Boolean startWait(Long userId,String userName, WorkOrder workOrder) {
+        Boolean flag = true;
+        return flag;
+    }
+
+    @Override
+    public Boolean submitResult(Long userId,String userName, WorkOrder workOrder) {
+        Boolean flag = true;
+        return flag;
+    }
+
+    @Override
+    public Boolean finishOrder(Long userId,String userName, WorkOrder workOrder) {
+        Boolean flag = true;
+        return flag;
+    }
+
+    @Override
+    public Boolean arriveTerminal(Long userId,String userName, WorkOrder workOrder) {
+        Boolean flag = true;
+        return flag;
+    }
+
+    @Override
+    public Boolean finishWork(Long userId,String userName, WorkOrder workOrder) {
+        Boolean flag = true;
+        return flag;
+    }
+}