xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleRepairController.java
@@ -55,17 +55,8 @@ @ApiOperation(value = "车辆运维-车辆运维-车辆取回", tags = {"运维APP-车辆管理"}) @PostMapping("/api/v1/vehicleRepair/saveReturnRepair") public R<String> saveReturnRepair(@Validated @RequestBody XpVehicleRepairReturnDTO dto) { Long id = tokenService.getLoginOperationUser().getId(); XpVehicleRepair xpVehicleRepair = xpVehicleRepairService.getById(dto.getId()); xpVehicleRepair.setVehicleId(null); // 修改车辆取回信息 xpVehicleRepair.setRepairMoney(dto.getRepairMoney()); xpVehicleRepair.setRepairMoneyDetail(dto.getRepairMoneyDetail()); xpVehicleRepair.setReturnUserId(id); xpVehicleRepair.setReturnTime(LocalDateTime.now()); xpVehicleRepairService.updateById(xpVehicleRepair); xpVehicleRepairService.saveReturnRepair(dto,id); return R.ok(); } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/IXpVehicleRepairService.java
@@ -3,6 +3,7 @@ import com.xiaopeng.api.model.maintenance.XpVehicleRepair; import com.baomidou.mybatisplus.extension.service.IService; import com.xiaopeng.common.core.web.page.PageInfo; import com.xiaopeng.maintenance.dto.XpVehicleRepairReturnDTO; import com.xiaopeng.maintenance.dto.XpVehicleRepairStartDTO; import com.xiaopeng.maintenance.model.query.XpVehicleRepairPageQuery; import com.xiaopeng.maintenance.model.vo.XpVehicleRepairVO; @@ -50,4 +51,12 @@ * @param id */ void saveRepair(XpVehicleRepairStartDTO dto, Long id); /** * 保存车辆维修结束信息 * * @param dto * @param id */ void saveReturnRepair(XpVehicleRepairReturnDTO dto, Long id); } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpChargingRecordServiceImpl.java
@@ -88,7 +88,7 @@ } XpOperationsUser operationsUserEnd = xpOperationUserClient.queryById(xpChargingRecordVO.getEndOperationsUserId()).getData(); if (Objects.nonNull(operationsUserEnd)) { xpChargingRecordVO.setOperatorStartName(operationsUserEnd.getNickName()); xpChargingRecordVO.setOperatorEndName(operationsUserEnd.getNickName()); } return xpChargingRecordVO; } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpVehicleRepairServiceImpl.java
@@ -12,6 +12,7 @@ import com.xiaopeng.api.model.vehicleConvoy.XpVehicle; import com.xiaopeng.common.core.domain.R; import com.xiaopeng.common.core.web.page.PageInfo; import com.xiaopeng.maintenance.dto.XpVehicleRepairReturnDTO; import com.xiaopeng.maintenance.dto.XpVehicleRepairStartDTO; import com.xiaopeng.maintenance.mapper.XpVehicleRepairMapper; import com.xiaopeng.maintenance.model.query.XpVehicleRepairPageQuery; @@ -222,4 +223,22 @@ xpVehicleClient.updateVehicleById(xpVehicle); } } @Override public void saveReturnRepair(XpVehicleRepairReturnDTO dto, Long id) { XpVehicleRepair xpVehicleRepair = this.getById(dto.getId()); // 查询车辆信息 XpVehicle xpVehicle = xpVehicleClient.queryById(xpVehicleRepair.getVehicleId()).getData(); if(Objects.nonNull(xpVehicle)){ // 修改车辆状态 xpVehicle.setOperatingStatus(1); xpVehicleClient.updateVehicleById(xpVehicle); } xpVehicleRepair.setVehicleId(null); // 修改车辆取回信息 xpVehicleRepair.setRepairMoney(dto.getRepairMoney()); xpVehicleRepair.setRepairMoneyDetail(dto.getRepairMoneyDetail()); xpVehicleRepair.setReturnUserId(id); xpVehicleRepair.setReturnTime(LocalDateTime.now()); } }