Skip to content

MaxKey
MaxKey

yujianwangzivayy / MaxKey
与 Fork 源项目一致

Fork自 MaxKey单点登录官方(MaxKeyTop) / MaxKey

通知 1
Star 0
Fork 0
MaxKey
MaxKey

体验新版 GitCode，发现更多精彩内容 >>

提交 a475042f 编写于 作者: MaxKey单点登录官方's avatar MaxKey单点登录官方
浏览文件
操作

Resources 优化 

Resources 优化
上级 0276059f
隐藏空白更改
内联 并排
Showing with 151 addition and 35 deletion
maxkey-core/src/main/java/org/maxkey/domain/Resources.java
浏览文件 @ a475042f
......@@ -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;
}
}
maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java
浏览文件 @ a475042f
......@@ -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<Resources>{
// TODO Auto-generated method stub
return (ResourcesMapper)super.getMapper();
}
public List<Resources> queryResourcesTree(Resources resource){
return getMapper().queryPageResults(resource);
}
}
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml
浏览文件 @ a475042f
......@@ -27,6 +27,7 @@
WHERE
(1=1)
<include refid="where_statement"/>
ORDER BY SORTINDEX
</select>
......
maxkey-web-manage/src/main/java/org/maxkey/web/contorller/ResourcesController.java
浏览文件 @ a475042f
......@@ -160,7 +160,7 @@ public class ResourcesController {
_logger.debug("resourcesTree appId :" + appId + " ,appName " + appName);
Resources queryRes = new Resources();
queryRes.setAppId(appId);
List<Resources> resourcesList = this.resourcesService.query(queryRes);
List<Resources> resourcesList = this.resourcesService.queryResourcesTree(queryRes);
TreeNodeList treeNodeList = new TreeNodeList();
TreeNode rootNode = new TreeNode(appId, appName);
......
maxkey-web-manage/src/main/resources/messages/message.properties
浏览文件 @ a475042f
......@@ -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
......
maxkey-web-manage/src/main/resources/messages/message_en.properties
浏览文件 @ a475042f
......@@ -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
......
maxkey-web-manage/src/main/resources/messages/message_zh_CN.properties
浏览文件 @ a475042f
......@@ -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
......
maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl
浏览文件 @ a475042f
......@@ -47,7 +47,7 @@
</td>
<th><@locale code="common.text.sortindex"/></th>
<td>
<input type="text" id="sortOrder" class="form-control" name="sortOrder" title="" value="1" required="" />
<input type="text" id="sortIndex" class="form-control" name="sortIndex" title="" value="1" required="" />
</td>
</tr>
<tr>
......
maxkey-web-manage/src/main/resources/templates/views/resources/resourceAdd.ftl
浏览文件 @ a475042f
......@@ -25,7 +25,7 @@ $(function () {
<tr>
<th><@locale code="resource.id" />：</th>
<td nowrap>
<input type="text" id="id" name="id" class="form-control" title="" value="" required="" />
<input type="text" id="id" name="id" class="form-control" title="" value="" />
</td>
</tr>
<tr>
......@@ -41,35 +41,61 @@ $(function () {
</td>
</tr>
<tr>
<th><@locale code="resource.pid" />：</th>
<th><@locale code="resource.parentId" />：</th>
<td nowrap>
<input type="text" id="parentId" name="parentId" class="form-control" title="" value="" required="" />
</td>
</tr>
<tr>
<th><@locale code="resource.pname" />：</th>
<th><@locale code="resource.parentName" />：</th>
<td nowrap>
<input type="text" id="parentName" name="parentName" class="form-control" title="" value="" required="" />
</td>
</tr>
<tr>
<th><@locale code="resource.resType" />：</th>
<th><@locale code="resource.resourceType" />：</th>
<td nowrap>
<input type="text" id="resourceType" name="resourceType" class="form-control" title="" value="" required="" />
<select id="resourceType" name="resourceType" class="form-control" >
<option value="MENU" selected ><@locale code="resource.resourceType.Menu" /></option>
<option value="ELEMENT" ><@locale code="resource.resourceType.Element" /></option>
<option value="BUTTON" ><@locale code="resource.resourceType.Button" /></option>
<option value="MODULE" ><@locale code="resource.resourceType.Module" /></option>
<option value="FILE" ><@locale code="resource.resourceType.File" /></option>
<option value="DATA" ><@locale code="resource.resourceType.Data" /></option>
<option value="OTHER" ><@locale code="resource.resourceType.Other" /></option>
</select>
</td>
</tr>
<tr>
<th><@locale code="resource.resUrl" />：</th>
<th><@locale code="resource.resourceUrl" />：</th>
<td nowrap>
<input type="text" id="resourceUrl" name="resourceUrl" class="form-control" title="" value="" required="" />
<input type="text" id="resourceUrl" name="resourceUrl" class="form-control" title="" value="" />
</td>
</tr>
<tr>
<th><@locale code="resource.resAction" />：</th>
<th><@locale code="resource.resourceAction" />：</th>
<td nowrap>
<input type="text" id="resourceAction" name="resourceAction" class="form-control" title="" value="" required="" />
<input type="text" id="resourceAction" name="resourceAction" class="form-control" title="" value="" />
</td>
</tr>
<tr>
<th><@locale code="resource.resourceIcon" />：</th>
<td nowrap>
<input type="text" id="resourceIcon" name="resourceIcon" class="form-control" title="" value="" />
</td>
</tr>
<tr>
<th><@locale code="resource.resourceStyle" />：</th>
<td nowrap>
<input type="text" id="resourceStyle" name="resourceStyle" class="form-control" title="" value="" />
</td>
</tr>
<tr>
<th><@locale code="common.text.sortindex"/></th>
<td>
<input type="text" id="sortIndex" class="form-control" name="sortIndex" title="" value="1" required="" />
</td>
</tr>
<tr>
<th><@locale code="common.text.description" />：</th>
<td nowrap>
......
maxkey-web-manage/src/main/resources/templates/views/resources/resourceUpdate.ftl
浏览文件 @ a475042f
......@@ -27,7 +27,7 @@
</td>
</tr>
<tr>
<th><@locale code="resource.pid" />：</th>
<th><@locale code="resource.parentId" />：</th>
<td nowrap>
<input type="text" id="parentId" name="parentId" class="form-control" title="" value="${model.parentId!}" required="" />
</td>
......@@ -39,29 +39,55 @@
</td>
</tr>
<tr>
<th><@locale code="resource.pname" />：</th>
<th><@locale code="resource.parentName" />：</th>
<td nowrap>
<input type="text" id="parentName" name="parentName" class="form-control" title="" value="${model.parentName!}" required="" />
</td>
</tr>
<tr>
<th><@locale code="resource.resType" />：</th>
<th><@locale code="resource.resourceType" />：</th>
<td nowrap>
<input type="text" id="resourceType" name="resourceType" class="form-control" title="" value="${model.resourceType!}" required="" />
<select id="resourceType" name="resourceType" class="form-control" >
<option value="MENU" <#if 'MENU'==model.resourceType>selected</#if> ><@locale code="resource.resourceType.Menu" /></option>
<option value="ELEMENT" <#if 'ELEMENT'==model.resourceType>selected</#if> ><@locale code="resource.resourceType.Element" /></option>
<option value="BUTTON" <#if 'BUTTON'==model.resourceType>selected</#if> ><@locale code="resource.resourceType.Button" /></option>
<option value="MODULE" <#if 'MODULE'==model.resourceType>selected</#if> ><@locale code="resource.resourceType.Module" /></option>
<option value="FILE" <#if 'FILE'==model.resourceType>selected</#if> ><@locale code="resource.resourceType.File" /></option>
<option value="DATA" <#if 'DATA'==model.resourceType>selected</#if> ><@locale code="resource.resourceType.Data" /></option>
<option value="OTHER" <#if 'OTHER'==model.resourceType >selected</#if> ><@locale code="resource.resourceType.Other" /></option>
</select>
</td>
</tr>
<tr>
<th><@locale code="resource.resourceUrl" />：</th>
<td nowrap>
<input type="text" id="resourceUrl" name="resourceUrl" class="form-control" title="" value="${model.resourceUrl!}" />
</td>
</tr>
<tr>
<th><@locale code="resource.resourceAction" />：</th>
<td nowrap>
<input type="text" id="resourceAction" name="resourceAction" class="form-control" title="" value="${model.resourceAction!}" />
</td>
</tr>
<tr>
<th><@locale code="resource.resUrl" />：</th>
<th><@locale code="resource.resourceIcon" />：</th>
<td nowrap>
<input type="text" id="resourceUrl" name="resourceUrl" class="form-control" title="" value="${model.resourceUrl!}" required="" />
<input type="text" id="resourceIcon" name="resourceIcon" class="form-control" title="" value="${model.resourceIcon!}" />
</td>
</tr>
<tr>
<th><@locale code="resource.resAction" />：</th>
<th><@locale code="resource.resourceStyle" />：</th>
<td nowrap>
<input type="text" id="resourceAction" name="resourceAction" class="form-control" title="" value="${model.resourceAction!}" required="" />
<input type="text" id="resourceStyle" name="resourceStyle" class="form-control" title="" value="${model.resourceStyle!}" />
</td>
</tr>
<tr>
<th><@locale code="common.text.sortindex"/></th>
<td>
<input type="text" id="sortIndex" class="form-control" name="sortIndex" title="" value="1" required="${model.sortIndex!}" />
</td>
</tr>
<tr>
<th><@locale code="common.text.description" />：</th>
<td nowrap>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或