From 408624c36c78a48586e501c7dd896362a015d84f Mon Sep 17 00:00:00 2001
From: wanggeng888 <450292408@qq.com>
Date: Tue, 4 May 2021 12:13:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/service/impl/PermissionServiceImpl.java   | 9 +++++++++
 .../main/resources/mybatis/mapper/permission-mapper.xml  | 6 ++++++
 .../src/main/resources/templates/permission/list.html    | 9 +++++++++
 .../src/main/resources/templates/permission/save.html    | 4 ++--
 .../src/main/resources/templates/permission/update.html  | 4 ++--
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/service-permission/src/main/java/ink/wgink/service/permission/service/impl/PermissionServiceImpl.java b/service-permission/src/main/java/ink/wgink/service/permission/service/impl/PermissionServiceImpl.java
index 2a90c403..dbbbf721 100644
--- a/service-permission/src/main/java/ink/wgink/service/permission/service/impl/PermissionServiceImpl.java
+++ b/service-permission/src/main/java/ink/wgink/service/permission/service/impl/PermissionServiceImpl.java
@@ -38,6 +38,15 @@ public class PermissionServiceImpl extends DefaultBaseService implements IPermis
 
     @Override
     public void save(PermissionVO permissionVO) {
+        Map<String, Object> params = getHashMap(4);
+        params.put("permissionUrl", permissionVO.getPermissionUrl());
+        params.put("permissionType", permissionVO.getPermissionType());
+        params.put("apiTag", permissionVO.getApiTag());
+        params.put("systemTag", permissionVO.getSystemTag());
+        List<PermissionDTO> permissionDTOs = list(params);
+        if (!permissionDTOs.isEmpty()) {
+            return;
+        }
         savePermissionReturnId(permissionVO);
     }
 
diff --git a/service-permission/src/main/resources/mybatis/mapper/permission-mapper.xml b/service-permission/src/main/resources/mybatis/mapper/permission-mapper.xml
index d1c4a5dc..2e68df91 100644
--- a/service-permission/src/main/resources/mybatis/mapper/permission-mapper.xml
+++ b/service-permission/src/main/resources/mybatis/mapper/permission-mapper.xml
@@ -160,6 +160,8 @@
         AND (
             t1.permission_title LIKE CONCAT('%', #{keywords}, '%')
             OR
+            t1.api_tag LIKE CONCAT('%', #{keywords}, '%')
+            OR
             t1.system_tag LIKE CONCAT('%', #{keywords}, '%')
         )
         </if>
@@ -175,6 +177,10 @@
         AND
             t1.api_tag = #{apiTag}
         </if>
+        <if test="permissionUrl != null and permissionUrl != ''">
+        AND
+            t1.permission_url = #{permissionUrl}
+        </if>
         <if test="isPublic != null">
         AND
             t1.is_public = #{isPublic}
diff --git a/service-permission/src/main/resources/templates/permission/list.html b/service-permission/src/main/resources/templates/permission/list.html
index 1560180e..7bac3f78 100644
--- a/service-permission/src/main/resources/templates/permission/list.html
+++ b/service-permission/src/main/resources/templates/permission/list.html
@@ -112,6 +112,15 @@
                                 return '错误';
                             }
                         },
+                        {field: 'apiTag', width: 180, title: '接口标识', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
                         {field: 'systemTag', width: 180, title: '系统标识', align:'center',
                             templet: function(row) {
                                 var rowData = row[this.field];
diff --git a/service-permission/src/main/resources/templates/permission/save.html b/service-permission/src/main/resources/templates/permission/save.html
index 25fc2f49..548f6ce4 100644
--- a/service-permission/src/main/resources/templates/permission/save.html
+++ b/service-permission/src/main/resources/templates/permission/save.html
@@ -38,13 +38,13 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">API标识</label>
                     <div class="layui-input-block">
-                        <input type="text" id="apiTag" name="apiTag" class="layui-input" value="" placeholder="请输入API标识（Controller名称，用于对API进行分组）" maxlength="255">
+                        <input type="text" id="apiTag" name="apiTag" class="layui-input" value="" placeholder="请输入API标识（Controller名称，用于对API进行分组。页面写上级目录名称，首字母大写）" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">系统标识</label>
                     <div class="layui-input-block">
-                        <input type="text" id="systemTag" name="systemTag" class="layui-input" value="" placeholder="请输入系统标识" maxlength="255">
+                        <input type="text" id="systemTag" name="systemTag" class="layui-input" value="" placeholder="请输入系统标识，可写项目上下文" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item" pane>
diff --git a/service-permission/src/main/resources/templates/permission/update.html b/service-permission/src/main/resources/templates/permission/update.html
index 20ec8157..ec2e6fb6 100644
--- a/service-permission/src/main/resources/templates/permission/update.html
+++ b/service-permission/src/main/resources/templates/permission/update.html
@@ -38,13 +38,13 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">API标识</label>
                     <div class="layui-input-block">
-                        <input type="text" id="apiTag" name="apiTag" class="layui-input" value="" placeholder="请输入API标识（Controller名称，用于对API进行分组）" maxlength="255">
+                        <input type="text" id="apiTag" name="apiTag" class="layui-input" value="" placeholder="请输入API标识（Controller名称，用于对API进行分组。页面写上级目录名称，首字母大写）" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">系统标识</label>
                     <div class="layui-input-block">
-                        <input type="text" id="systemTag" name="systemTag" class="layui-input" value="" placeholder="请输入系统标识" maxlength="255">
+                        <input type="text" id="systemTag" name="systemTag" class="layui-input" value="" placeholder="请输入系统标识，可写项目上下文" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item" pane>