|
|
@@ -9,6 +9,7 @@ import com.aoyang.tms.controller.vo.WorkerInfo;
|
|
|
import com.aoyang.tms.entity.*;
|
|
|
import com.aoyang.tms.service.*;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import io.swagger.annotations.Api;
|
|
|
@@ -142,17 +143,25 @@ public class WorkerController {
|
|
|
return new Result<>(new TruckRepairInfo());
|
|
|
}
|
|
|
|
|
|
+ @ApiOperation(value = "查询车辆检查信息", notes = "id必传")
|
|
|
+ @PostMapping("/find_truck_check_info")
|
|
|
+ public Result find_truck_check_info(@RequestBody TruckCheckInfo truckCheckInfo) {
|
|
|
+ log.info("查询车辆检查信息,/tms/worker/find_truck_check_info,参数:{}", JSON.toJSONString(truckCheckInfo));
|
|
|
+ if (truckCheckInfo == null || truckCheckInfo.getId() == null) {
|
|
|
+ return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
|
+ }
|
|
|
+ TruckCheckInfo flag = truckCheckInfoService.getById(truckCheckInfo.getId());
|
|
|
+ return new Result<>(flag);
|
|
|
+ }
|
|
|
+
|
|
|
@ApiOperation(value = "上报车辆检查信息", notes = "新增或修改车辆检车信息")
|
|
|
@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.getType() == null || truckCheckInfo.getTruckId() == null || truckCheckInfo.getStartTime() == null || truckCheckInfo.getEndTime() == null) {
|
|
|
+ if (truckCheckInfo == null || truckCheckInfo.getType() == null || truckCheckInfo.getTruckId() == null || StringUtils.isBlank(truckCheckInfo.getTrip()) || StringUtils.isBlank(truckCheckInfo.getCheckUrl()) || StringUtils.isBlank(truckCheckInfo.getTripUrl())) {
|
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
|
}
|
|
|
- //TODO SAVE OR UPDATE
|
|
|
- //TODO 信息全了,则需要更改车辆状态,待执行到出车作业中
|
|
|
- //不同类型,验证信息不一样
|
|
|
- Boolean flag = truckCheckInfoService.save(truckCheckInfo);
|
|
|
+ Boolean flag = truckCheckInfoService.saveOrUpdate(truckCheckInfo);
|
|
|
return new Result<>(flag);
|
|
|
}
|
|
|
|