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/XpPointClient.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpPointClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpPointClient.java
index f58289f..e30d324 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpPointClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpPointClient.java
@@ -1,5 +1,6 @@
package com.xiaopeng.api.feignClient.operation;
+import com.xiaopeng.api.dto.map.XpPointExportExcelQuery;
import com.xiaopeng.api.dto.operation.PointAddDto;
import com.xiaopeng.api.dto.operation.PointMapQuery;
import com.xiaopeng.api.dto.operation.PointUpdateDto;
@@ -13,31 +14,42 @@
import com.xiaopeng.api.query.operation.PointPageListListQuery;
import com.xiaopeng.api.vo.order.XpHistoryEndPointsVo;
import com.xiaopeng.api.vo.order.XpHistoryStartPointsVo;
+import com.xiaopeng.api.vo.order.XpPointsListVo;
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.*;
+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;
+import java.util.Set;
@FeignClient(contextId = "XpPointClient", value = ServiceNameConstantsEnum.XP_OPERATION_SERVICE, fallbackFactory = XpPointClientFallbackFactory.class)
public interface XpPointClient {
- @PostMapping("/base/v1/mini-program/xp-point/getHistoryStartPoints")
+ @PostMapping("/base/v1/xp-point/getHistoryStartPoints")
R<List<XpHistoryStartPointsVo>> getHistoryStartPoints(@RequestBody HistoryStartPointsDto historyStartPointsDto);
- @PostMapping("/base/v1/mini-program/xp-point/getHistoryEndPoints")
+ @PostMapping("/base/v1/xp-point/getHistoryEndPoints")
R<List<XpHistoryEndPointsVo>> getHistoryEndPoints(@RequestBody HistoryEndPointsDto historyEndPointsDto);
+
+
@PostMapping("/api/v1/point/listElectronicFenceArea")
R<List<XpElectronicFenceArea>> listElectronicFenceArea();
+
@PostMapping("/api/v1/point/listPoint")
R<List<XpPoint>> list(@RequestBody PointListQuery query);
- @PostMapping("/api/v1/point/pageList")
- R<PageInfo<XpPoint>> pageList(PointPageListListQuery query);
+ @PostMapping("/api/v1/point/pageList")
+ R<PageInfo<XpPoint>> pageList(@RequestBody PointPageListListQuery query);
+
+ @PostMapping("/api/v1/point/getByIds")
+ R<List<XpPoint>> getByIds(@RequestBody XpPointExportExcelQuery query);
/**
* 新增点位
@@ -49,13 +61,20 @@
* 编辑点位
*/
@PostMapping("/api/v1/point/editPoint")
- R edit(@Validated@RequestBody PointUpdateDto pointAddDto);
+ R edit(@Validated @RequestBody PointUpdateDto pointAddDto);
/**
* 点位详情
*/
@GetMapping("/api/v1/point/queryPointById")
public R<XpPoint> queryById(@RequestParam Long id);
+
+// /**
+// * 点位删除
+// */
+// @GetMapping("/api/v1/point/deletePoint")
+// R deletePoint(@RequestParam("ids") String ids);
+
/**
* 点位删除
*/
@@ -72,4 +91,26 @@
R<List<XpPoint>> pointMap(@RequestBody PointMapQuery query);
+ @PostMapping("/logan/inner/v1/point/getPointsInfo")
+ R<List<XpPoint>> getPointsInfo(@RequestBody Set<Long> points);
+
+ @GetMapping("/logan/inner/v1/point/getStationChildren")
+ R<List<XpPointsListVo>> getStationChildren(@RequestParam Long stationId);
+
+ /**
+ * 判断点位是在有效期内
+ *
+ * @param pointId
+ * @return
+ */
+ @GetMapping("/logan/inner/v1/point/nowInTimePoint")
+ R<Boolean> nowInTimePoint(@RequestParam Long pointId);
+
+ /**
+ * 编辑点位
+ * @param xpPoint
+ * @return
+ */
+ @PostMapping("/logan/inner/v1/point/editXpPoint")
+ R<?> editXpPoint(@RequestBody XpPoint xpPoint);
}
--
Gitblit v1.7.1