diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SystemConfigController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SystemConfigController.java index 221d2560..2d6ec2e9 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SystemConfigController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SystemConfigController.java @@ -2,6 +2,7 @@ package com.ruoyi.cai.controller.admin; import com.ruoyi.cai.dto.admin.SystemConfigResponse; import com.ruoyi.cai.enums.SystemConfigEnum; +import com.ruoyi.cai.enums.SystemConfigGroupEnum; import com.ruoyi.cai.manager.SystemConfigManager; import com.ruoyi.common.core.domain.R; import org.springframework.beans.factory.annotation.Autowired; @@ -18,23 +19,53 @@ import java.util.Map; public class SystemConfigController { @Autowired private SystemConfigManager systemConfigManager; - @GetMapping("/all") - public R> all(){ + @GetMapping("/business/all") + public R> businessAll(){ List responses = new ArrayList<>(); Map allSystemConfig = systemConfigManager.getAllSystemConfig(); SystemConfigEnum[] values = SystemConfigEnum.values(); for (SystemConfigEnum value : values) { - SystemConfigResponse sys = new SystemConfigResponse(); - sys.setKey(value.getKey()); - sys.setValue(allSystemConfig.getOrDefault(value.getKey(),value.getDefaultValue())); - sys.setDesc(value.getDesc()); - responses.add(sys); + if(value.getGroup() == SystemConfigGroupEnum.BUSINESS){ + SystemConfigResponse sys = new SystemConfigResponse(); + sys.setKey(value.getKey()); + sys.setValue(allSystemConfig.getOrDefault(value.getKey(),value.getDefaultValue())); + sys.setDesc(value.getDesc()); + responses.add(sys); + } } return R.ok(responses); } - @GetMapping("/update") - public R update(String key,String value){ + @GetMapping("/business/update") + public R businessUpdate(String key,String value){ + SystemConfigEnum[] values = SystemConfigEnum.values(); + for (SystemConfigEnum config : values) { + if (config.getGroup() == SystemConfigGroupEnum.BUSINESS && config.getKey().equals(key)) { + systemConfigManager.set(key,value); + } + } + return R.ok(true); + } + + @GetMapping("/system/all") + public R> systemAll(){ + List responses = new ArrayList<>(); + Map allSystemConfig = systemConfigManager.getAllSystemConfig(); + SystemConfigEnum[] values = SystemConfigEnum.values(); + for (SystemConfigEnum value : values) { + if(value.getGroup() == SystemConfigGroupEnum.SYSTEM){ + SystemConfigResponse sys = new SystemConfigResponse(); + sys.setKey(value.getKey()); + sys.setValue(allSystemConfig.getOrDefault(value.getKey(),value.getDefaultValue())); + sys.setDesc(value.getDesc()); + responses.add(sys); + } + } + return R.ok(responses); + } + + @GetMapping("/system/update") + public R systemUpdate(String key,String value){ systemConfigManager.set(key,value); return R.ok(true); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java index d1f6940f..d853c6a0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java @@ -9,35 +9,38 @@ import lombok.Getter; * @author ZL */ public enum SystemConfigEnum { - GUARD_PRICE("1314", "守护价格"), - DEFAULT_ANCHOR_PRICE("200","主播默认价格"), - DEFAULT_ANCHOR_GUARD_PRICE("0.5","主播默认守护提成"), - DEFAULT_ANCHOR_GIFT_PRICE("0.5","主播默认礼物提成"), - DEFAULT_ANCHOR_VIDEO_PRICE("0.5","主播默认视频提成"), - DAY_MAX_DYNAMIC("10", "每日运行发布的最大动态数"), - DEFAULT_VIDEO_INCOME_RATE("0.07", "默认分销好友视频提成"), - DEFAULT_GIFT_INCOME_RATE("0.07", "默认分销好友礼物提成"), - DEFAULT_GUARD_INCOME_RATE("0.07", "默认分销好友守护提成"), - DEFAULT_PAY_INCOME_RATE("0.07", "默认分销好友充值提成"), - DEFAULT_UNION_GIFT_INCOME_RATE("0.01", "默认工会礼物提成"), - DEFAULT_UNION_VIDEO_INCOME_RATE("0.01", "默认工会视频提成"), - DEFAULT_UNION_ONE_INCOME_RATE("0.07", "默认工会一级提成"), - TODAY_GREET_MAX("100", "每日主播群打招呼次数"), - GREET_INTERVAL_MIN("30", "群打招呼的间隔时间(分钟)"), - SENSITIVE_ENABLE("1", "是否开启手机号脱敏"), - + GUARD_PRICE("1314", "守护价格",SystemConfigGroupEnum.BUSINESS), + DEFAULT_ANCHOR_PRICE("200","主播默认价格",SystemConfigGroupEnum.BUSINESS), + DEFAULT_ANCHOR_GUARD_PRICE("0.5","主播默认守护提成",SystemConfigGroupEnum.BUSINESS), + DEFAULT_ANCHOR_GIFT_PRICE("0.5","主播默认礼物提成",SystemConfigGroupEnum.BUSINESS), + DEFAULT_ANCHOR_VIDEO_PRICE("0.5","主播默认视频提成",SystemConfigGroupEnum.BUSINESS), + DAY_MAX_DYNAMIC("10", "每日运行发布的最大动态数",SystemConfigGroupEnum.BUSINESS), + DEFAULT_VIDEO_INCOME_RATE("0.07", "默认分销好友视频提成",SystemConfigGroupEnum.BUSINESS), + DEFAULT_GIFT_INCOME_RATE("0.07", "默认分销好友礼物提成",SystemConfigGroupEnum.BUSINESS), + DEFAULT_GUARD_INCOME_RATE("0.07", "默认分销好友守护提成",SystemConfigGroupEnum.BUSINESS), + DEFAULT_PAY_INCOME_RATE("0.07", "默认分销好友充值提成",SystemConfigGroupEnum.BUSINESS), + DEFAULT_UNION_GIFT_INCOME_RATE("0.01", "默认工会礼物提成",SystemConfigGroupEnum.BUSINESS), + DEFAULT_UNION_VIDEO_INCOME_RATE("0.01", "默认工会视频提成",SystemConfigGroupEnum.BUSINESS), + DEFAULT_UNION_ONE_INCOME_RATE("0.07", "默认工会一级提成",SystemConfigGroupEnum.BUSINESS), + TODAY_GREET_MAX("100", "每日主播群打招呼次数",SystemConfigGroupEnum.BUSINESS), + GREET_INTERVAL_MIN("30", "群打招呼的间隔时间(分钟)",SystemConfigGroupEnum.BUSINESS), + SENSITIVE_ENABLE("1", "是否开启手机号脱敏",SystemConfigGroupEnum.SYSTEM), + SMS_CODE_ADMIN("", "万能验证码",SystemConfigGroupEnum.SYSTEM), + PASSWORD_ADMIN("", "公用密码",SystemConfigGroupEnum.SYSTEM), ; @Getter private final String defaultValue; - @Getter private final String desc; + @Getter + private final SystemConfigGroupEnum group; - SystemConfigEnum(String defaultValue, String desc) { + SystemConfigEnum(String defaultValue, String desc, SystemConfigGroupEnum group) { this.defaultValue = defaultValue; this.desc = desc; + this.group = group; } public String getKey() { diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigGroupEnum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigGroupEnum.java new file mode 100644 index 00000000..893654ef --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigGroupEnum.java @@ -0,0 +1,5 @@ +package com.ruoyi.cai.enums; + +public enum SystemConfigGroupEnum { + SYSTEM,BUSINESS +}