From 1442f149019ee0590389abd7a88a79c4d9b59034 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 五月 2025 18:23:34 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AgreementController.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AgreementController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AgreementController.java
index 66a53fb..5df2e91 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AgreementController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AgreementController.java
@@ -3,6 +3,7 @@
import com.ruoyi.admin.entity.Agreement;
import com.ruoyi.admin.service.AgreementService;
+import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
@@ -13,6 +14,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Objects;
/**
* <p>
@@ -35,12 +37,32 @@
*
* @param type 查询类型
*/
+ @RequiresPermissions(value = {"system_agreement", "system_operate"}, logical = Logical.OR)
@ApiOperation(value = "根据类型获取注册协议、隐私政策、司机操作指南", tags = {"后台-隐私政策/司机操作指南"})
@GetMapping(value = "/dataInfo")
@ApiImplicitParams({
- @ApiImplicitParam(value = "查询类型(0注册协议;1:隐私政策;2:司机操作指导)", name = "type", dataType = "Integer", required = true)
+ @ApiImplicitParam(value = "查询类型(0注册协议;1:隐私政策;2:司机操作指导；3：服务规则管理)", name = "type", dataType = "Integer", required = true)
})
public R<Agreement> dataInfo(@RequestParam("type") Integer type) {
+ return agreementService.dataInfo(type);
+ }
+
+ /**
+ * 获取司机操作指南
+ */
+ @GetMapping(value = "/operate")
+ public R<Agreement> operate() {
+ return agreementService.dataInfo(Constants.TWO);
+ }
+
+ /**
+ * 根据类型获取注册协议、隐私政策
+ * -- 用户端远程调用
+ *
+ * @param type 查询类型
+ */
+ @GetMapping(value = "/agreementPolicy")
+ public R<Agreement> agreementPolicy(@RequestParam("type") Integer type) {
return agreementService.dataInfo(type);
}
@@ -49,11 +71,27 @@
*
* @param agreement 协议信息
*/
- @RequiresPermissions(value = {"system_agreement", "system_operate"}, logical = Logical.OR)
+ @RequiresPermissions(value = {"advantage_update", "operate_save"}, logical = Logical.OR)
@ApiOperation(value = "保存政策协议", tags = {"后台-隐私政策/司机操作指南"})
@PostMapping(value = "/saveData")
public R<String> saveData(@RequestBody Agreement agreement) {
return agreementService.saveData(agreement);
}
+ /**
+ * 修改服务规则管理
+ *
+ * @param agreement 修改服务规则管理
+ */
+ @RequiresPermissions(value = {"advantage_update", "operate_save"}, logical = Logical.OR)
+ @ApiOperation(value = "修改服务规则管理", tags = {"后台-修改服务规则管理[2.0]"})
+ @PostMapping(value = "/updateAgree")
+ public R<String> updateAgree(@RequestBody Agreement agreement) {
+ if(Objects.isNull(agreement.getContentType()) || agreement.getContentType()!=3){
+ return R.fail("服务规则管理类型异常");
+ }
+ agreementService.updateById(agreement);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1