From 7f3081da3c0597cfbfc8f0fc4e342c4ceb901f6d Mon Sep 17 00:00:00 2001
From: kong <sunuping1@sina.com>
Date: 星期日, 12 四月 2026 18:04:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpSystemSettingController.java | 77 +++++++++++++++++++++++++++++++++++---
1 files changed, 70 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 a668feb..4fa9c19 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
@@ -1,26 +1,30 @@
package com.xiaopeng.operation.controller;
-import com.xiaopeng.api.model.operation.SysOperLog;
+import com.xiaopeng.api.model.operation.XpSystemSetting;
import com.xiaopeng.common.core.constant.CacheConstants;
import com.xiaopeng.common.core.domain.R;
+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.redis.service.RedisService;
+import com.xiaopeng.operation.job.base.QuartzManager;
+import com.xiaopeng.operation.job.base.TimeJobType;
+import com.xiaopeng.operation.job.jobs.HotFixJob;
import com.xiaopeng.operation.service.XpSystemSettingService;
import com.xiaopeng.operation.vo.CustomerServicePhoneVo;
-import com.xiaopeng.operation.vo.XpBannerListVo;
+import com.xiaopeng.unifiedverification.interceptor.XpClientCheck;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
+import java.time.LocalDateTime;
+import java.util.HashMap;
@Slf4j
+@Validated
@RestController
-@RequestMapping("")
-@Api(tags = "系统设置模块")
public class XpSystemSettingController extends BaseController {
// 系统设置实现类
@@ -35,7 +39,7 @@
@GetMapping("/base/v1/mini-program/support/phone")
@ApiOperation(value = "获取客服电话",tags = {"小程序首页"},response = String.class)
- public AjaxResult<CustomerServicePhoneVo> getBannerList() {
+ public AjaxResult<CustomerServicePhoneVo> getCustomerServicePhone() {
Object customerServicePhone = redisService.getCacheObject(CacheConstants.CUSTOMER_SERVICE_PHONE);
if(customerServicePhone!=null){
return success(new CustomerServicePhoneVo(customerServicePhone.toString()));
@@ -53,15 +57,74 @@
@GetMapping("/base/v1/mini-program/support/getOrderDistance")
+ @XpClientCheck(checkToken = false, checkOtpToken = true)
@ApiOperation(value = "获取下单距离",tags = {"小程序首页-服务调用获取下单距离"},response = Integer.class)
public R getOrderDistance() {
return R.ok(xpSystemSettingService.getOrderDistance());
}
+
+ @GetMapping("/base/v1/support/getOrderDistance")
+ @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());
+ }
+
+
@ApiOperation(value = "获取自动结束行程时间",tags = {"小程序-业务流程"},response = Integer.class)
@GetMapping("/api/v1/mini-program/support/getOrderFinishTime")
+ @XpClientCheck(checkToken = false, checkOtpToken = true)
public R<Integer> getOrderFinishTime() {
return R.ok(xpSystemSettingService.getOrderFinishTime());
}
+
+ @GetMapping("/api/v1/support/getOrderFinishTime")
+ public R<Integer> getOrderFinishTime1() {
+ return R.ok(xpSystemSettingService.getOrderFinishTime());
+ }
+
+
+ @GetMapping("/maintenance-app/base/v1/support/phone")
+ @ApiOperation(value = "获取客服电话", tags = {"运维APP-个人中心"}, response = String.class)
+ public R<CustomerServicePhoneVo> getCustomerPhone() {
+ Object customerServicePhone = redisService.getCacheObject(CacheConstants.CUSTOMER_SERVICE_PHONE);
+ if (customerServicePhone != null) {
+ return R.ok(new CustomerServicePhoneVo(customerServicePhone.toString()));
+ } else {
+ return R.ok(new CustomerServicePhoneVo(xpSystemSettingService.getCustomerServicePhone()));
+ }
+ }
+
+ @ApiOperation(value = "获取系统配置、热修复", tags = {"管理后台-系统"})
+ @GetMapping("/api/v1/systemSetting")
+ public R<XpSystemSetting> getSystemSetting(){
+ return R.ok(xpSystemSettingService.lambdaQuery().last("limit 1").one());
+ }
+
+ @ApiOperation(value = "保存系统配置、热修复", tags = {"管理后台-系统"})
+ @PostMapping("/api/v1/systemSetting/save")
+ public R<?> saveSystemSetting(@RequestBody XpSystemSetting xpSystemSetting){
+ xpSystemSettingService.saveSystemSetting(xpSystemSetting);
+ if(xpSystemSetting.getHotfixStatus()==1){
+ // 开启定时任务去关闭
+ // 计算当前时间与结束时间的秒数
+ LocalDateTime hotfixEndTime = xpSystemSetting.getHotfixEndTime();
+ QuartzManager.addJob(
+ HotFixJob.class,
+ (HotFixJob.name ).toUpperCase(),
+ TimeJobType.HOT_FIX,
+ DateUtils.localDateTimeToDate(hotfixEndTime),
+ new HashMap<>()
+ );
+ }
+
+ return R.ok();
+ }
}
--
Gitblit v1.7.1