From 10a6186cc7b3fa100c9b8abb00291cd7642dc7d6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 12 二月 2026 16:51:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpChargingRecordController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpChargingRecordController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpChargingRecordController.java
index 4ee8b09..ab99205 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpChargingRecordController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpChargingRecordController.java
@@ -3,10 +3,9 @@
import com.xiaopeng.api.feignClient.account.XpOperationUserClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
-import com.xiaopeng.api.model.account.XpOperationsUser;
-import com.xiaopeng.api.model.maintenance.XpChargingRecord;
-import com.xiaopeng.api.model.vehicleConvoy.XpVehicle;
+import com.xiaopeng.maintenance.model.query.XpChargingRecordPageQuery;
import com.xiaopeng.common.core.domain.R;
+import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.common.security.service.TokenService;
import com.xiaopeng.maintenance.dto.XpChargingRecordStartDTO;
import com.xiaopeng.maintenance.dto.XpChargingRecordStopDTO;
@@ -14,12 +13,10 @@
import com.xiaopeng.maintenance.service.IXpChargingRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.time.LocalDateTime;
-import java.util.Objects;
+import javax.validation.Valid;
/**
* <p>
@@ -77,5 +74,17 @@
return R.ok(xpChargingRecordVO);
}
+ /**
+ * 通过车辆id查询充电分页列表
+ *
+ * @param query 查询参数
+ * @return 充电记录分页列表
+ */
+ @ApiOperation(value = "通过车辆id查询充电分页列表", tags = {"管理后台-车辆管理-运营车辆管理"})
+ @PostMapping("/api/v1/vehicle/queryChargingByVehicleId")
+ public R<PageInfo<XpChargingRecordVO>> queryChargingByVehicleId(
+ @Valid @RequestBody XpChargingRecordPageQuery query) {
+ return R.ok(xpChargingRecordService.queryChargingByVehicleId(query));
+ }
}
--
Gitblit v1.7.1