From 0de7eee12fe42fc3ddf1930a6eca5e97c8e9c2a0 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 29 Dec 2020 21:38:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B7=A5=E4=BD=9C=E5=8F=B0?= =?UTF-8?q?=E5=92=8C=E5=88=86=E6=9E=90=E9=A1=B5=E4=B8=A4=E4=B8=AA=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=9B=B4=E6=96=B0=E9=94=81=E5=B1=8F=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/listener/SuperAdminInitListener.java | 2 +- .../blackboard/BlackboardViewController.java | 41 +++++++++++++++++++ .../controller/IndexViewController.java | 16 ++++++-- .../{ => index}/service/IndexService.java | 2 +- .../{ => index}/service/InitAdminService.java | 2 +- .../LoginViewController.java | 5 +-- src/main/webapp/pages/layout/_header.html | 2 +- .../board_analyse.html} | 0 .../board_platform.html} | 0 .../modular/{frame => index}/lock-screen.html | 0 10 files changed, 60 insertions(+), 10 deletions(-) create mode 100644 src/main/java/cn/stylefeng/guns/modular/blackboard/BlackboardViewController.java rename src/main/java/cn/stylefeng/guns/modular/{ => index}/controller/IndexViewController.java (82%) rename src/main/java/cn/stylefeng/guns/modular/{ => index}/service/IndexService.java (78%) rename src/main/java/cn/stylefeng/guns/modular/{ => index}/service/InitAdminService.java (98%) rename src/main/java/cn/stylefeng/guns/modular/{controller => login}/LoginViewController.java (95%) rename src/main/webapp/pages/modular/{frame/console2.html => blackboard/board_analyse.html} (100%) rename src/main/webapp/pages/modular/{frame/console.html => blackboard/board_platform.html} (100%) rename src/main/webapp/pages/modular/{frame => index}/lock-screen.html (100%) diff --git a/src/main/java/cn/stylefeng/guns/core/listener/SuperAdminInitListener.java b/src/main/java/cn/stylefeng/guns/core/listener/SuperAdminInitListener.java index c6861eb5..bf5677bc 100644 --- a/src/main/java/cn/stylefeng/guns/core/listener/SuperAdminInitListener.java +++ b/src/main/java/cn/stylefeng/guns/core/listener/SuperAdminInitListener.java @@ -1,7 +1,7 @@ package cn.stylefeng.guns.core.listener; import cn.stylefeng.guns.core.consts.ProjectConstants; -import cn.stylefeng.guns.modular.service.InitAdminService; +import cn.stylefeng.guns.modular.index.service.InitAdminService; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationListener; diff --git a/src/main/java/cn/stylefeng/guns/modular/blackboard/BlackboardViewController.java b/src/main/java/cn/stylefeng/guns/modular/blackboard/BlackboardViewController.java new file mode 100644 index 00000000..c603d53e --- /dev/null +++ b/src/main/java/cn/stylefeng/guns/modular/blackboard/BlackboardViewController.java @@ -0,0 +1,41 @@ +package cn.stylefeng.guns.modular.blackboard; + +import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource; +import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Controller; + +/** + * 工作台和分析页界面渲染 + * + * @author fengshuonan + * @date 2020/12/29 21:29 + */ +@Controller +@Slf4j +@ApiResource(name = "工作台和分析页面") +public class BlackboardViewController { + + /** + * 工作台 + * + * @author fengshuonan + * @date 2018/12/24 22:43 + */ + @GetResource(name = "工作台", path = "/blackboard/platform", requiredPermission = false) + public String platform() { + return "/modular/blackboard/board_platform.html"; + } + + /** + * 分析页面 + * + * @author fengshuonan + * @date 2020/12/29 21:27 + */ + @GetResource(name = "分析页面", path = "/blackboard/analyse", requiredPermission = false) + public String analyse() { + return "/modular/blackboard/board_analyse.html"; + } + +} diff --git a/src/main/java/cn/stylefeng/guns/modular/controller/IndexViewController.java b/src/main/java/cn/stylefeng/guns/modular/index/controller/IndexViewController.java similarity index 82% rename from src/main/java/cn/stylefeng/guns/modular/controller/IndexViewController.java rename to src/main/java/cn/stylefeng/guns/modular/index/controller/IndexViewController.java index 5c5d3c90..917befa5 100644 --- a/src/main/java/cn/stylefeng/guns/modular/controller/IndexViewController.java +++ b/src/main/java/cn/stylefeng/guns/modular/index/controller/IndexViewController.java @@ -1,9 +1,8 @@ -package cn.stylefeng.guns.modular.controller; +package cn.stylefeng.guns.modular.index.controller; import cn.stylefeng.roses.kernel.auth.api.context.LoginContext; import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser; import cn.stylefeng.roses.kernel.auth.api.pojo.login.basic.SimpleUserInfo; -import cn.stylefeng.roses.kernel.file.FileOperatorApi; import cn.stylefeng.roses.kernel.menu.modular.service.SysMenuService; import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource; @@ -39,7 +38,7 @@ public class IndexViewController { * @author fengshuonan * @date 2020/12/13 17:19 */ - @GetResource(name = "首页界面", path = "/", requiredPermission = false, requiredLogin = false) + @GetResource(name = "首页界面", path = "/", requiredLogin = false, requiredPermission = false) public String indexView(Model model) { // 当前用户已经登录，跳转到首页 @@ -65,4 +64,15 @@ public class IndexViewController { return "/login.html"; } + /** + * 锁屏界面 + * + * @author fengshuonan + * @date 2020/12/29 21:34 + */ + @GetResource(name = "锁屏界面", path = "/lock", requiredPermission = false) + public String lock() { + return "/modular/index/lock-screen.html"; + } + } diff --git a/src/main/java/cn/stylefeng/guns/modular/service/IndexService.java b/src/main/java/cn/stylefeng/guns/modular/index/service/IndexService.java similarity index 78% rename from src/main/java/cn/stylefeng/guns/modular/service/IndexService.java rename to src/main/java/cn/stylefeng/guns/modular/index/service/IndexService.java index f61ae4bb..8e2c37b7 100644 --- a/src/main/java/cn/stylefeng/guns/modular/service/IndexService.java +++ b/src/main/java/cn/stylefeng/guns/modular/index/service/IndexService.java @@ -1,4 +1,4 @@ -package cn.stylefeng.guns.modular.service; +package cn.stylefeng.guns.modular.index.service; import org.springframework.stereotype.Service; diff --git a/src/main/java/cn/stylefeng/guns/modular/service/InitAdminService.java b/src/main/java/cn/stylefeng/guns/modular/index/service/InitAdminService.java similarity index 98% rename from src/main/java/cn/stylefeng/guns/modular/service/InitAdminService.java rename to src/main/java/cn/stylefeng/guns/modular/index/service/InitAdminService.java index 4310f72e..f9808711 100644 --- a/src/main/java/cn/stylefeng/guns/modular/service/InitAdminService.java +++ b/src/main/java/cn/stylefeng/guns/modular/index/service/InitAdminService.java @@ -1,4 +1,4 @@ -package cn.stylefeng.guns.modular.service; +package cn.stylefeng.guns.modular.index.service; import cn.stylefeng.guns.core.consts.ProjectConstants; import cn.stylefeng.roses.kernel.resource.modular.entity.SysResource; diff --git a/src/main/java/cn/stylefeng/guns/modular/controller/LoginViewController.java b/src/main/java/cn/stylefeng/guns/modular/login/LoginViewController.java similarity index 95% rename from src/main/java/cn/stylefeng/guns/modular/controller/LoginViewController.java rename to src/main/java/cn/stylefeng/guns/modular/login/LoginViewController.java index 333b3c3a..c1840109 100644 --- a/src/main/java/cn/stylefeng/guns/modular/controller/LoginViewController.java +++ b/src/main/java/cn/stylefeng/guns/modular/login/LoginViewController.java @@ -1,4 +1,4 @@ -package cn.stylefeng.guns.modular.controller; +package cn.stylefeng.guns.modular.login; import cn.stylefeng.roses.kernel.auth.api.AuthServiceApi; import cn.stylefeng.roses.kernel.auth.api.context.LoginContext; @@ -11,7 +11,6 @@ import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.ResponseBody; @@ -19,7 +18,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; /** - * 首页相关的界面渲染 + * 登录相关的界面渲染 * * @author fengshuonan * @date 2020/12/27 16:23 diff --git a/src/main/webapp/pages/layout/_header.html b/src/main/webapp/pages/layout/_header.html index 203ab12e..addcd211 100644 --- a/src/main/webapp/pages/layout/_header.html +++ b/src/main/webapp/pages/layout/_header.html @@ -29,7 +29,7 @@
  • - +
  • diff --git a/src/main/webapp/pages/modular/frame/console2.html b/src/main/webapp/pages/modular/blackboard/board_analyse.html similarity index 100% rename from src/main/webapp/pages/modular/frame/console2.html rename to src/main/webapp/pages/modular/blackboard/board_analyse.html diff --git a/src/main/webapp/pages/modular/frame/console.html b/src/main/webapp/pages/modular/blackboard/board_platform.html similarity index 100% rename from src/main/webapp/pages/modular/frame/console.html rename to src/main/webapp/pages/modular/blackboard/board_platform.html diff --git a/src/main/webapp/pages/modular/frame/lock-screen.html b/src/main/webapp/pages/modular/index/lock-screen.html similarity index 100% rename from src/main/webapp/pages/modular/frame/lock-screen.html rename to src/main/webapp/pages/modular/index/lock-screen.html