From a475042f66c0c3dacdeb0a706f79cacadb2daddb Mon Sep 17 00:00:00 2001 From: MaxKey Date: Sun, 19 Jul 2020 09:27:42 +0800 Subject: [PATCH] =?UTF-8?q?Resources=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resources 优化 --- .../java/org/maxkey/domain/Resources.java | 32 +++++++++++++- .../persistence/service/ResourcesService.java | 6 +++ .../mapper/xml/mysql/ResourcesMapper.xml | 1 + .../web/contorller/ResourcesController.java | 2 +- .../resources/messages/message.properties | 19 +++++--- .../resources/messages/message_en.properties | 19 +++++--- .../messages/message_zh_CN.properties | 19 +++++--- .../templates/views/apps/appAddCommon.ftl | 2 +- .../templates/views/resources/resourceAdd.ftl | 44 +++++++++++++++---- .../views/resources/resourceUpdate.ftl | 42 ++++++++++++++---- 10 files changed, 151 insertions(+), 35 deletions(-) diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Resources.java b/maxkey-core/src/main/java/org/maxkey/domain/Resources.java index 303053a17..c27754418 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Resources.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/Resources.java @@ -35,6 +35,8 @@ public class Resources extends JpaBaseDomain implements Serializable { @Column String name; @Column + int sortIndex; + @Column String appId; @Column String parentId; @@ -43,6 +45,10 @@ public class Resources extends JpaBaseDomain implements Serializable { @Column String resourceType; @Column + String resourceIcon; + @Column + String resourceStyle; + @Column String resourceUrl; @Column String resourceAction; @@ -112,6 +118,22 @@ public class Resources extends JpaBaseDomain implements Serializable { this.resourceType = resourceType; } + public String getResourceIcon() { + return resourceIcon; + } + + public void setResourceIcon(String resourceIcon) { + this.resourceIcon = resourceIcon; + } + + public String getResourceStyle() { + return resourceStyle; + } + + public void setResourceStyle(String resourceStyle) { + this.resourceStyle = resourceStyle; + } + public String getResourceUrl() { return resourceUrl; } @@ -175,5 +197,13 @@ public class Resources extends JpaBaseDomain implements Serializable { public void setModifiedDate(String modifiedDate) { this.modifiedDate = modifiedDate; } - + + public int getSortIndex() { + return sortIndex; + } + + public void setSortIndex(int sortIndex) { + this.sortIndex = sortIndex; + } + } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java index 155a83383..643eb4c7e 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java @@ -17,6 +17,8 @@ package org.maxkey.persistence.service; +import java.util.List; + import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.maxkey.domain.Resources; import org.maxkey.persistence.mapper.ResourcesMapper; @@ -37,4 +39,8 @@ public class ResourcesService extends JpaBaseService{ // TODO Auto-generated method stub return (ResourcesMapper)super.getMapper(); } + + public List queryResourcesTree(Resources resource){ + return getMapper().queryPageResults(resource); + } } diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml index 86aa7e0eb..1e532500e 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml @@ -27,6 +27,7 @@ WHERE (1=1) + ORDER BY SORTINDEX diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/ResourcesController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/ResourcesController.java index 68e4460a7..109d162dd 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/ResourcesController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/ResourcesController.java @@ -160,7 +160,7 @@ public class ResourcesController { _logger.debug("resourcesTree appId :" + appId + " ,appName " + appName); Resources queryRes = new Resources(); queryRes.setAppId(appId); - List resourcesList = this.resourcesService.query(queryRes); + List resourcesList = this.resourcesService.queryResourcesTree(queryRes); TreeNodeList treeNodeList = new TreeNodeList(); TreeNode rootNode = new TreeNode(appId, appName); diff --git a/maxkey-web-manage/src/main/resources/messages/message.properties b/maxkey-web-manage/src/main/resources/messages/message.properties index 5cb51d0e8..91726b091 100644 --- a/maxkey-web-manage/src/main/resources/messages/message.properties +++ b/maxkey-web-manage/src/main/resources/messages/message.properties @@ -391,11 +391,20 @@ role.name=\u89D2\u8272 resource.id=\u8D44\u6E90\u7F16\u7801 resource.name=\u8D44\u6E90\u540D\u79F0 -resource.pid=\u7236\u7EA7\u7F16\u7801 -resource.pname=\u7236\u7EA7\u540D\u79F0 -resource.resType=\u8D44\u6E90\u7C7B\u578B -resource.resUrl=\u8D44\u6E90\u5730\u5740 -resource.resAction=\u52A8\u4F5C +resource.parentId=\u7236\u7EA7\u7F16\u7801 +resource.parentName=\u7236\u7EA7\u540D\u79F0 +resource.resourceType=\u8D44\u6E90\u7C7B\u578B +resource.resourceType.Menu=\u83DC\u5355 +resource.resourceType.Element=\u5143\u7D20 +resource.resourceType.Button=\u6309\u94AE +resource.resourceType.Module=\u6A21\u5757 +resource.resourceType.File=\u6587\u4EF6 +resource.resourceType.Data=\u6570\u636E +resource.resourceType.Other=\u5176\u4ED6 +resource.resourceIcon=\u56FE\u6807 +resource.resourceUrl=\u8D44\u6E90\u5730\u5740 +resource.resourceAction=\u52A8\u4F5C +resource.resourceStyle=\u6837\u5F0F #account account.username=\u7528\u6237\u540D diff --git a/maxkey-web-manage/src/main/resources/messages/message_en.properties b/maxkey-web-manage/src/main/resources/messages/message_en.properties index 48a2e48ad..6469754de 100644 --- a/maxkey-web-manage/src/main/resources/messages/message_en.properties +++ b/maxkey-web-manage/src/main/resources/messages/message_en.properties @@ -390,11 +390,20 @@ role.name=name resource.id=id resource.name=name -resource.pid=pid -resource.pname=pname -resource.resType=Type -resource.resUrl=URL -resource.resAction=Action +resource.parentId=parentId +resource.parentName=parentName +resource.resourceType=Type +resource.resourceType.Menu=Menu +resource.resourceType.Button=Button +resource.resourceType.Element=Element +resource.resourceType.Module=Module +resource.resourceType.File=File +resource.resourceType.Data=Data +resource.resourceType.Other=Other +resource.resourceIcon=Icon +resource.resourceUrl=URL +resource.resourceAction=Action +resource.resourceStyle=Style #account account.username=username diff --git a/maxkey-web-manage/src/main/resources/messages/message_zh_CN.properties b/maxkey-web-manage/src/main/resources/messages/message_zh_CN.properties index 5cb51d0e8..91726b091 100644 --- a/maxkey-web-manage/src/main/resources/messages/message_zh_CN.properties +++ b/maxkey-web-manage/src/main/resources/messages/message_zh_CN.properties @@ -391,11 +391,20 @@ role.name=\u89D2\u8272 resource.id=\u8D44\u6E90\u7F16\u7801 resource.name=\u8D44\u6E90\u540D\u79F0 -resource.pid=\u7236\u7EA7\u7F16\u7801 -resource.pname=\u7236\u7EA7\u540D\u79F0 -resource.resType=\u8D44\u6E90\u7C7B\u578B -resource.resUrl=\u8D44\u6E90\u5730\u5740 -resource.resAction=\u52A8\u4F5C +resource.parentId=\u7236\u7EA7\u7F16\u7801 +resource.parentName=\u7236\u7EA7\u540D\u79F0 +resource.resourceType=\u8D44\u6E90\u7C7B\u578B +resource.resourceType.Menu=\u83DC\u5355 +resource.resourceType.Element=\u5143\u7D20 +resource.resourceType.Button=\u6309\u94AE +resource.resourceType.Module=\u6A21\u5757 +resource.resourceType.File=\u6587\u4EF6 +resource.resourceType.Data=\u6570\u636E +resource.resourceType.Other=\u5176\u4ED6 +resource.resourceIcon=\u56FE\u6807 +resource.resourceUrl=\u8D44\u6E90\u5730\u5740 +resource.resourceAction=\u52A8\u4F5C +resource.resourceStyle=\u6837\u5F0F #account account.username=\u7528\u6237\u540D diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl index 88287dd43..40eb006cd 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl @@ -47,7 +47,7 @@ <@locale code="common.text.sortindex"/> - + diff --git a/maxkey-web-manage/src/main/resources/templates/views/resources/resourceAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/resources/resourceAdd.ftl index 5d41ade7c..acfe59088 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/resources/resourceAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/resources/resourceAdd.ftl @@ -25,7 +25,7 @@ $(function () { <@locale code="resource.id" />： - + @@ -41,35 +41,61 @@ $(function () { - <@locale code="resource.pid" />： + <@locale code="resource.parentId" />： - <@locale code="resource.pname" />： + <@locale code="resource.parentName" />： - <@locale code="resource.resType" />： + <@locale code="resource.resourceType" />： - + - <@locale code="resource.resUrl" />： + <@locale code="resource.resourceUrl" />： - + - <@locale code="resource.resAction" />： + <@locale code="resource.resourceAction" />： - + + + <@locale code="resource.resourceIcon" />： + + + + + + <@locale code="resource.resourceStyle" />： + + + + + + <@locale code="common.text.sortindex"/> + + + + <@locale code="common.text.description" />： diff --git a/maxkey-web-manage/src/main/resources/templates/views/resources/resourceUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/resources/resourceUpdate.ftl index 60fc2b32c..7c66b5702 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/resources/resourceUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/resources/resourceUpdate.ftl @@ -27,7 +27,7 @@ - <@locale code="resource.pid" />： + <@locale code="resource.parentId" />： @@ -39,29 +39,55 @@ - <@locale code="resource.pname" />： + <@locale code="resource.parentName" />： - <@locale code="resource.resType" />： + <@locale code="resource.resourceType" />： - + + + + + <@locale code="resource.resourceUrl" />： + + - <@locale code="resource.resUrl" />： + <@locale code="resource.resourceAction" />： - + - <@locale code="resource.resAction" />： + <@locale code="resource.resourceIcon" />： - + + + <@locale code="resource.resourceStyle" />： + + + + + + <@locale code="common.text.sortindex"/> + + + + <@locale code="common.text.description" />：