From 0276059f1a2c4f92754010728689d79489090df1 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@163.com>
Date: Sat, 18 Jul 2020 21:53:50 +0800
Subject: [PATCH] Resources ,ids

---
 .../java/org/maxkey/domain/Resources.java     | 110 +++++++++---------
 .../mapper/xml/mysql/ResourcesMapper.xml      |   4 +-
 .../web/contorller/ResourcesController.java   |   2 +-
 .../templates/views/groups/groupAdd.ftl       |   8 +-
 .../templates/views/resources/resourceAdd.ftl |  24 ++--
 .../views/resources/resourceUpdate.ftl        |  12 +-
 .../views/resources/resourcesList.ftl         |   7 +-
 .../templates/views/roles/roleAdd.ftl         |   6 +
 .../templates/views/roles/roleUpdate.ftl      |   2 +-
 9 files changed, 97 insertions(+), 78 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 95b494036..303053a17 100644
--- a/maxkey-core/src/main/java/org/maxkey/domain/Resources.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/Resources.java
@@ -37,15 +37,15 @@ public class Resources  extends JpaBaseDomain implements Serializable {
     @Column
     String appId;
     @Column
-    String pid;
+    String parentId;
     @Column
-    String pname;
+    String parentName;
     @Column
-    String resType;
+    String resourceType;
     @Column
-    String resUrl;
+    String resourceUrl;
     @Column
-    String resAction;
+    String resourceAction;
     @Column
     String status;
     @Column
@@ -80,6 +80,54 @@ public class Resources  extends JpaBaseDomain implements Serializable {
         this.name = name;
     }
 
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getParentName() {
+        return parentName;
+    }
+
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
+
+    public String getResourceType() {
+        return resourceType;
+    }
+
+    public void setResourceType(String resourceType) {
+        this.resourceType = resourceType;
+    }
+
+    public String getResourceUrl() {
+        return resourceUrl;
+    }
+
+    public void setResourceUrl(String resourceUrl) {
+        this.resourceUrl = resourceUrl;
+    }
+
+    public String getResourceAction() {
+        return resourceAction;
+    }
+
+    public void setResourceAction(String resourceAction) {
+        this.resourceAction = resourceAction;
+    }
+
     public String getStatus() {
         return status;
     }
@@ -127,55 +175,5 @@ public class Resources  extends JpaBaseDomain implements Serializable {
     public void setModifiedDate(String modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
-
-    public String getResType() {
-        return resType;
-    }
-
-    public void setResType(String resType) {
-        this.resType = resType;
-    }
-
-    public String getResUrl() {
-        return resUrl;
-    }
-
-    public void setResUrl(String resUrl) {
-        this.resUrl = resUrl;
-    }
-
-    public String getResAction() {
-        return resAction;
-    }
-
-    public void setResAction(String resAction) {
-        this.resAction = resAction;
-    }
-
-    public String getPid() {
-        return pid;
-    }
-
-    public void setPid(String pid) {
-        this.pid = pid;
-    }
-
-    public String getPname() {
-        return pname;
-    }
-
-    public void setPname(String pname) {
-        this.pname = pname;
-    }
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-    
-    
-   
+ 
 }
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 63b3ef671..86aa7e0eb 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
@@ -9,8 +9,8 @@
 		<if test="appId != null and appId != ''">
             AND APPID  =   #{appId}
         </if> 
-        <if test="pid != null and pid != ''">
-            AND PID  =   #{pid}
+        <if test="parentId != null and parentId != ''">
+            AND PARENTID  =   #{parentId}
         </if> 
 		<if test="name != null and name != ''">
 			AND NAME LIKE '%${name}%'
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 b9b40d1d2..68e4460a7 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
@@ -170,7 +170,7 @@ public class ResourcesController {
 	    for (Resources res : resourcesList) {
 	      TreeNode treeNode = new TreeNode(res.getId(), res.getName());
 	      treeNode.setAttr("data", res);
-	      treeNode.setPId(res.getPid());
+	      treeNode.setPId(res.getParentId());
 	      treeNodeList.addTreeNode(treeNode.getAttr());
 	    } 
 
diff --git a/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl
index 13a6e5157..484d8fd84 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl
@@ -15,7 +15,13 @@
 	<table border="0" cellpadding="0" cellspacing="0" class="table table-bordered" >
 		<tbody>
 			<tr>
-				<th><@locale code="group.name" />：</th>
+				<th><@locale code="group.id" />：</th>
+				<td nowrap>
+					<input type="text" id="id" name="id" class="form-control" title="" value=""  />
+				</td>
+			</tr>
+			<tr>
+				<th><@locale code="role.name" />：</th>
 				<td nowrap>
 					<input type="text" id="name" name="name" class="form-control" title="" value=""  required="" />
 				</td>
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 dd5ea81f6..5d41ade7c 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
@@ -13,8 +13,8 @@
 <script type="text/javascript"> 
 $(function () {
     $("#appId").val($.cookie("select_app_id"));
-    $("#pid").val($.cookie("select_res_id"));
-    $("#pname").val($.cookie("select_res_name"));
+    $("#parentId").val($.cookie("select_res_id"));
+    $("#parentName").val($.cookie("select_res_name"));
 });
 </script>
 </head>
@@ -22,46 +22,52 @@ $(function () {
 <form id="actionForm"  method="post" type="label" autoclose="true"  action="<@base/>/resources/add"  class="needs-validation" novalidate>
 	<table border="0" cellpadding="0" cellspacing="0" class="table table-bordered" >
 		<tbody>
+			<tr>
+				<th><@locale code="resource.id" />：</th>
+				<td nowrap>
+					<input type="text" id="id" name="id" class="form-control" title="" value=""  required="" />
+				</td>
+			</tr>
 			<tr>
 				<th><@locale code="resource.name" />：</th>
 				<td nowrap>
 					<input type="text" id="name" name="name" class="form-control" title="" value=""  required="" />
 				</td>
 			</tr>
-			 <tr>
+			 <tr style="display:none;">
                 <th><@locale code="apps.id" />：</th>
                 <td nowrap>
-                    <input type="text" id="appId" name="appId" class="form-control" title="" value=""  required="" />
+                    <input type="text" id="appId" name="appId" class="form-control" title="" value=""  required="" readonly />
                 </td>
             </tr>
 			<tr>
                 <th><@locale code="resource.pid" />：</th>
                 <td nowrap>
-                    <input type="text" id="pid" name="pid" class="form-control" title="" value=""  required="" />
+                    <input type="text" id="parentId" name="parentId" class="form-control" title="" value=""  required="" />
                 </td>
             </tr>
             <tr>
                 <th><@locale code="resource.pname" />：</th>
                 <td nowrap>
-                    <input type="text" id="pname" name="pname" class="form-control" title="" value=""  required="" />
+                    <input type="text" id="parentName" name="parentName" class="form-control" title="" value=""  required="" />
                 </td>
             </tr>
             <tr>
                 <th><@locale code="resource.resType" />：</th>
                 <td nowrap>
-                    <input type="text" id="resType" name="resType" class="form-control" title="" value=""  required="" />
+                    <input type="text" id="resourceType" name="resourceType" class="form-control" title="" value=""  required="" />
                 </td>
             </tr>
             <tr>
                 <th><@locale code="resource.resUrl" />：</th>
                 <td nowrap>
-                    <input type="text" id="resUrl" name="resUrl" class="form-control" title="" value=""  required="" />
+                    <input type="text" id="resourceUrl" name="resourceUrl" class="form-control" title="" value=""  required="" />
                 </td>
             </tr>
             <tr>
                 <th><@locale code="resource.resAction" />：</th>
                 <td nowrap>
-                    <input type="text" id="resAction" name="resAction" class="form-control" title="" value=""  required="" />
+                    <input type="text" id="resourceAction" name="resourceAction" class="form-control" title="" value=""  required="" />
                 </td>
             </tr>
             <tr>
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 c393af246..60fc2b32c 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
@@ -29,10 +29,10 @@
 		<tr>
                 <th><@locale code="resource.pid" />：</th>
                 <td nowrap>
-                    <input type="text" id="pid" name="pid" class="form-control" title="" value="${model.pid!}"  required="" />
+                    <input type="text" id="parentId" name="parentId" class="form-control" title="" value="${model.parentId!}"  required="" />
                 </td>
             </tr>
-            <tr>
+            <tr style="display:none;">
                 <th><@locale code="apps.id" />：</th>
                 <td nowrap>
                     <input type="text" id="appId" name="appId" class="form-control" title="" value="${model.appId!}"  required="" />
@@ -41,25 +41,25 @@
             <tr>
                 <th><@locale code="resource.pname" />：</th>
                 <td nowrap>
-                    <input type="text" id="pname" name="pname" class="form-control" title="" value="${model.pname!}"  required="" />
+                    <input type="text" id="parentName" name="parentName" class="form-control" title="" value="${model.parentName!}"  required="" />
                 </td>
             </tr>
             <tr>
                 <th><@locale code="resource.resType" />：</th>
                 <td nowrap>
-                    <input type="text" id="resType" name="resType" class="form-control" title="" value="${model.resType!}"  required="" />
+                    <input type="text" id="resourceType" name="resourceType" class="form-control" title="" value="${model.resourceType!}"  required="" />
                 </td>
             </tr>
             <tr>
                 <th><@locale code="resource.resUrl" />：</th>
                 <td nowrap>
-                    <input type="text" id="resUrl" name="resUrl" class="form-control" title="" value="${model.resUrl!}"  required="" />
+                    <input type="text" id="resourceUrl" name="resourceUrl" class="form-control" title="" value="${model.resourceUrl!}"  required="" />
                 </td>
             </tr>
             <tr>
                 <th><@locale code="resource.resAction" />：</th>
                 <td nowrap>
-                    <input type="text" id="resAction" name="resAction" class="form-control" title="" value="${model.resAction!}"  required="" />
+                    <input type="text" id="resourceAction" name="resourceAction" class="form-control" title="" value="${model.resourceAction!}"  required="" />
                 </td>
             </tr>
             <tr>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/resources/resourcesList.ftl b/maxkey-web-manage/src/main/resources/templates/views/resources/resourcesList.ftl
index 8b7af7724..64703ba6b 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/resources/resourcesList.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/resources/resourcesList.ftl
@@ -7,7 +7,7 @@
 
 function onClick (event, treeId, treeNode) {
 
-    $("#pid").val(treeNode.id);
+    $("#parentId").val(treeNode.id);
     $.cookie("select_res_id", treeNode.id, { path: '/' });
     $.cookie("select_app_id", $("#appId").val(), { path: '/' });
     $.cookie("select_res_name", treeNode.name,{ path: '/' });
@@ -173,7 +173,7 @@ $(function () {
 		 			<td width="450px">
 		 				<form id="basic_search_form">
 			 				<input class="form-control appId" id="appId" name="appId" value="" type="hidden"  >
-			 				<input class="form-control" id="pid" name="pid" value="" type="hidden"  >
+			 				<input class="form-control" id="parentId" name="parentId" value="" type="hidden"  >
                             <input class="form-control appName"    style="width:200px;float: left;" value=""    id="appName" name="appName" type="text" >
                             <input class="button btn btn-success mr-3 window" style="float: left;" id="selectBtn" type="button" value="<@locale code="button.text.select"/>" 
                                     wurl="<@base/>/apps/select"
@@ -240,6 +240,9 @@ $(function () {
 				<th data-checkbox="true"></th>
 				<th data-sortable="true" data-field="id"   data-visible="false">Id</th>
 				<th data-field="name"><@locale code="resource.name"/></th>
+				<th data-field="resourceType"><@locale code="resource.resType"/></th>
+				<th data-field="resourceUrl"><@locale code="resource.resUrl"/></th>
+				<th data-field="resourceAction"><@locale code="resource.resAction"/></th>
 				<th data-field="description"><@locale code="common.text.description"/></th>
 	
 			</tr>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/roles/roleAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/roles/roleAdd.ftl
index ab7c1339e..6bfdeacc3 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/roles/roleAdd.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/roles/roleAdd.ftl
@@ -14,6 +14,12 @@
 <form id="actionForm"  method="post" type="label" autoclose="true"  action="<@base/>/roles/add"  class="needs-validation" novalidate>
 	<table border="0" cellpadding="0" cellspacing="0" class="table table-bordered" >
 		<tbody>
+			<tr>
+				<th><@locale code="role.id" />：</th>
+				<td nowrap>
+					<input type="text" id="id" name="id" class="form-control" title="" value=""  />
+				</td>
+			</tr>
 			<tr>
 				<th><@locale code="role.name" />：</th>
 				<td nowrap>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/roles/roleUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/roles/roleUpdate.ftl
index 0326dba82..3e4851664 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/roles/roleUpdate.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/roles/roleUpdate.ftl
@@ -14,7 +14,7 @@
 <form id="actionForm"  method="post" type="label" autoclose="true"  action="<@base/>/roles/update"  class="needs-validation" novalidate>
 	 <table  border="0" cellpadding="0" cellspacing="0" class="table table-bordered">
 		<tbody>
-		<tr style="display:none1">
+		<tr>
 			<th><@locale code="role.id" />：</th>
 			<td nowrap>
 				<input id="id" type="text" readonly name="id"  class="form-control"   value="${model.id}"/>