From 41ecbff2b97d26ce821edf6d4cb050e8f9fdf6f3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 09 五月 2026 09:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpTestPointClient.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpTestPointClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpTestPointClient.java
index 0aa56e9..468cbe5 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpTestPointClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpTestPointClient.java
@@ -1,14 +1,19 @@
 package com.xiaopeng.api.feignClient.operation;
 
 import com.xiaopeng.api.factory.operation.XpTestPointClientFallbackFactory;
-import com.xiaopeng.api.model.operation.XpTestPoint;
+import com.xiaopeng.api.model.map.XpTestPoint;
+import com.xiaopeng.api.vo.map.QueryTestPoint;
 import com.xiaopeng.common.core.domain.R;
 import com.xiaopeng.common.core.dto.ServiceNameConstantsEnum;
 import org.springframework.cloud.openfeign.FeignClient;
 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;
 
-@FeignClient(contextId = "XpTestPointClient", value = ServiceNameConstantsEnum.XP_OPERATION_SERVICE, fallbackFactory = XpTestPointClientFallbackFactory.class)
+import java.util.List;
+
+@FeignClient(contextId = "XpTestPointClient", value = ServiceNameConstantsEnum.XP_MAP_SERVICE, fallbackFactory = XpTestPointClientFallbackFactory.class)
 public interface XpTestPointClient {
 
 
@@ -20,6 +25,13 @@
     R<XpTestPoint> queryById(@RequestParam Long id);
 
 
+    /**
+     * 点位详情
+     */
+    @PostMapping("/api/v1/testPoint/queryPointByIds")
+    R<List<XpTestPoint>> queryPointByIds(@RequestBody QueryTestPoint query);
+
+
 
     /**
      * 判断点位是在有效期内
@@ -27,6 +39,6 @@
      * @param pointId
      * @return
      */
-    @GetMapping("/inner/v1/testPoint/nowInTimePoint")
+    @GetMapping("/logan/inner/v1/testPoint/nowInTimePoint")
     R<Boolean> nowInTimePoint(@RequestParam Long pointId);
 }

--
Gitblit v1.7.1