From 755d94cbdcdecb9aea1c1718ab4f221dfec4cc22 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 15 May 2019 23:50:47 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=90=8E=E7=AB=AF=EF=BC=9A=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=A2=9E=E5=8A=A0=20icon?=
 =?UTF-8?q?=E3=80=81permissions=E3=80=81=E5=8E=BB=E9=99=A4=20name=20?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin-web/src/locales/zh-CN/menu.js           |   2 +-
 admin-web/src/pages/Admin/ResourceList.js     | 121 +++++++++++-------
 .../vo/resource/ResourceTreeNodeVO.java       |  20 +--
 .../admin/api/bo/resource/ResourceBO.java     |   4 +
 .../mall/admin/convert/ResourceConvert.java   |  17 ++-
 .../mall/admin/dao/ResourceMapper.java        |  13 +-
 .../mall/admin/dataobject/ResourceDO.java     |   2 +
 .../mall/admin/service/OAuth2ServiceImpl.java |   3 +-
 .../admin/service/ResourceServiceImpl.java    |   6 +-
 .../main/resources/mapper/ResourceMapper.xml  |  44 +------
 10 files changed, 106 insertions(+), 126 deletions(-)

diff --git a/admin-web/src/locales/zh-CN/menu.js b/admin-web/src/locales/zh-CN/menu.js
index 849ae3b8c..0c549bcdd 100644
--- a/admin-web/src/locales/zh-CN/menu.js
+++ b/admin-web/src/locales/zh-CN/menu.js
@@ -41,7 +41,7 @@ export default {
   // admin
   'menu.admin': '系统设置',
   'menu.admin.admin-list': '管理员列表',
-  'menu.admin.resource-list': '资源列表',
+  'menu.admin.resource-list': '权限列表',
   'menu.admin.role-list': '角色列表',
   'menu.admin.dictionary-list': '数据字典',
   // 商品相关
diff --git a/admin-web/src/pages/Admin/ResourceList.js b/admin-web/src/pages/Admin/ResourceList.js
index e2f9b7046..31fc8ca1d 100644
--- a/admin-web/src/pages/Admin/ResourceList.js
+++ b/admin-web/src/pages/Admin/ResourceList.js
@@ -15,6 +15,7 @@ import {
   TreeSelect,
   Radio,
   Divider,
+  Icon, InputNumber,
 } from 'antd';
 import PageHeaderWrapper from '@/components/PageHeaderWrapper';
 
@@ -23,7 +24,8 @@ import styles from './ResourceList.less';
 const RadioGroup = Radio.Group;
 const FormItem = Form.Item;
 const { Option } = Select;
-const types = ['未知', '菜单', '链接'];
+const TextArea = Input.TextArea;
+const types = ['未知', '菜单', '按钮'];
 
 // 添加 form 表单
 const CreateForm = Form.create()(props => {
@@ -58,8 +60,15 @@ const CreateForm = Form.create()(props => {
     width: 200,
   };
 
-  const title = modalType === 'add' ? '添加一个 Resource' : '更新一个 Resource';
-  const okText = modalType === 'add' ? '添加' : '更新';
+  function onTypeChange(event) {
+    initValues.type = parseInt(event.target.value);
+  }
+
+  // 给 type 赋予初始值
+  initValues.type = initValues.type || 1;
+
+  const title = modalType === 'add' ? '添加一个权限' : '编辑一个权限';
+  const okText = modalType === 'add' ? '添加' : '编辑';
   return (
     <Modal
       destroyOnClose
@@ -71,9 +80,9 @@ const CreateForm = Form.create()(props => {
     >
       <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="类型">
         {form.getFieldDecorator('type', {
-          initialValue: initValues.type || 1,
+          initialValue: initValues.type,
         })(
-          <RadioGroup>
+          <RadioGroup onChange={onTypeChange}>
             <Radio value={1}>菜单</Radio>
             <Radio value={2}>按钮</Radio>
           </RadioGroup>
@@ -81,28 +90,17 @@ const CreateForm = Form.create()(props => {
       </FormItem>
       <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="名称">
         {form.getFieldDecorator('displayName', {
-          rules: [{ required: true, message: '请输入菜单展示名字！', min: 2 }],
+          rules: [{ required: true, message: '请输入名称！', min: 2 }],
           initialValue: initValues.displayName,
-        })(<Input placeholder="显示名称" />)}
-      </FormItem>
-      <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="菜单KEY">
-        {form.getFieldDecorator('name', {
-          rules: [{ required: true, message: '请输入资源名字！' }],
-          initialValue: initValues.name,
-        })(<Input placeholder="菜单KEY 如：用户 USER" />)}
-      </FormItem>
-      <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="操作/路由">
-        {form.getFieldDecorator('handler', {
-          initialValue: initValues.handler,
-        })(<Input placeholder="操作/路由" />)}
+        })(<Input placeholder="名称" />)}
       </FormItem>
       <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="父级菜单">
         {form.getFieldDecorator('pid', {
-          rules: [{ required: true, message: '请输入父级编号！' }],
+          rules: [{ required: true, message: '请选择父级编号！' }],
           initialValue:
             initValues.pid === 0
               ? `根节点-${initValues.pid}`
-              : `${initValues.displayName}-${initValues.pid}`,
+              : initValues.pid ? `${initValues.displayName}-${initValues.pid}` : undefined,
         })(
           <TreeSelect
             showSearch
@@ -113,11 +111,35 @@ const CreateForm = Form.create()(props => {
           />
         )}
       </FormItem>
-      <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="菜单排序">
+      <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="排序">
         {form.getFieldDecorator('sort', {
-          rules: [{ required: true, message: '请输入菜单排序！' }],
+          rules: [{ required: true, message: '请输入排序！' }],
           initialValue: initValues.sort,
-        })(<Input placeholder="请输入" />)}
+        })(<InputNumber placeholder="请输入" />)}
+      </FormItem>
+      {
+        initValues.type === 1 ? (
+          <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="图标">
+            {form.getFieldDecorator('icon', {
+              rules: [{ required: true, message: '请输入图标！' }],
+              initialValue: initValues.icon,
+            })(<Input placeholder="图标" />)}
+          </FormItem>
+        ) : ''
+      }
+      {
+        initValues.type === 1 ? (
+          <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="操作">
+            {form.getFieldDecorator('handler', {
+              initialValue: initValues.handler,
+            })(<Input placeholder="操作" />)}
+          </FormItem>
+        ) : ''
+      }
+      <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="权限标识">
+        {form.getFieldDecorator('permissions', {
+          initialValue: initValues.permissions,
+        })(<TextArea placeholder="多个用逗号进行分割，例如：system.admin.add,system.admin.update" />)}
       </FormItem>
     </Modal>
   );
@@ -176,7 +198,7 @@ class ResourceList extends PureComponent {
             ...fields,
           },
           callback: () => {
-            message.success('更新成功');
+            message.success('编辑成功');
             this.handleModalVisible();
           },
         },
@@ -214,24 +236,13 @@ class ResourceList extends PureComponent {
 
     const columns = [
       {
-        title: '编号',
-        dataIndex: 'id',
-        render: text => <strong>{text}</strong>,
-      },
-      {
-        title: '显示名字',
+        title: '名称',
         dataIndex: 'displayName',
-        render: text => <a>{text}</a>,
       },
       {
-        title: '菜单KEY',
-        dataIndex: 'name',
-      },
-      {
-        title: '父级编号',
-        dataIndex: 'pid',
-        sorter: true,
-        render: val => `${val}`,
+        title: '图标',
+        dataIndex: 'icon',
+        render: text => text ? <Icon type={text} /> : '',
       },
       {
         title: '类型',
@@ -241,12 +252,32 @@ class ResourceList extends PureComponent {
         },
       },
       {
-        title: '菜单/操作',
+        title: '排序',
+        dataIndex: 'sort',
+      },
+      {
+        title: '操作',
         dataIndex: 'handler',
-        sorter: true,
-        width: 300,
+        width: 200,
         render: val => <span>{val}</span>,
       },
+      {
+        title: '权限标识',
+        dataIndex: 'permissions',
+        width: 300,
+        render(permissions) {
+          let text = '';
+          if (permissions) {
+            for (let i in permissions) {
+              if (i > 0) {
+                text += '  ';
+              }
+              text += permissions[i];
+            }
+          }
+          return (<span>{text}</span>);
+        }
+      },
       {
         title: '创建时间',
         dataIndex: 'createTime',
@@ -257,7 +288,7 @@ class ResourceList extends PureComponent {
         title: '操作',
         render: (text, record) => (
           <Fragment>
-            <a onClick={() => this.handleModalVisible(true, 'update', record)}>更新</a>
+            <a onClick={() => this.handleModalVisible(true, 'update', record)}>编辑</a>
             <Divider type="vertical" />
             <a className={styles.tableDelete} onClick={() => this.handleDelete(record)}>
               删除
@@ -268,7 +299,7 @@ class ResourceList extends PureComponent {
     ];
 
     return (
-      <PageHeaderWrapper title="查询表格">
+      <PageHeaderWrapper>
         <Card bordered={false}>
           <div className={styles.tableList}>
             <div className={styles.tableListOperator}>
@@ -277,7 +308,7 @@ class ResourceList extends PureComponent {
                 type="primary"
                 onClick={() => this.handleModalVisible(true, 'add', {})}
               >
-                新建
+                新建权限
               </Button>
             </div>
           </div>
diff --git a/system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/resource/ResourceTreeNodeVO.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/resource/ResourceTreeNodeVO.java
index 3feda78ed..115d1e54a 100644
--- a/system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/resource/ResourceTreeNodeVO.java
+++ b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/resource/ResourceTreeNodeVO.java
@@ -1,34 +1,18 @@
 package cn.iocoder.mall.admin.application.vo.resource;
 
+import cn.iocoder.mall.admin.api.bo.resource.ResourceBO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.util.Date;
 import java.util.List;
 
 @ApiModel("资源树结构 VO")
 @Data
 @Accessors(chain = true)
-public class ResourceTreeNodeVO {
+public class ResourceTreeNodeVO extends ResourceBO {
 
-    @ApiModelProperty(value = "资源编号", required = true, example = "1")
-    private Integer id;
-    @ApiModelProperty(value = "资源名字（标识）", required = true, example = "商品管理")
-    private String name;
-    @ApiModelProperty(value = "资源类型", required = true, example = "1")
-    private Integer type;
-    @ApiModelProperty(value = "排序", required = true, example = "1")
-    private Integer sort;
-    @ApiModelProperty(value = "菜单展示名", required = true, example = "商品管理")
-    private String displayName;
-    @ApiModelProperty(value = "创建时间", required = true, example = "时间戳格式")
-    private Date createTime;
-    @ApiModelProperty(value = "父级资源编号", required = true, example = "1", notes = "如果无父资源，则值为 0")
-    private Integer pid;
-    @ApiModelProperty(value = "操作", required = true, example = "/order/list")
-    private String handler;
     @ApiModelProperty(value = "子节点数组")
     private List<ResourceTreeNodeVO> children;
 
diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/resource/ResourceBO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/resource/ResourceBO.java
index d8be6097a..20365719a 100644
--- a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/resource/ResourceBO.java
+++ b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/resource/ResourceBO.java
@@ -7,6 +7,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 @ApiModel("资源 BO")
 @Data
@@ -34,6 +35,9 @@ public class ResourceBO implements Serializable {
     @ApiModelProperty(value = "图标", example = "add")
     private String icon;
 
+    @ApiModelProperty(value = "权限标识数组", example = "system.order.add,system.order.update")
+    private List<String> permissions;
+
     @ApiModelProperty(value = "创建时间", required = true, example = "时间戳格式")
     private Date createTime;
 
diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/ResourceConvert.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/ResourceConvert.java
index 844d35ea1..6437fa465 100644
--- a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/ResourceConvert.java
+++ b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/ResourceConvert.java
@@ -26,15 +26,24 @@ public interface ResourceConvert {
     @Mappings({})
     List<ResourceBO> convert(List<ResourceDO> resourceDOs);
 
-    @Mappings({})
+    @Mappings({
+            @Mapping(source = "permissions", target = "permissions", qualifiedByName = "translateStringFromList")
+    })
     ResourceDO convert(ResourceAddDTO resourceAddDTO);
 
-    @Mappings({})
+    @Mappings({
+            @Mapping(source = "permissions", target = "permissions", qualifiedByName = "translateStringFromList")
+    })
     ResourceDO convert(ResourceUpdateDTO resourceUpdateDTO);
 
     @Named("translateListFromString")
-    default List<String> translateListFromString(String picUrls) {
-        return StringUtil.split(picUrls, ",");
+    default List<String> translateListFromString(String str) {
+        return StringUtil.split(str, ",");
+    }
+
+    @Named("translateStringFromList")
+    default String translateStringFromList(List<String> list) {
+        return StringUtil.join(list, ",");
     }
 
 }
diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/ResourceMapper.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/ResourceMapper.java
index 9f4efdd3c..f2b0a9782 100644
--- a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/ResourceMapper.java
+++ b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/ResourceMapper.java
@@ -1,6 +1,7 @@
 package cn.iocoder.mall.admin.dao;
 
 import cn.iocoder.mall.admin.dataobject.ResourceDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -8,7 +9,7 @@ import java.util.List;
 import java.util.Set;
 
 @Repository
-public interface ResourceMapper {
+public interface ResourceMapper extends BaseMapper<ResourceDO> {
 
     ResourceDO selectByTypeAndHandler(@Param("type") Integer type,
                                       @Param("handler") String handler);
@@ -18,16 +19,8 @@ public interface ResourceMapper {
 
     List<ResourceDO> selectListByType(@Param("type") Integer type);
 
-    ResourceDO selectByName(@Param("name") String name);
-
-    ResourceDO selectById(@Param("id") Integer id);
-
     List<ResourceDO> selectListByIds(@Param("ids") Set<Integer> ids);
 
-    void insert(ResourceDO resource);
-
-    int update(ResourceDO resource);
-
     int selectCountByPid(@Param("pid") Integer pid);
 
-}
\ No newline at end of file
+}
diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java
index e2b8ad26c..57a4fae96 100644
--- a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java
+++ b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java
@@ -1,12 +1,14 @@
 package cn.iocoder.mall.admin.dataobject;
 
 import cn.iocoder.common.framework.dataobject.DeletableDO;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
 /**
  * 资源实体
  */
+@TableName(value = "resource")
 @Data
 @Accessors(chain = true)
 public class ResourceDO extends DeletableDO {
diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/OAuth2ServiceImpl.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/OAuth2ServiceImpl.java
index b40d34d40..7c05febd0 100644
--- a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/OAuth2ServiceImpl.java
+++ b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/OAuth2ServiceImpl.java
@@ -6,6 +6,7 @@ import cn.iocoder.mall.admin.api.OAuth2Service;
 import cn.iocoder.mall.admin.api.bo.oauth2.OAuth2AccessTokenBO;
 import cn.iocoder.mall.admin.api.bo.oauth2.OAuth2AuthenticationBO;
 import cn.iocoder.mall.admin.api.constant.AdminErrorCodeEnum;
+import cn.iocoder.mall.admin.api.constant.ResourceConstants;
 import cn.iocoder.mall.admin.convert.OAuth2Convert;
 import cn.iocoder.mall.admin.dao.OAuth2AccessTokenMapper;
 import cn.iocoder.mall.admin.dao.OAuth2RefreshTokenMapper;
@@ -96,7 +97,7 @@ public class OAuth2ServiceImpl implements OAuth2Service {
     @Override
     public CommonResult<Boolean> checkPermission(Integer adminId, Set<Integer> roleIds, String url) {
         // 如果未配置该资源，说明无需权限控制。
-        ResourceDO resource = resourceService.getResourceByTypeAndHandler(ResourceDO.TYPE_OPERATION, url);
+        ResourceDO resource = resourceService.getResourceByTypeAndHandler(ResourceConstants.TYPE_BUTTON, url);
         if (resource == null) {
             return CommonResult.success(true);
         }
diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/ResourceServiceImpl.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/ResourceServiceImpl.java
index b65e3a3cf..9caad0fa8 100644
--- a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/ResourceServiceImpl.java
+++ b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/ResourceServiceImpl.java
@@ -80,7 +80,7 @@ public class ResourceServiceImpl implements ResourceService {
         // 更新到数据库
         ResourceDO resource = ResourceConvert.INSTANCE.convert(resourceUpdateDTO);
         initResourceProperty(resource);
-        resourceMapper.update(resource);
+        resourceMapper.updateById(resource);
         // TODO 操作日志
         // 返回成功
         return true;
@@ -98,9 +98,7 @@ public class ResourceServiceImpl implements ResourceService {
             throw ServiceExceptionUtil.exception(AdminErrorCodeEnum.RESOURCE_EXISTS_CHILDREN.getCode());
         }
         // 更新到数据库
-        ResourceDO resource = new ResourceDO().setId(resourceId);
-        resource.setDeleted(DeletedStatusEnum.DELETED_YES.getValue());
-        resourceMapper.update(resource);
+        resourceMapper.deleteById(resourceId);
         // 删除资源关联表
         roleResourceMapper.updateToDeletedByResourceId(resourceId);
         // 返回成功
diff --git a/system/system-service-impl/src/main/resources/mapper/ResourceMapper.xml b/system/system-service-impl/src/main/resources/mapper/ResourceMapper.xml
index a3d8f281f..2edd8cf35 100644
--- a/system/system-service-impl/src/main/resources/mapper/ResourceMapper.xml
+++ b/system/system-service-impl/src/main/resources/mapper/ResourceMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="cn.iocoder.mall.admin.dao.ResourceMapper">
 
     <sql id="FIELDS">
-        id, name, type, sort, display_name,
+        id, type, sort, display_name, icon, permissions,
         create_time, pid, handler
     </sql>
 
@@ -46,23 +46,6 @@
         AND r.id = rr.resource_id
     </select>
 
-    <select id="selectByName" parameterType="String" resultType="ResourceDO">
-        SELECT
-          <include refid="FIELDS"/>
-        FROM resource
-        WHERE name = #{name}
-        AND deleted = 0
-        LIMIT 1
-    </select>
-
-    <select id="selectById" resultType="ResourceDO">
-        SELECT
-          <include refid="FIELDS"/>
-        FROM resource
-        WHERE id = #{id}
-        AND deleted = 0
-    </select>
-
     <select id="selectListByIds" resultType="ResourceDO">
         SELECT
           <include refid="FIELDS"/>
@@ -82,29 +65,4 @@
         AND deleted = 0
     </select>
 
-    <update id="update" parameterType="ResourceDO">
-        UPDATE resource
-        <set>
-            <if test="name != null">
-                name = #{name},
-            </if>
-            <if test="sort != null">
-                sort = #{sort},
-            </if>
-            <if test="displayName != null">
-                display_name = #{displayName},
-            </if>
-            <if test="pid != null">
-                pid = #{pid},
-            </if>
-            <if test="handler != null">
-                handler = #{handler},
-            </if>
-            <if test="deleted != null">
-                deleted = #{deleted}
-            </if>
-        </set>
-        WHERE id = #{id}
-    </update>
-
 </mapper>