From 2ed0d5c269b428ed021b793b191f553f6c8fd218 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 14 二月 2026 01:01:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpRegionController.java | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpRegionController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpRegionController.java
index 0897562..dfbb4b6 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpRegionController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpRegionController.java
@@ -12,11 +12,13 @@
import com.xiaopeng.operation.service.XpOpenCityService;
import com.xiaopeng.operation.service.XpRegionService;
import com.xiaopeng.operation.vo.RegionCascaderVO;
-import com.xiaopeng.operation.vo.RegionDistrictSyncResultVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
import java.util.Collections;
import java.util.List;
@@ -30,7 +32,6 @@
*/
@Api(tags = "省市管理")
@RestController
-@RequestMapping("/base/v1/mini-program")
public class XpRegionController {
private final XpRegionService regionService;
@@ -51,7 +52,7 @@
* 查询省市管理
*/
@ApiOperation(value = "查询省市管理",tags = {"小程序-省市管理"},response = XpRegion.class)
- @GetMapping(value = "/open/t-region/getRegion")
+ @GetMapping(value = "/base/v1/mini-program/open/t-region/getRegion")
public R<List<List<XpRegion>>> geXpRegion() {
return R.ok(regionService.getXpRegion());
}
@@ -61,7 +62,7 @@
* 查询市
*/
@ApiOperation(value = "查询市",tags = {"小程序-查询市"},response = XpRegion.class)
- @PostMapping(value = "/open/t-region/getProvince")
+ @PostMapping(value = "/base/v1/mini-program/open/t-region/getProvince")
public R<List<XpRegion>> getProvince(@RequestBody getProvinceQuery query) {
// 缓存数据
List<Object> cacheList = redisService.getCacheList(CacheConstants.XP_REGION_CITY);
@@ -108,14 +109,4 @@
public R<List<RegionCascaderVO>> getRegionCascader() {
return R.ok(regionService.getRegionCascader());
}
-
- /**
- * 管理后台-同步区级数据
- */
- @ApiOperation(value = "管理后台-同步区级数据", tags = {"管理后台-省市区管理"})
- @PostMapping("/api/v1/region/syncDistrict")
- public R<RegionDistrictSyncResultVO> syncDistrict() {
- return R.ok(regionService.syncDistrictFromRegionAll());
- }
-
}
--
Gitblit v1.7.1