From 1cf78d7b0e01a2d960ade3033658c0ab7fac8cd3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 26 二月 2026 11:45:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java
index 64bfd55..944ed64 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java
@@ -6,9 +6,11 @@
import com.xiaopeng.api.dto.operation.PointUpdateDto;
import com.xiaopeng.api.dto.operation.XpPointEnableDisableDto;
import com.xiaopeng.api.model.operation.*;
+import com.xiaopeng.api.query.operation.PointPageListListQuery;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.controller.BaseController;
-import com.xiaopeng.api.query.operation.PointPageListQuery;
+import com.xiaopeng.api.query.operation.PointListQuery;
+import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.operation.dto.XpPointSpecialDto;
import com.xiaopeng.operation.service.IXpElectronicFenceAreaService;
import com.xiaopeng.operation.service.IXpElectronicFenceService;
@@ -57,10 +59,16 @@
}
@ApiOperation(value = "点位管理列表", response = XpPoint.class)
@PostMapping("/listPoint")
- public R<List<XpPoint>> list(@RequestBody PointPageListQuery query) {
+ public R<List<XpPoint>> list(@RequestBody PointListQuery query) {
List<XpPoint> pageList = xpPointService.listAll(query);
return R.ok(pageList);
}
+ @ApiOperation(value = "点位管理分页列表", response = XpPoint.class)
+ @PostMapping("/pageList")
+ public R<PageInfo<XpPoint>> pageList(@RequestBody PointPageListListQuery query) {
+ PageInfo<XpPoint> pageList = xpPointService.pageList(query);
+ return R.ok(pageList);
+ }
/**
* 新增点位
*/
--
Gitblit v1.7.1