维修、检查、休息上报

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

@@ -28,14 +28,21 @@ import com.aoyang.common.param.PageParam;
  */
 @RestController
 @Slf4j
-@Api(value = "rest_infoCRUD接口")
+@Api(value = "途中休息相关接口")
 @RequestMapping("/tms/rest_info")
 public class RestInfoController {
 
     @Resource
     private RestInfoService restInfoService;
 
-    @ApiOperation(value = "获取rest_info列表",notes="")
+    @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) {
         Page<RestInfo> page = new Page<>(pageParam.getPage(), pageParam.getSize());
@@ -43,17 +50,11 @@ public class RestInfoController {
         return new Result<>(records);
     }
 
-    @ApiOperation(value = "修改rest_info",notes="根据id修改rest_info")
+    @ApiOperation(value = "修改途中休息信息",notes="根据id修改途中休息信息")
     @PostMapping("/update")
     public Result update(@RequestBody RestInfo restInfo) {
         Boolean flag = restInfoService.updateById(restInfo);
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "添加rest_info",notes="新增一条rest_info")
-    @PostMapping("/add")
-    public Result add(@RequestBody RestInfo restInfo) {
-        Boolean flag = restInfoService.save(restInfo);
-        return new Result<>(flag);
-    }
 }

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

@@ -1,6 +1,7 @@
 package com.aoyang.tms.controller;
 
 
+import com.aoyang.tms.entity.TruckRepairInfo;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -35,6 +36,22 @@ 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) {
+        return new Result<>(new TruckCheckInfo());
+    }
+
     @ApiOperation(value = "获取truck_check_info列表",notes="")
     @PostMapping("/list")
     public Result list(@RequestBody PageParam<TruckCheckInfo> pageParam) {
@@ -50,10 +67,5 @@ public class TruckCheckInfoController {
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "添加truck_check_info",notes="新增一条truck_check_info")
-    @PostMapping("/add")
-    public Result add(@RequestBody TruckCheckInfo truckCheckInfo) {
-        Boolean flag = truckCheckInfoService.save(truckCheckInfo);
-        return new Result<>(flag);
-    }
+
 }

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

@@ -28,22 +28,22 @@ import com.aoyang.common.param.PageParam;
  */
 @RestController
 @Slf4j
-@Api(value = "truck_repair_infoCRUD接口")
+@Api(value = "途中车辆维修相关接口")
 @RequestMapping("/tms/truck_repair_info")
 public class TruckRepairInfoController {
 
     @Resource
     private TruckRepairInfoService truckRepairInfoService;
 
-    @ApiOperation(value = "查找车辆检查信息",notes="")
+    @ApiOperation(value = "查找车辆途中维修信息",notes="")
     @PostMapping("/find")
     public Result<TruckRepairInfo> find(@RequestBody TruckRepairInfo truckRepairInfo) {
         return new Result<>(new TruckRepairInfo());
     }
 
-    @ApiOperation(value = "上报车辆检车信息",notes="新增或修改都用同一个接口,新增后返回带主键id的实体")
-    @PostMapping("/submit")
-    public Result<TruckRepairInfo> submit(@RequestBody TruckRepairInfo truckRepairInfo) {
+    @ApiOperation(value = "上报车辆途中维修信息",notes="新增或修改都用同一个接口,新增后返回带主键id的实体")
+    @PostMapping("/add")
+    public Result<TruckRepairInfo> add(@RequestBody TruckRepairInfo truckRepairInfo) {
         //TODO SAVE OR UPDATE
         //TODO 信息全了，则需要更改车辆状态，待执行到出车作业中
         return new Result<>(new TruckRepairInfo());

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

@@ -35,7 +35,7 @@ public class WorkLogController {
     @Resource
     private WorkLogService workLogService;
 
-    @ApiOperation(value = "获取w行车日志列表",notes="卡车id必传")
+    @ApiOperation(value = "获取行车日志列表",notes="卡车id必传")
     @PostMapping("/list")
     public Result list(@RequestBody PageParam<WorkLog> pageParam) {
         Page<WorkLog> page = new Page<>(pageParam.getPage(), pageParam.getSize());

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

@@ -28,14 +28,14 @@ import com.aoyang.common.param.PageParam;
  */
 @RestController
 @Slf4j
-@Api(value = "work_orderCRUD接口")
+@Api(value = "运单相关接口")
 @RequestMapping("/tms/work_order")
 public class WorkOrderController {
 
     @Resource
     private WorkOrderService workOrderService;
 
-    @ApiOperation(value = "获取work_order列表",notes="")
+    @ApiOperation(value = "获取运单列表",notes="")
     @PostMapping("/list")
     public Result list(@RequestBody PageParam<WorkOrder> pageParam) {
         Page<WorkOrder> page = new Page<>(pageParam.getPage(), pageParam.getSize());
@@ -43,17 +43,25 @@ public class WorkOrderController {
         return new Result<>(records);
     }
 
-    @ApiOperation(value = "修改work_order",notes="根据id修改work_order")
+
+    @ApiOperation(value = "派单",notes="调度员派单操作")
+    @PostMapping("/add")
+    public Result add(@RequestBody WorkOrder workOrder) {
+        Boolean flag = workOrderService.save(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "修改派单",notes="根据id修改派单")
     @PostMapping("/update")
     public Result update(@RequestBody WorkOrder workOrder) {
         Boolean flag = workOrderService.updateById(workOrder);
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "添加work_order",notes="新增一条work_order")
-    @PostMapping("/add")
-    public Result add(@RequestBody WorkOrder workOrder) {
-        Boolean flag = workOrderService.save(workOrder);
+    @ApiOperation(value = "取消派单",notes="取消派单")
+    @PostMapping("/delete")
+    public Result delete(@RequestBody WorkOrder workOrder) {
+        Boolean flag = workOrderService.updateById(workOrder);
         return new Result<>(flag);
     }
 }