From 7708a5515775f318fca10131512d8bb4f9e4ac6a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 25 四月 2026 00:42:22 +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 | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 987f213..79704df 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
@@ -49,7 +49,8 @@
@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) {
+ @ApiParam(name = "type", value = "类型 8=运维APP-小鹏Robotaxi自动驾驶出行运维隐私政策 9=运维APP-第三方共享信息清单 10=运维APP-个人信息收集清单 11=运维APP-权限调用")
+ public R<XpAgreementVo> getAppContent(@PathVariable Integer type) {
return R.ok(xpAgreementService.getContentByType(type));
}
@@ -79,7 +80,9 @@
@ApiOperation(value = "获取协议", tags = {"管理后台-内容中心"})
@GetMapping("/api/v1/agreement/content/{type}")
- public R<XpAgreement> getAgreementContent(@ApiParam(name = "type", value = "类型 -1预付款,-2付款, 1=小鹏Robotaxi隐私政策 2=个人信息收集清单 3=敏感个人信息处理情况说明 4=向第三方提供个人信息情况的说明 5=乘车须知 6=计费规则说明 7=权限说明 8=运维APP-小鹏Robotaxi自动驾驶出行运维隐私政策 9=运维APP-第三方共享信息清单 10=运维APP-个人信息收集清单 11=运维APP-权限调用") @PathVariable Integer type) {
+ @ApiParam(name = "type", value = "类型 1=小鹏Robotaxi隐私政策 2=个人信息收集清单 3=敏感个人信息处理情况说明 4=向第三方提供个人信息情况的说明 5=乘车须知 6=计费规则说明 " +
+ "7=权限说明 8=运维APP-小鹏Robotaxi自动驾驶出行运维隐私政策 9=运维APP-第三方共享信息清单 10=运维APP-个人信息收集清单 11=运维APP-权限调用 12=预付款协议 13=付款协议")
+ public R<XpAgreement> getAgreementContent( @PathVariable Integer type) {
return R.ok(xpAgreementService.getAgreementContent(type));
}
@@ -104,9 +107,11 @@
@ApiOperation(value = "保存登录协议", tags = {"管理后台-内容中心"})
@PostMapping("/api/v1/agreement/saveLoginAgreement")
public R<?> saveLoginAgreement(@RequestBody @Valid XpLoginAgreement dto) {
- long count = xpLoginAgreementService.count(new QueryWrapper<XpLoginAgreement>().eq("type", dto.getType()));
- dto.setSort(Long.valueOf(count + 1).intValue());
- xpLoginAgreementService.save(dto);
+ if(null == dto.getId()){
+ long count = xpLoginAgreementService.count(new QueryWrapper<XpLoginAgreement>().eq("type", dto.getType()));
+ dto.setSort(Long.valueOf(count + 1).intValue());
+ }
+ xpLoginAgreementService.saveOrUpdate(dto);
return R.ok();
}
--
Gitblit v1.7.1