Merge remote-tracking branch 'origin/master'

无关风月

2026-02-24 32063e565deaf03a0cc8abf1fafd146cc4e4d421

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpChargingRecordController.java

@@ -11,6 +11,8 @@
import com.xiaopeng.maintenance.dto.XpChargingRecordStopDTO;
import com.xiaopeng.maintenance.model.vo.XpChargingRecordVO;
import com.xiaopeng.maintenance.service.IXpChargingRecordService;
import com.xiaopeng.maintenance.service.XpTaskService;
import com.xiaopeng.maintenance.vo.ChargingStatusVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,12 +35,15 @@

    @Autowired
    private IXpChargingRecordService xpChargingRecordService;

    @Autowired
    private XpVehicleClient xpVehicleClient;
    @Autowired
    private XpOperationUserClient xpOperationUserClient;
    @Autowired
    private TokenService tokenService;
    @Autowired
    private XpTaskService xpTaskService;

    /**
     * 车辆运维-车辆运维-车辆开始充电
@@ -61,10 +66,24 @@

        Long id = tokenService.getLoginOperationUser().getId();
        xpChargingRecordService.stopCharging(dto, id);
        //更新任务状态
        xpTaskService.updateTaskStatus(dto.getTaskId(), 2);
        return R.ok();
    }

    /**
     * 车辆运维-车辆运维-车辆充电查询当前状态
     */
    @ApiOperation(value = "车辆运维-车辆运维-车辆充电查询当前状态", tags = {"运维APP-车辆管理"})
    @GetMapping("/api/v1/chargingRecord/queryChargingStatus")
    public R<ChargingStatusVO> queryChargingStatus(@RequestParam Long vehicleId) {
        Long id = tokenService.getLoginOperationUser().getId();
        ChargingStatusVO chargingStatusVO = xpChargingRecordService.queryChargingStatus(vehicleId);
        return R.ok(chargingStatusVO);
    }


    /**
     * 车辆运维-车辆运维-充电记录详情
     */
    @ApiOperation(value = "车辆运维-运维记录-充电记录详情", tags = {"运维APP-车辆管理"})