1、根据类型获取对应协议

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/agreement/AgreementController.java

@@ -38,50 +38,59 @@ public class AgreementController {
     @Resource
     private AgreementService agreementService;
 
-    @PostMapping("/create")
-    @Operation(summary = "创建平台协议")
-    @PreAuthorize("@ss.hasPermission('system:agreement:create')")
+    // @PostMapping("/create")
+    // @Operation(summary = "创建平台协议")
+    // @PreAuthorize("@ss.hasPermission('system:agreement:create')")
     public CommonResult<Long> createAgreement(@Valid @RequestBody AgreementSaveReqVO createReqVO) {
         return success(agreementService.createAgreement(createReqVO));
     }
 
-    @PutMapping("/update")
-    @Operation(summary = "更新平台协议")
-    @PreAuthorize("@ss.hasPermission('system:agreement:update')")
+    // @PutMapping("/update")
+    // @Operation(summary = "更新平台协议")
+    // @PreAuthorize("@ss.hasPermission('system:agreement:update')")
     public CommonResult<Boolean> updateAgreement(@Valid @RequestBody AgreementSaveReqVO updateReqVO) {
         agreementService.updateAgreement(updateReqVO);
         return success(true);
     }
 
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除平台协议")
+    // @DeleteMapping("/delete")
+    // @Operation(summary = "删除平台协议")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('system:agreement:delete')")
+    // @PreAuthorize("@ss.hasPermission('system:agreement:delete')")
     public CommonResult<Boolean> deleteAgreement(@RequestParam("id") Long id) {
         agreementService.deleteAgreement(id);
         return success(true);
     }
 
-    @GetMapping("/get")
-    @Operation(summary = "获得平台协议")
+    // @GetMapping("/get")
+    // @Operation(summary = "获得平台协议")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('system:agreement:query')")
+    // @PreAuthorize("@ss.hasPermission('system:agreement:query')")
     public CommonResult<AgreementRespVO> getAgreement(@RequestParam("id") Long id) {
         AgreementDO agreement = agreementService.getAgreement(id);
         return success(BeanUtils.toBean(agreement, AgreementRespVO.class));
     }
 
-    @GetMapping("/page")
-    @Operation(summary = "获得平台协议分页")
-    @PreAuthorize("@ss.hasPermission('system:agreement:query')")
+    @GetMapping("/get/type")
+    @Operation(summary = "根据类型获得平台协议", description = "type：1服务条款 2隐私声明")
+    @Parameter(name = "type", description = "类型", required = true, example = "1")
+    // @PreAuthorize("@ss.hasPermission('system:agreement:query')")
+    public CommonResult<AgreementRespVO> getAgreementByType(@RequestParam("type") Integer type) {
+        AgreementDO agreement = agreementService.getAgreementByType(type);
+        return success(BeanUtils.toBean(agreement, AgreementRespVO.class));
+    }
+
+    // @GetMapping("/page")
+    // @Operation(summary = "获得平台协议分页")
+    // @PreAuthorize("@ss.hasPermission('system:agreement:query')")
     public CommonResult<PageResult<AgreementRespVO>> getAgreementPage(@Valid AgreementPageReqVO pageReqVO) {
         PageResult<AgreementDO> pageResult = agreementService.getAgreementPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, AgreementRespVO.class));
     }
 
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出平台协议 Excel")
-    @PreAuthorize("@ss.hasPermission('system:agreement:export')")
+    // @GetMapping("/export-excel")
+    // @Operation(summary = "导出平台协议 Excel")
+    // @PreAuthorize("@ss.hasPermission('system:agreement:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportAgreementExcel(@Valid AgreementPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/agreement/vo/AgreementRespVO.java

@@ -11,11 +11,11 @@ import com.alibaba.excel.annotation.*;
 @ExcelIgnoreUnannotated
 public class AgreementRespVO {
 
-    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "5752")
+    @Schema(description = "主键")
     @ExcelProperty("主键")
     private Long id;
 
-    @Schema(description = "协议类型：1服务条款 2隐私声明", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "协议类型：1服务条款 2隐私声明")
     @ExcelProperty("协议类型：1服务条款 2隐私声明")
     private Integer type;
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/agreement/AgreementService.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.system.service.agreement;
 
-import java.util.*;
-import javax.validation.*;
-import cn.iocoder.yudao.module.system.controller.admin.agreement.vo.*;
-import cn.iocoder.yudao.module.system.dal.dataobject.agreement.AgreementDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.system.controller.admin.agreement.vo.AgreementPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.agreement.vo.AgreementSaveReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.agreement.AgreementDO;
+
+import javax.validation.Valid;
 
 /**
  * 平台协议 Service 接口
@@ -44,6 +44,14 @@ public interface AgreementService {
      */
     AgreementDO getAgreement(Long id);
 
+    /**
+     * 根据类型获取平台协议
+     *
+     * @param type 类型 1服务条款 2隐私声明
+     * @return 平台协议
+     */
+    AgreementDO getAgreementByType(Integer type);
+
     /**
      * 获得平台协议分页
      *

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/agreement/AgreementServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.service.agreement;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -66,6 +67,13 @@ public class AgreementServiceImpl implements AgreementService {
         return agreementMapper.selectById(id);
     }
 
+    @Override
+    public AgreementDO getAgreementByType(Integer type) {
+        LambdaQueryWrapper<AgreementDO> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AgreementDO::getType, type);
+        return agreementMapper.selectOne(queryWrapper);
+    }
+
     @Override
     public PageResult<AgreementDO> getAgreementPage(AgreementPageReqVO pageReqVO) {
         return agreementMapper.selectPage(pageReqVO);

yudao-server/src/main/resources/application.yaml

@@ -154,6 +154,7 @@ yudao:
   security:
     permit-all_urls:
       - /admin-api/mp/open/** # 微信公众号开放平台，微信回调接口，不需要登录
+      - /admin-api/system/agreement/** # 协议相关，不需要登录
   websocket:
     enable: true # websocket的开关
     path: /infra/ws # 路径
@@ -197,6 +198,7 @@ yudao:
       - /admin-api/system/auth/sms-login # 使用验证码登录，和租户无关
       - /admin-api/system/auth/sms-register # 使用验证码注册，和租户无关
       - /admin-api/system/user/profile/reset-password # 使用验证码重置密码，和租户无关
+      - /admin-api/system/agreement/** # 协议相关，和租户无关
 #      - /admin-api/system/auth/login # 使用账号登录，和租户无关
 #      - /admin-api/system/tenant/create # 创建租户，不携带租户编号
 #      - /admin-api/system/tenant/join # 加入租户，不携带租户编号
@@ -222,6 +224,7 @@ yudao:
       - system_mail_template
       - system_mail_log
       - system_notify_template
+      - system_agreement
       - infra_codegen_column
       - infra_codegen_table
       - infra_config