From 7e98a6098af62e875dda399fefff368cf6a48b43 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 12 四月 2026 14:22:50 +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/XpAgreementController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpAgreementController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpAgreementController.java
index 39f4e31..5dcb247 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpAgreementController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpAgreementController.java
@@ -3,7 +3,9 @@
import com.xiaopeng.api.model.operation.XpAgreement;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.controller.BaseController;
+import com.xiaopeng.operation.dto.XpAgreementAppUserDto;
import com.xiaopeng.operation.dto.XpAgreementDTO;
+import com.xiaopeng.operation.service.IXpLoginAgreementService;
import com.xiaopeng.operation.service.XpAgreementService;
import com.xiaopeng.operation.vo.XpAgreementVo;
import com.xiaopeng.unifiedverification.interceptor.XpClientCheck;
@@ -14,6 +16,8 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.List;
@@ -24,39 +28,49 @@
private final XpAgreementService xpAgreementService;
+ @Resource
+ private IXpLoginAgreementService xpLoginAgreementService;
+
public XpAgreementController(XpAgreementService xpAgreementService) {
this.xpAgreementService = xpAgreementService;
}
- @ApiOperation(value = "获取协议",tags = {"小程序-首页"},response = XpAgreementVo.class)
+ @ApiOperation(value = "获取协议", tags = {"小程序-首页"}, response = XpAgreementVo.class)
@GetMapping("/base/v1/mini-program/privacy/content/{type}")
public R<XpAgreementVo> getContent(@PathVariable Integer type) {
return R.ok(xpAgreementService.getContentByType(type));
}
- @ApiOperation(value = "获取协议所有",tags = {"小程序-首页所有"},response = XpAgreementVo.class)
+ @ApiOperation(value = "获取协议所有", tags = {"小程序-首页所有"}, response = XpAgreementVo.class)
@GetMapping("/base/v1/mini-program/privacy/contentAll")
public R<List<XpAgreementVo>> contentAll() {
return R.ok(xpAgreementService.getContentByTypeAll());
}
-
- @ApiOperation(value = "获取协议/隐私政策",tags = {"运维APP-个人中心"},response = XpAgreementVo.class)
- @GetMapping("/base/v1/privacy/content/{type}")
+ @ApiOperation(value = "获取协议/隐私政策", tags = {"运维APP-个人中心"}, response = XpAgreementVo.class)
+ @GetMapping("/maintenance-app/base/v1/privacy/content/{type}")
public R<XpAgreementVo> getAppContent(@ApiParam(name = "type", value = "类型 8=运维APP-小鹏Robotaxi自动驾驶出行运维隐私政策 9=运维APP-第三方共享信息清单 10=运维APP-个人信息收集清单 11=运维APP-权限调用") @PathVariable Integer type) {
return R.ok(xpAgreementService.getContentByType(type));
}
- @ApiOperation(value = "获取协议",tags = {"管理后台-内容中心"})
+ @ApiOperation(value = "获取登录协议", tags = {"运维APP-登录"}, response = XpAgreementVo.class)
+ @GetMapping("/maintenance-app/base/v1/loginAgreement/getLoginAgreementList")
+ public R<List<XpAgreementVo>> getLoginAgreementList() {
+ return R.ok(xpLoginAgreementService.getLoginAgreementList(2));
+ }
+
+
+ @ApiOperation(value = "获取协议", tags = {"管理后台-内容中心"})
@GetMapping("/api/v1/agreement/content/{type}")
public R<XpAgreement> getAgreementContent(@ApiParam(name = "type", value = "类型 1=小鹏Robotaxi隐私政策 2=个人信息收集清单 3=敏感个人信息处理情况说明 4=向第三方提供个人信息情况的说明 5=乘车须知 6=计费规则说明 7=权限说明 8=运维APP-小鹏Robotaxi自动驾驶出行运维隐私政策 9=运维APP-第三方共享信息清单 10=运维APP-个人信息收集清单 11=运维APP-权限调用") @PathVariable Integer type) {
return R.ok(xpAgreementService.getAgreementContent(type));
}
- @ApiOperation(value = "保存协议",tags = {"管理后台-内容中心"})
+
+ @ApiOperation(value = "保存协议", tags = {"管理后台-内容中心"})
@PostMapping("/api/v1/agreement/save")
- public R<?> saveAgreement(@RequestBody @Valid XpAgreementDTO dto){
+ public R<?> saveAgreement(@RequestBody @Valid XpAgreementDTO dto) {
xpAgreementService.saveAgreement(dto);
return R.ok();
}
--
Gitblit v1.7.1