From ea03014f7ae537bbabac2719cc48474aa48ff412 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Sun, 9 Jul 2023 23:29:54 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.0=E3=80=91=E3=80=90=E6=9D=83?= =?UTF-8?q?=E9=99=90=E3=80=91=E6=9B=B4=E6=96=B0=E4=B8=BB=E9=A2=98=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2=E7=9A=84=E6=9D=83=E9=99=90=E6=A0=87?= =?UTF-8?q?=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/modular/theme/constants/ThemeConstants.java | 5 +++++ .../theme/controller/SysThemeApiController.java | 6 ++---- .../modular/theme/controller/SysThemeController.java | 4 ++-- .../theme/controller/SysThemeTemplateController.java | 10 ++++++---- .../controller/SysThemeTemplateFieldController.java | 4 ++-- .../controller/SysThemeTemplateRelController.java | 8 +++++--- 6 files changed, 22 insertions(+), 15 deletions(-) diff --git a/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/constants/ThemeConstants.java b/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/constants/ThemeConstants.java index f5b3e6f4d..02a44ccf3 100644 --- a/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/constants/ThemeConstants.java +++ b/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/constants/ThemeConstants.java @@ -23,4 +23,9 @@ public interface ThemeConstants { */ String THEME_CODE_SYSTEM_PREFIX = "GUNS"; + /** + * 主题管理界面的权限标识 + */ + String THEME_MANAGER = "THEME_MANAGER"; + } diff --git a/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeApiController.java b/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeApiController.java index 91eb5fcdd..a70a73b55 100644 --- a/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeApiController.java +++ b/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeApiController.java @@ -1,6 +1,5 @@ package cn.stylefeng.roses.kernel.sys.modular.theme.controller; -import cn.stylefeng.roses.kernel.rule.enums.ResBizTypeEnum; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; @@ -19,7 +18,7 @@ import javax.annotation.Resource; * @since 2022/1/10 18:27 */ @RestController -@ApiResource(name = "主题开放接口的API", resBizType = ResBizTypeEnum.SYSTEM) +@ApiResource(name = "主题开放接口的API") public class SysThemeApiController { @Resource @@ -31,8 +30,7 @@ public class SysThemeApiController { * @author fengshuonan * @since 2022/1/10 18:29 */ - @GetResource(name = "获取当前Guns管理系统的主题数据", path = "/theme/currentThemeInfo", requiredPermission = false, - requiredLogin = false) + @GetResource(name = "获取当前Guns管理系统的主题数据", path = "/theme/currentThemeInfo", requiredLogin = false) public ResponseData currentThemeInfo(SysThemeRequest sysThemeParam) { DefaultTheme defaultTheme = sysThemeService.currentThemeInfo(sysThemeParam); return new SuccessResponseData<>(defaultTheme); diff --git a/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeController.java b/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeController.java index 3d549c49e..18e15353a 100644 --- a/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeController.java +++ b/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeController.java @@ -2,12 +2,12 @@ package cn.stylefeng.roses.kernel.sys.modular.theme.controller; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; -import cn.stylefeng.roses.kernel.rule.enums.ResBizTypeEnum; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource; +import cn.stylefeng.roses.kernel.sys.modular.theme.constants.ThemeConstants; import cn.stylefeng.roses.kernel.sys.modular.theme.entity.SysTheme; import cn.stylefeng.roses.kernel.sys.modular.theme.pojo.SysThemeDTO; import cn.stylefeng.roses.kernel.sys.modular.theme.pojo.SysThemeRequest; @@ -25,7 +25,7 @@ import javax.annotation.Resource; * @since 2021/12/17 16:40 */ @RestController -@ApiResource(name = "系统主题管理", resBizType = ResBizTypeEnum.SYSTEM) +@ApiResource(name = "系统主题管理", requiredPermission = true, requirePermissionCode = ThemeConstants.THEME_MANAGER) public class SysThemeController { @Resource diff --git a/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateController.java b/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateController.java index b26e775ee..8a579af1f 100644 --- a/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateController.java +++ b/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateController.java @@ -2,12 +2,12 @@ package cn.stylefeng.roses.kernel.sys.modular.theme.controller; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; -import cn.stylefeng.roses.kernel.rule.enums.ResBizTypeEnum; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource; +import cn.stylefeng.roses.kernel.sys.modular.theme.constants.ThemeConstants; import cn.stylefeng.roses.kernel.sys.modular.theme.entity.SysThemeTemplate; import cn.stylefeng.roses.kernel.sys.modular.theme.pojo.SysThemeTemplateDataDTO; import cn.stylefeng.roses.kernel.sys.modular.theme.pojo.SysThemeTemplateRequest; @@ -26,7 +26,7 @@ import java.util.List; * @since 2021/12/17 13:53 */ @RestController -@ApiResource(name = "系统主题模板管理", resBizType = ResBizTypeEnum.SYSTEM) +@ApiResource(name = "系统主题模板管理", requiredPermission = true, requirePermissionCode = ThemeConstants.THEME_MANAGER) public class SysThemeTemplateController { @Resource @@ -66,7 +66,8 @@ public class SysThemeTemplateController { */ @PostResource(name = "删除系统主题模板", path = "/sysThemeTemplate/del") @BusinessLog - public ResponseData del(@RequestBody @Validated(SysThemeTemplateRequest.delete.class) SysThemeTemplateRequest sysThemeTemplateParam) { + public ResponseData del( + @RequestBody @Validated(SysThemeTemplateRequest.delete.class) SysThemeTemplateRequest sysThemeTemplateParam) { sysThemeTemplateService.del(sysThemeTemplateParam); return new SuccessResponseData<>(); } @@ -101,7 +102,8 @@ public class SysThemeTemplateController { */ @PostResource(name = "修改系统主题模板状态", path = "/sysThemeTemplate/updateStatus") @BusinessLog - public ResponseData updateTemplateStatus(@RequestBody @Validated(SysThemeTemplateRequest.updateStatus.class) SysThemeTemplateRequest sysThemeTemplateParam) { + public ResponseData updateTemplateStatus( + @RequestBody @Validated(SysThemeTemplateRequest.updateStatus.class) SysThemeTemplateRequest sysThemeTemplateParam) { sysThemeTemplateService.updateTemplateStatus(sysThemeTemplateParam); return new SuccessResponseData<>(); } diff --git a/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateFieldController.java b/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateFieldController.java index d4cde849e..4cd8899c4 100644 --- a/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateFieldController.java +++ b/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateFieldController.java @@ -2,12 +2,12 @@ package cn.stylefeng.roses.kernel.sys.modular.theme.controller; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; -import cn.stylefeng.roses.kernel.rule.enums.ResBizTypeEnum; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource; +import cn.stylefeng.roses.kernel.sys.modular.theme.constants.ThemeConstants; import cn.stylefeng.roses.kernel.sys.modular.theme.entity.SysThemeTemplateField; import cn.stylefeng.roses.kernel.sys.modular.theme.pojo.SysThemeTemplateFieldRequest; import cn.stylefeng.roses.kernel.sys.modular.theme.service.SysThemeTemplateFieldService; @@ -25,7 +25,7 @@ import java.util.List; * @since 2021/12/17 10:28 */ @RestController -@ApiResource(name = "系统主题模板属性管理", resBizType = ResBizTypeEnum.SYSTEM) +@ApiResource(name = "系统主题模板属性管理", requiredPermission = true, requirePermissionCode = ThemeConstants.THEME_MANAGER) public class SysThemeTemplateFieldController { @Resource diff --git a/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateRelController.java b/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateRelController.java index d6c69eff7..e1dd6441e 100644 --- a/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateRelController.java +++ b/kernel-s-sys/sys-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateRelController.java @@ -1,11 +1,11 @@ package cn.stylefeng.roses.kernel.sys.modular.theme.controller; import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; -import cn.stylefeng.roses.kernel.rule.enums.ResBizTypeEnum; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource; +import cn.stylefeng.roses.kernel.sys.modular.theme.constants.ThemeConstants; import cn.stylefeng.roses.kernel.sys.modular.theme.pojo.SysThemeTemplateRelRequest; import cn.stylefeng.roses.kernel.sys.modular.theme.service.SysThemeTemplateRelService; import org.springframework.validation.annotation.Validated; @@ -21,7 +21,7 @@ import javax.annotation.Resource; * @since 2021/12/24 10:55 */ @RestController -@ApiResource(name = "系统主题模板属性关系管理", resBizType = ResBizTypeEnum.SYSTEM) +@ApiResource(name = "系统主题模板属性关系管理", requiredPermission = true, requirePermissionCode = ThemeConstants.THEME_MANAGER) public class SysThemeTemplateRelController { @Resource @@ -35,7 +35,8 @@ public class SysThemeTemplateRelController { */ @PostResource(name = "增加系统主题模板属性关系", path = "/sysThemeTemplateRel/add") @BusinessLog - public ResponseData add(@RequestBody @Validated(SysThemeTemplateRelRequest.add.class) SysThemeTemplateRelRequest sysThemeTemplateParam) { + public ResponseData add( + @RequestBody @Validated(SysThemeTemplateRelRequest.add.class) SysThemeTemplateRelRequest sysThemeTemplateParam) { sysThemeTemplateRelService.add(sysThemeTemplateParam); return new SuccessResponseData<>(); } @@ -52,4 +53,5 @@ public class SysThemeTemplateRelController { sysThemeTemplateRelService.del(sysThemeTemplateRelParam); return new SuccessResponseData<>(); } + }