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-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpTradingStrategyController.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpTradingStrategyController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpTradingStrategyController.java
index f1e649e..8f27276 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpTradingStrategyController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpTradingStrategyController.java
@@ -1,5 +1,6 @@
package com.xiaopeng.operation.controller;
+import com.xiaopeng.api.model.operation.XpTradingStrategy;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.controller.BaseController;
import com.xiaopeng.common.log.annotation.AdminOperationLog;
@@ -7,15 +8,15 @@
import com.xiaopeng.common.log.enums.AdminOperationType;
import com.xiaopeng.operation.dto.XpTradingStrategyEditDTO;
import com.xiaopeng.operation.service.IXpTradingStrategyService;
-import com.xiaopeng.operation.vo.XpTradingStrategyDetailVO;
+import com.xiaopeng.api.vo.operation.XpTradingStrategyDetailVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
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.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
/**
* <p>
@@ -27,7 +28,7 @@
*/
@RestController
@Api(tags = "交易策略管理")
-@RequiredArgsConstructor
+@RequiredArgsConstructor(onConstructor_ = @Lazy)
public class XpTradingStrategyController extends BaseController {
private final IXpTradingStrategyService tradingStrategyService;
@@ -40,6 +41,13 @@
@ApiOperation(value = "获取交易策略配置", tags = {"管理后台-交易管理-交易策略配置"})
@GetMapping("/api/v1/tradingStrategy/queryById")
public R<XpTradingStrategyDetailVO> queryById() {
+ XpTradingStrategyDetailVO detail = tradingStrategyService.queryDetail();
+ return R.ok(detail);
+ }
+
+ @ApiOperation(value = "获取交易策略配置", tags = {"inner-交易策略配置"})
+ @GetMapping("/logan/inner/xpOperationStrategy/getOne")
+ public R<XpTradingStrategyDetailVO> getOne() {
XpTradingStrategyDetailVO detail = tradingStrategyService.queryDetail();
return R.ok(detail);
}
@@ -62,4 +70,16 @@
tradingStrategyService.editStrategy(dto);
return R.ok();
}
+
+
+ /**
+ * 根据开通城市获取交易策略
+ * @param cityCode
+ * @return
+ */
+ @GetMapping("/logan/inner/xpOperationStrategy/getTradingStrategyByCityCode/{cityCode}")
+ public R<XpTradingStrategy> getTradingStrategyByCityCode(@PathVariable String cityCode){
+ XpTradingStrategy detail = tradingStrategyService.getTradingStrategyByCityCode(cityCode);
+ return R.ok(detail);
+ }
}
--
Gitblit v1.7.1