Merge branch 'master' into 1.0

liujie

2026-06-09 642330d06db0dc17fbcc3aae3ac7600f291d500d

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpSystemSettingController.java

@@ -3,16 +3,27 @@
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.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;
import com.xiaopeng.operation.job.jobs.HotFixJob;
import com.xiaopeng.operation.service.XpSystemSettingService;
import com.xiaopeng.operation.vo.CustomerServicePhoneVo;
import com.xiaopeng.unifiedverification.interceptor.XpClientCheck;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.time.LocalDateTime;
import java.util.HashMap;

@Slf4j
@Validated
@@ -41,26 +52,43 @@
    }


//    @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)
    @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("/base/v1/support/phone")

    @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);
@@ -69,6 +97,11 @@
        } else {
            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 = {"管理后台-系统"})
@@ -79,8 +112,27 @@

    @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(null != xpSystemSetting.getHotfixStatus() && 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();
    }
}