From bf44552798a9ca7fe77bf2a11f33f6babaabc276 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 06 三月 2026 19:46:01 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpPointClient.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 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 cabea97..4b18fee 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;
@@ -7,20 +8,24 @@
import com.xiaopeng.api.dto.order.HistoryEndPointsDto;
import com.xiaopeng.api.dto.order.HistoryStartPointsDto;
import com.xiaopeng.api.factory.operation.XpPointClientFallbackFactory;
-import com.xiaopeng.api.factory.operation.XpSystemSettingClientFallbackFactory;
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.query.operation.PointListQuery;
+import com.xiaopeng.api.query.operation.PointPageListListQuery;
import com.xiaopeng.api.vo.order.XpHistoryEndPointsVo;
import com.xiaopeng.api.vo.order.XpHistoryStartPointsVo;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.dto.ServiceNameConstantsEnum;
-import io.swagger.annotations.ApiOperation;
+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 {
@@ -31,10 +36,19 @@
@PostMapping("/base/v1/mini-program/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 PointPageListQuery query);
+ R<List<XpPoint>> list(@RequestBody PointListQuery 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);
/**
* 新增点位
@@ -46,13 +60,19 @@
* 编辑点位
*/
@PostMapping("/api/v1/point/editPoint")
- R edit(@Validated@RequestBody PointUpdateDto pointAddDto);
+ R edit(@Validated @RequestBody PointUpdateDto pointAddDto);
/**
* 点位详情
*/
@GetMapping("/api/v1/point/queryPointById")
- public R queryById(@RequestParam Long id);
+ public R<XpPoint> queryById(@RequestParam Long id);
+
+ /**
+ * 点位删除
+ */
+ @GetMapping("/api/v1/point/deletePoint")
+ R deletePoint(@RequestParam("ids") String ids);
/**
* 启用/禁用
@@ -62,4 +82,17 @@
@PostMapping("/api/v1/pointMap")
R<List<XpPoint>> pointMap(@RequestBody PointMapQuery query);
+
+
+ @PostMapping("/base/v1/mini-program/inner/point/getPointsInfo")
+ R<List<XpPoint>> getPointsInfo(@RequestBody Set<Long> points);
+
+ /**
+ * 判断点位是在有效期内
+ *
+ * @param pointId
+ * @return
+ */
+ @GetMapping("/base/v1/mini-program/inner/point/nowInTimePoint")
+ R<Boolean> nowInTimePoint(@RequestParam Long pointId);
}
--
Gitblit v1.7.1