From 834d78b91b6a536a33ed7695bfd2e582cc5284a9 Mon Sep 17 00:00:00 2001 From: dute7liang <383200134@qq.com> Date: Mon, 15 Jan 2024 23:28:50 +0800 Subject: [PATCH] init --- .../admin/AgreementSettingController.java | 9 ++-- .../app/AgreementSettingAppController.java | 51 +++++++++++++++++++ .../ruoyi/cai/domain/AgreementSetting.java | 12 ++--- .../ruoyi/cai/dto/app/vo/AgreementDTO.java | 15 ++++++ .../cai/service/AgreementSettingService.java | 3 ++ .../impl/AgreementSettingServiceImpl.java | 4 ++ 6 files changed, 80 insertions(+), 14 deletions(-) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AgreementSettingAppController.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/AgreementDTO.java diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AgreementSettingController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AgreementSettingController.java index a1be4bb4..76190fc7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AgreementSettingController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AgreementSettingController.java @@ -32,14 +32,11 @@ public class AgreementSettingController extends BaseController { /** * 获取协议设置详细信息 - * - * @param id 主键 */ @SaCheckPermission("cai:agreementSetting:query") - @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { - return R.ok(agreementSettingService.getById(id)); + @GetMapping("/info") + public R getInfo() { + return R.ok(agreementSettingService.getAgreementSetting()); } /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AgreementSettingAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AgreementSettingAppController.java new file mode 100644 index 00000000..ae6364fc --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AgreementSettingAppController.java @@ -0,0 +1,51 @@ +package com.ruoyi.cai.controller.app; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.ruoyi.cai.domain.AgreementSetting; +import com.ruoyi.cai.dto.app.vo.AgreementDTO; +import com.ruoyi.cai.service.AgreementSettingService; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.common.enums.BusinessType; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +/** + * 协议设置 + * + * @author 77 + * @date 2024-01-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/app/agreementSetting") +@Tag(name = "协议相关接口") +public class AgreementSettingAppController extends BaseController { + + private final AgreementSettingService agreementSettingService; + + + @GetMapping("/userAgreement") + @Operation(summary = "获取用户协议") + public R userAgreement() { + String userAgreement = agreementSettingService.getAgreementSetting().getUserAgreement(); + return R.ok(new AgreementDTO(userAgreement)); + } + + @GetMapping("/anchorJoinAgreement") + @Operation(summary = "用户主播入驻协议") + public R anchorJoinAgreement() { + String anchorJoinAgreement = agreementSettingService.getAgreementSetting().getAnchorJoinAgreement(); + return R.ok(new AgreementDTO(anchorJoinAgreement)); + } + + + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AgreementSetting.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AgreementSetting.java index f93890c6..961d7242 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AgreementSetting.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AgreementSetting.java @@ -1,13 +1,10 @@ package com.ruoyi.cai.domain; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.util.Date; -import java.math.BigDecimal; -import com.ruoyi.common.core.domain.BaseEntity; +import java.io.Serializable; /** * 协议设置对象 cai_agreement_setting @@ -16,9 +13,8 @@ import com.ruoyi.common.core.domain.BaseEntity; * @date 2024-01-14 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("cai_agreement_setting") -public class AgreementSetting extends BaseEntity { +public class AgreementSetting implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/AgreementDTO.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/AgreementDTO.java new file mode 100644 index 00000000..493d9885 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/AgreementDTO.java @@ -0,0 +1,15 @@ +package com.ruoyi.cai.dto.app.vo; + +import lombok.Data; + +@Data +public class AgreementDTO { + private String agreement; + + public AgreementDTO() { + } + + public AgreementDTO(String agreement) { + this.agreement = agreement; + } +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AgreementSettingService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AgreementSettingService.java index 29854994..3826a87b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AgreementSettingService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AgreementSettingService.java @@ -11,4 +11,7 @@ import com.ruoyi.cai.domain.AgreementSetting; */ public interface AgreementSettingService extends IService { + AgreementSetting getAgreementSetting(); + + } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AgreementSettingServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AgreementSettingServiceImpl.java index 64d7979a..26195c54 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AgreementSettingServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AgreementSettingServiceImpl.java @@ -15,4 +15,8 @@ import org.springframework.stereotype.Service; @Service public class AgreementSettingServiceImpl extends ServiceImpl implements AgreementSettingService { + @Override + public AgreementSetting getAgreementSetting() { + return this.getById(1); + } }