complete_time

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

@@ -137,7 +137,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 || truckRepairInfo.getStartTime() == null || truckRepairInfo.getEndTime() == null) {
+        if (truckRepairInfo == null || truckRepairInfo.getTruckId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO SAVE OR UPDATE
@@ -190,131 +190,109 @@ public class WorkerController {
         return new Result<>(records);
     }
 
-    @ApiOperation(value = "装车等待上报", notes = "")
-    @PostMapping("/add_zhuangche_wait")
+    @ApiOperation(value = "装些车等待上报", notes = "装车 · 装车等待页面上报")
+    @PostMapping("/add_wait")
     public Result add_zhuangche_wait(@RequestBody WorkOrder workOrder) {
         log.info("装车等待上报,/tms/worker/add_zhuangche_wait，参数:{}", JSON.toJSONString(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("/add_xieche_wait")
-    public Result add_xieche_wait(@RequestBody WorkOrder workOrder) {
-        log.info("卸车等待上报,/tms/worker/add_xieche_wait，参数:{}", JSON.toJSONString(workOrder));
-        if (workOrder == null || workOrder.getTruckId() == null) {
+        if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
-        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        Boolean flag = workOrderService.updateById(workOrder);
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "装车成果上报", notes = "")
-    @PostMapping("/add_zhuangche_result")
+    @ApiOperation(value = "装卸车成果上报", notes = "上报装卸车磅单等信息")
+    @PostMapping("/add_result")
     public Result add_zhuangche_result(@RequestBody WorkOrder workOrder) {
         log.info("装车成果上报,/tms/worker/add_zhuangche_result，参数:{}", JSON.toJSONString(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("/add_xieche_result")
-    public Result add_xieche_result(@RequestBody WorkOrder workOrder) {
-        log.info("卸车成果上报,/tms/worker/add_xieche_result，参数:{}", JSON.toJSONString(workOrder));
-        if (workOrder == null || workOrder.getTruckId() == null) {
+        if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
-        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        Boolean flag = workOrderService.updateById(workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "1.开始执行运单", notes = "点击开始执行运单按钮")
     @PostMapping("/start_order")
-    public Result start_order(@RequestBody WorkOrder workOrder) {
+    public Result startOrder(@RequestHeader(value = "userId") Long userId,@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.saveOrUpdate(workOrder);
+        Boolean flag = workOrderService.updateById(workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "2.完成出车前检查，开始装卸车作业", notes = "点击完成出车前检查，开始作业按钮")
     @PostMapping("/start_work")
-    public Result start_work(@RequestBody WorkOrder workOrder) {
+    public Result starWork(@RequestHeader(value = "userId") Long userId,@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.saveOrUpdate(workOrder);
+        Boolean flag = workOrderService.updateById(workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "3.上报已到达装卸车点", notes = "点击上报已到达装卸车点")
     @PostMapping("/start_wait")
-    public Result start_wait(@RequestBody WorkOrder workOrder) {
+    public Result startWait(@RequestHeader(value = "userId") Long userId,@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.saveOrUpdate(workOrder);
+        Boolean flag = workOrderService.updateById(workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "4.上报成果", notes = "点击上报成果")
     @PostMapping("/submit_result")
-    public Result submit_result(@RequestBody WorkOrder workOrder) {
+    public Result submitResult(@RequestHeader(value = "userId") Long userId,@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.saveOrUpdate(workOrder);
+        Boolean flag = workOrderService.updateById(workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "4.确认完成运单", notes = "点击确认完成运单")
     @PostMapping("/finish_order")
-    public Result finish_order(@RequestBody WorkOrder workOrder) {
+    public Result finishOrder(@RequestHeader(value = "userId") Long userId,@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.saveOrUpdate(workOrder);
+        Boolean flag = workOrderService.updateById(workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "6.上报已到达收车点", notes = "点击上报已到达收车点")
     @PostMapping("/arrive_terminal")
-    public Result arrive_shouchedian(@RequestBody WorkOrder workOrder) {
+    public Result arriveTerminal(@RequestHeader(value = "userId") Long userId,@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.saveOrUpdate(workOrder);
+        Boolean flag = workOrderService.updateById(workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "7.完成检查，结束此次行程", notes = "点击完成检查，结束此次行程")
     @PostMapping("/finish_work")
-    public Result finish_work(@RequestBody WorkOrder workOrder) {
+    public Result finishWork(@RequestHeader(value = "userId") Long userId,@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.saveOrUpdate(workOrder);
+        Boolean flag = workOrderService.updateById(workOrder);
         return new Result<>(flag);
     }
 }

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

@@ -0,0 +1,29 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.common.result.Result;
+import com.aoyang.tms.controller.vo.LocationVO;
+import com.aoyang.tms.controller.vo.WorkerInfo;
+import com.aoyang.tms.entity.User;
+import com.aoyang.tms.entity.WorkOrder;
+import com.aoyang.tms.feign.result.Org;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Description: 作业端相关接口
+ * @Author guoyong
+ * @Date 2022/4/23 15:16
+ * @Version 1.0
+ */
+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);
+
+}