From 642330d06db0dc17fbcc3aae3ac7600f291d500d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:56:45 +0800
Subject: [PATCH] Merge branch 'master' into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpSystemSettingController.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpSystemSettingController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpSystemSettingController.java
index 971660f..7df75a6 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpSystemSettingController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpSystemSettingController.java
@@ -6,6 +6,9 @@
import com.xiaopeng.common.core.utils.DateUtils;
import com.xiaopeng.common.core.web.controller.BaseController;
import com.xiaopeng.common.core.web.domain.AjaxResult;
+import com.xiaopeng.common.log.annotation.AdminOperationLog;
+import com.xiaopeng.common.log.enums.AdminBusinessType;
+import com.xiaopeng.common.log.enums.AdminOperationType;
import com.xiaopeng.common.redis.service.RedisService;
import com.xiaopeng.operation.job.base.QuartzManager;
import com.xiaopeng.operation.job.base.TimeJobType;
@@ -49,12 +52,6 @@
}
-// @GetMapping("/support/getOrderDistance")
-// @ApiOperation(value = "获取下单距离",tags = {"小程序首页-服务调用获取下单距离"},response = Integer.class)
-// public AjaxResult<Integer> getOrderDistance() {
-// return success(xpSystemSettingService.getOrderDistance());
-// }
-
@GetMapping("/base/v1/mini-program/support/getOrderDistance")
@XpClientCheck(checkToken = false, checkOtpToken = true)
@@ -68,6 +65,12 @@
@ApiOperation(value = "获取下单距离",tags = {"小程序首页-服务调用获取下单距离"},response = Integer.class)
public R getOrderDistance1() {
return R.ok(xpSystemSettingService.getOrderDistance());
+ }
+
+ @GetMapping("/logan/rt/v1/getMinOrderDistance")
+ @ApiOperation(value = "获取最小下单距离", notes = "内部服务调用，返回起终点允许发单的最小距离阈值，单位米", tags = {"内部接口-获取最小下单距离"}, response = Integer.class)
+ public R<Integer> getMinOrderDistance() {
+ return R.ok(xpSystemSettingService.getMinOrderDistance());
}
@@ -95,6 +98,11 @@
return R.ok(new CustomerServicePhoneVo(xpSystemSettingService.getCustomerServicePhone()));
}
}
+ @ApiOperation(value = "获取系统配置、热修复", tags = {"管理后台-系统"})
+ @GetMapping("/api/v1/systemSetting/getOne")
+ public R<XpSystemSetting> getSystemSettingOne(){
+ return R.ok(xpSystemSettingService.getSystemSettingOne());
+ }
@ApiOperation(value = "获取系统配置、热修复", tags = {"管理后台-系统"})
@GetMapping("/api/v1/systemSetting")
@@ -104,9 +112,15 @@
@ApiOperation(value = "保存系统配置、热修复", tags = {"管理后台-系统"})
@PostMapping("/api/v1/systemSetting/save")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.SYSTEM_SETTING_MANAGEMENT,
+ operationType = AdminOperationType.EDIT,
+ content = "保存系统配置、热修复",
+ appendRequestData = true
+ )
public R<?> saveSystemSetting(@RequestBody XpSystemSetting xpSystemSetting){
xpSystemSettingService.saveSystemSetting(xpSystemSetting);
- if(xpSystemSetting.getHotfixStatus()==1){
+ if(null != xpSystemSetting.getHotfixStatus() && xpSystemSetting.getHotfixStatus()==1){
// 开启定时任务去关闭
// 计算当前时间与结束时间的秒数
LocalDateTime hotfixEndTime = xpSystemSetting.getHotfixEndTime();
--
Gitblit v1.7.1