From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpOpenCityClient.java | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpOpenCityClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpOpenCityClient.java
index 8f217c1..ca72a2a 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpOpenCityClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpOpenCityClient.java
@@ -1,25 +1,12 @@
package com.xiaopeng.api.feignClient.operation;
-import com.xiaopeng.api.dto.operation.PointAddDto;
-import com.xiaopeng.api.dto.operation.PointUpdateDto;
-import com.xiaopeng.api.dto.operation.XpPointEnableDisableDto;
-import com.xiaopeng.api.dto.order.HistoryEndPointsDto;
-import com.xiaopeng.api.dto.order.HistoryStartPointsDto;
import com.xiaopeng.api.factory.operation.XpOpenCityClientFallbackFactory;
-import com.xiaopeng.api.factory.operation.XpPointClientFallbackFactory;
-import com.xiaopeng.api.model.operation.XpElectronicFenceArea;
-import com.xiaopeng.api.model.operation.XpPoint;
-import com.xiaopeng.api.query.operation.PointPageListQuery;
-import com.xiaopeng.api.vo.order.XpHistoryEndPointsVo;
-import com.xiaopeng.api.vo.order.XpHistoryStartPointsVo;
+import com.xiaopeng.api.model.operation.XpOpenCity;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.dto.ServiceNameConstantsEnum;
-import com.xiaopeng.common.core.web.page.PageInfo;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
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.RequestParam;
import java.util.List;
@@ -27,7 +14,30 @@
@FeignClient(contextId = "XpOpenCityClient", value = ServiceNameConstantsEnum.XP_OPERATION_SERVICE, fallbackFactory = XpOpenCityClientFallbackFactory.class)
public interface XpOpenCityClient {
- @GetMapping("/api/v1/openCity/nameList")
- R<List<String>> pageList(String cityIds);
+
+ @GetMapping("/base/v1/openCity/nameList")
+ R<List<String>> pageList(@RequestParam String cityIds);
+
+
+ /**
+ * 根据省市区获取开通城市数据
+ * @param provinceCode
+ * @param cityCode
+ * @param districtCode
+ * @return
+ */
+ @PostMapping("/logan/inner/v1/openCity/getXpOpenCity")
+ R<XpOpenCity> getXpOpenCity(@RequestParam("provinceCode") String provinceCode,
+ @RequestParam("cityCode") String cityCode,
+ @RequestParam("districtCode") String districtCode);
+
+
+ /**
+ * 根据id查询开通城市
+ * @param id
+ * @return
+ */
+ @PostMapping("/logan/inner/v1/openCity/getXpOpenCityById")
+ R<XpOpenCity> getXpOpenCityById(@RequestParam("id") Long id);
}
--
Gitblit v1.7.1