From a016b07c1e17ca9f2068aa3807c6b1c5e23a311d Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 17 Apr 2019 14:16:17 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=9F=BA=E7=A1=80=E7=89=88=E6=9C=AC][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=9D=83=E9=99=90=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201904171036__CHANGE_PERMISSION.sql | 144 ++++++++++++++ .../iformall/domain/po/MallPermission.java | 184 ++++-------------- 2 files changed, 177 insertions(+), 151 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201904171036__CHANGE_PERMISSION.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904171036__CHANGE_PERMISSION.sql b/mallinkAdmin/src/main/resources/db/migration/V201904171036__CHANGE_PERMISSION.sql new file mode 100644 index 000000000..744f4aa3d --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201904171036__CHANGE_PERMISSION.sql @@ -0,0 +1,144 @@ +DROP TABLE IF EXISTS `mall_permission` ; +CREATE TABLE `mall_permission` ( + `id` bigint(64) NOT NULL, + `name` varchar(32) DEFAULT NULL COMMENT '权限名称', + `parent_id` bigint(64) DEFAULT NULL COMMENT '父编号ID,一级菜单为0', + `available` varchar(1) DEFAULT 'Y' COMMENT '是否可用 Y/N', + `permission` varchar(50) DEFAULT NULL COMMENT '授权(多个用逗号分隔,如:user:list,user:create)', + `resource_type` tinyint(2) DEFAULT NULL COMMENT '资源类型0:目录 1:菜单 2:按钮', + `module_color` varchar(10) DEFAULT NULL COMMENT '菜单背景色-1级菜单使用', + `module_color_num` varchar(15) DEFAULT NULL COMMENT '菜单字体颜色-1级菜单使用', + `url` varchar(50) DEFAULT NULL COMMENT '资源路径(user/list or http://localhost/1.html)', + `icon` varchar(50) DEFAULT NULL COMMENT '菜单图标', + `version_type` tinyint(2) DEFAULT NULL COMMENT '版本类型(0:标准版)', + `sort` int(10) DEFAULT NULL COMMENT '排序', + PRIMARY KEY (`id`), + UNIQUE `id_UNIQUE` USING BTREE (`id`) comment '' +) ENGINE=`InnoDB` ROW_FORMAT=DYNAMIC COMMENT='系统权限表(当前到button)' CHECKSUM=0 DELAY_KEY_WRITE=0; + +INSERT INTO `mall_permission` + (`id`,`name`, `parent_id`,`available`,`permission`,`resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`,`sort`) +VALUES + (1, '数据塔台', 0, 'Y', 0, '#EE7653', '238,118,83', null, null, 0, 1), + (2, '商户商铺', 0, 'Y', 0, '#51A9C9', '81,169,201', null, null, 0, 2), + (3, '合同管理', 0, 'Y', 0, '#5A76BF', '90,118,191', null, null, 0, 3), + (4, '账单管理', 0, 'Y', 0, '#3FC496', '63,196,150', null, null, 0, 4), + (5, '会员系统', 0, 'Y', 0, '#6B5EC9', '107,94,201', null, null, 0, 5), + (6, '营销系统', 0, 'Y', 0, '#C85963', '200,89,99', null, null, 0, 6), + (7, '账号管理', 0, 'Y', 0, '#B23D8B', '178,61,139', null, null, 0, 9), + (8, '移动端数据塔台', 0, 'Y', '#B23D8B', '178,61,139', null, null, 0, 8), + (9, '智能硬件', 0, 'Y', 0, '#E19549', '225,149,73', null, null, 0, 7), + (50, '系统管理', 0, 'Y', '#B23D8B', '178,61,139', null, null, 0, 50), + + (101, '数据总览', 1, 'Y', null, 1, null, null, 'zonglan', 'icon-fumao-shujuzonglan', 0, 101), + (102, '运营数据', 1, 'Y', null, 1, null, null, 'yunying', 'icon-shuju1', 0, 102), + (103, '客流数据', 1, 'Y', null, 1, null, null, 'keliu', 'icon-shuju', 0, 103), + (104, '车流数据', 1, 'Y', null, 1, null, null, 'cheliu', 'icon-shujuquxianzoushiqushijiantouzhuzhuangtubiao', 0, 104), + (105, '线上营销交易', 1, 'Y', null, 1, null, null, 'yingxiao', 'icon-shuju2', 0, 105), + (106, '数据总览', 1, 'Y', null, 1, null, null, 'zonglan', 'icon-fumao-shujuzonglan', 0, 106), + (107, '用户数据', 1, 'Y', null, 1, null, null, 'huiyuanHome', 'icon-yonghushuju', 0, 107), + (108, 'WIFI使用数据', 1, 'Y', null, 1, null, null, 'wifiuse', 'icon-wifi', 0, 108), + + + (201, '商铺管理', 2, 'Y', null, 0, null, null, null, 'icon-iconshangpuguanli', 0, 201), + (202, '商户管理', 2, 'Y', null, 0, null, null, null, 'icon-shanghuguanli', 0, 202), + (203, '商户解单', 2, 'Y', null, 1, null, null, 'jiedanList', 'icon-jine', 0, 203), + (204, '商户收银', 2, 'Y', null, 1, null, null, 'cashierList', 'icon-shouyintai', 0, 204), + (205, '品牌管理', 2, 'Y', null, 0, null, null, null, 'icon-pinpaiguanli', 0, 205), + (211, '店铺', 201, 'Y', null, 1, null, null, 'shops', null, 0, 211), + (212, '多经点位', 201, 'Y', null, 1, null, null, 'points', null, 0, 212), + (221, '店铺商户', 202, 'Y', null, 1, null, null, 'merchant', null, 0, 221), + (222, '多经点位商户', 202, 'Y', null, 1, null, null, 'pointsMerchant', null, 0, 222), + (251, '品牌列表', 205, 'Y', null, 1, null, null, 'brandlist', null, 0, 251), + + (301, '商铺租赁合同', 3, 'Y', null, 1, null, null, 'rentlist', 'icon-zhangdan', 0, 301), + (302, '商铺物业合同', 3, 'Y', null, 1, null, null, 'tenementlist', 'icon-zhangdan', 0, 302), + (303, '多经点位租赁合同', 3, 'Y', null, 1, null, null, 'pointrentlist', 'icon-wuyehetong', 0, 303), + (304, '多经点位物业合同', 3, 'Y', null, 1, null, null, 'pointtenementlist', 'icon-wuyehetong', 0, 304), + + (401, '账单总览', 4, 'Y', null, 1, null, null, 'billlist', 'icon-bucaozulin', 0, 401), + (402, '商铺租赁账单', 4, 'Y', null, 1, null, null, 'zujinList', 'icon-zhangdan1', 0, 402), + (403, '商铺物业账单', 4, 'Y', null, 1, null, null, 'propertyList', 'icon-zhangdan1', 0, 403), + (404, '多经点位租赁账单', 4, 'Y', null, 1, null, null, 'pointzujinList', 'icon-taizhang', 0, 404), + (405, '多经点位物业账单', 4, 'Y', null, 1, null, null, 'pointpropertyList', 'icon-taizhang', 0, 405), + (406, '日常费用账单', 4, 'Y', null, 1, null, null, 'richangList', 'icon-richangfeiyongbaoxiao', 0, 406), + (407, '其他费用账单', 4, 'Y', null, 1, null, null, 'otherList', 'icon-qita', 0, 407), + (408, '其他押金账单', 4, 'Y', null, 1, null, null, 'otheryajinList', 'icon-yajin', 0, 408), + (409, '交易对账单', 4, 'Y', null, 1, null, null, 'dealbillList', 'icon-zhangdan11', 0, 409), + (410, '分账对账单', 4, 'Y', null, 1, null, null, 'sharingorderList', 'icon-zhangdan3', 0, 410), + (411, '营销补贴管理', 4, 'Y', null, 1, null, null, 'marketingList', 'icon-qian', 0, 411), + + (501, '用户概览', 5, 'Y', null, 1, null, null, 'huiyuanHome', 'icon-tubiaochicundaochuSVGshangchuandaoalibaba-', 0, 501), + (502, '用户数量', 5, 'Y', null, 1, null, null, 'huiyuanShuliang', 'icon-yonghuguanli2', 0, 502), + (503, '拓客分析', 5, 'Y', null, 1, null, null, 'huiyuanTuoke', 'icon-tuoke', 0, 503), + (504, '会员结构', 5, 'Y', null, 1, null, null, 'huiyuanJiegou', 'icon-bianjiICONCopy', 0, 504), + (505, '会员列表', 5, 'Y', null, 1, null, null, 'huiyuanList', 'icon-huiyuanliebiao', 0, 505), + (506, '会员成长值', 5, 'Y', null, 0, null, null, null, 'icon-chengchang', 0, 506), + (507, '会员积分', 5, 'Y', null, 0, null, null, null, 'icon-chengchang', 0, 507), + (508, '积分商城', 5, 'Y', null, 0, null, null, null, 'icon-chengchang', 0, 508), + (511, '等级设置', 506, 'Y', null, 1, null, null, 'czdengji', null, 0, 511), + (512, '规则设置', 506, 'Y', null, 1, null, null, 'czguize', null, 0, 512), + (513, '会员权益', 506, 'Y', null, 1, null, null, 'interestsMembers', null, 0, 513), + (521, '积分兑换', 507, 'Y', null, 1, null, null, 'duihuan', null, 0, 521), + (522, '积分规则', 507, 'Y', null, 1, null, null, 'guize', null, 0, 522), + (523, '积分变更记录', 507, 'Y', null, 1, null, null, 'biangeng', null, 0, 523), + (531, '商城管理', 507, 'Y', null, 1, null, null, 'jifensc', null, 0, 531), + (532, '积分券', 507, 'Y', null, 1, null, null, 'jifenq', null, 0, 532), + (533, '停车券', 507, 'Y', null, 1, null, null, 'tingcheq', null, 0, 533), + + (601, '营销统计', 6, 'Y', null, 0, null, null, null, 'icon-stat', 0, 601), + (602, '优惠券', 6, 'Y', null, 0, null, null, null, 'icon-iconfontyouhuiquan', 0, 602), + (603, '购物卡', 6, 'Y', null, 0, null, null, null, 'icon-qiapian', 0, 603), + (604, '营销活动', 6, 'Y', null, 0, null, null, null, 'icon-kanjia', 0, 604), + (605, '主题营销', 6, 'Y', null, 0, null, null, null, 'icon-qian', 0, 605), + (606, '渠道投放', 6, 'Y', null, 0, null, null, null, 'icon-piliangtoufang', 0, 606), + (607, '答题问卷', 6, 'Y', null, 1, null, null, 'questionsettinglist', 'icon-wenjuan', 0, 607), + (608, '场景投放', 6, 'Y', null, 0, null, null, null, 'icon-icon-test', 0, 608), + (609, '精准投放', 6, 'Y', null, 0, null, null, null, 'icon-jingzhuntoufang', 0, 609), + (610, '订单管理', 6, 'Y', null, 0, null, null, 'orderList', 'icon-dingdanguanli', 0, 610), + (611, '疲劳度设置', 6, 'Y', null, 1, null, null, 'pilaodu', 'icon-pilaojiashi', 0, 611), + (621, '卡营销数据', 601, 'Y', null, 1, null, null, 'cardSellData', null, 0, 621), + (622, '劵营销数据', 601, 'Y', null, 1, null, null, 'couponSellData', null, 0, 622), + (623, '砍价营销数据', 601, 'Y', null, 1, null, null, 'bargainSellData', null, 0, 623), + (624, '拼团营销数据', 601, 'Y', null, 1, null, null, 'groupSellData', null, 0, 624), + (625, '触达用户数', 601, 'Y', null, 1, null, null, 'chuda', null, 0, 625), + (626, '场景营销数据', 601, 'Y', null, 1, null, null, 'changjing', null, 0, 531), + (641, '通用券', 602, 'Y', null, 1, null, null, 'tongyong', null, 0, 641), + (642, '满减券', 602, 'Y', null, 1, null, null, 'manjian', null, 0, 642), + (643, '代金券', 602, 'Y', null, 1, null, null, 'daijin', null, 0, 643), + (644, '礼品券', 602, 'Y', null, 1, null, null, 'lipin', null, 0, 644), + (645, '停车券', 602, 'Y', null, 1, null, null, 'tingche', null, 0, 645), + (651, '消费卡', 603, 'Y', null, 1, null, null, 'introducing', null, 0, 651), + (661, '砍价', 604, 'Y', null, 1, null, null, 'bargain', null, 0, 661), + (662, '拼团', 604, 'Y', null, 1, null, null, 'spellgroup', null, 0, 662), + + (671, '宣传页', 605, 'Y', null, 1, null, null, 'xuanchuan', null, 0, 671), + (672, '互动营销游戏', 605, 'Y', null, 1, null, null, 'gamesetting', null, 0, 672), + (673, '广告大屏', 605, 'Y', null, 1, null, null, 'adscreen', null, 0, 673), + (674, '专题', 605, 'Y', null, 1, null, null, 'topictoufang', null, 0, 674), + + (681, '列表投放', 606, 'Y', null, 1, null, null, 'xiaochengxu', null, 0, 681), + (682, '限时抢购', 606, 'Y', null, 1, null, null, 'flashsale', null, 0, 682), + (683, '购物卡频道', 606, 'Y', null, 1, null, null, 'introcardput', null, 0, 683), + (684, '砍价', 606, 'Y', null, 1, null, null, 'bargainCoupon', null, 0, 684), + (685, '拼团', 606, 'Y', null, 1, null, null, 'groupbooktoufang', null, 0, 685), + + (691, '停车发券', 608, 'Y', null, 1, null, null, 'tingchetoufang', null, 0, 691), + (692, '核销发券', 608, 'Y', null, 1, null, null, 'hexiaotoufang', null, 0, 692), + (693, '收银台发券', 608, 'Y', null, 1, null, null, 'paymentb', null, 0, 693), + (694, '交易发劵', 608, 'Y', null, 1, null, null, 'buycoupon', null, 0, 694), + + (701, '精准发券', 609, 'Y', null, 1, null, null, 'jingzhuntoufang', null, 0, 701), + (702, '标签短信', 609, 'Y', null, 1, null, null, 'msglist', null, 0, 702), + + (711, '劵订单', 610, 'Y', null, 1, null, null, 'orderList', null, 0, 711), + (712, '卡订单', 610, 'Y', null, 1, null, null, 'sellingCardRecord', null, 0, 712), + (713, '卡消费订单', 610, 'Y', null, 1, null, null, 'consumRecord', null, 0, 713), + + (901, '角色管理', 7, 'Y', null, 1, null, null, 'ruleList', 'icon-navicon-yhgl', 0, 901), + (902, '用户数量', 7, 'Y', null, 1, null, null, 'userList', 'icon-yonghuguanli', 0, 902), + + (951, '广告大屏', 9, 'Y', null, 0, null, null, 'bigScreentList', 'icon-navicon-yhgl', 0, 951), + (961, '大屏管理', 951, 'Y', null, 1, null, null, 'bigScreentList', null, 0, 961), + + ; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java index 493cb1da8..4c98eba19 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java @@ -1,14 +1,24 @@ package com.iformall.domain.po; +import lombok.Data; + import javax.persistence.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; import java.io.Serializable; +@Data @Table(name = "mall_permission") public class MallPermission implements Serializable { private static final long serialVersionUID = 1L; + + // left + // id, name, parentId, moduleColor, moduleColorNum, 标准版 class + // childs + // name, link, id, icon + // + @Id protected Long id; @@ -17,176 +27,48 @@ public class MallPermission implements Serializable { protected List ids; @Transient protected String sortColumns; - - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - - public String getSortColumns() { - return sortColumns; - } - - public List getIds() { - return ids; - } - - public void setIds(List ids) { - this.ids = ids; - } - - /*权限名称[LIKE]**/ - @io.swagger.annotations.ApiModelProperty(value="权限名称[LIKE]",name="name") + @io.swagger.annotations.ApiModelProperty(value="权限名称",name="name") private String name; @Transient + @io.swagger.annotations.ApiModelProperty(value="权限名称[LIKE]",name="nameLike") private String nameLike; - /*是否可用 Y/N**/ + @io.swagger.annotations.ApiModelProperty(value="父编号ID,一级菜单为0",name="parentId") + private Long parentId; @io.swagger.annotations.ApiModelProperty(value="是否可用 Y/N",name="available") private String available; - /*父编号**/ - @io.swagger.annotations.ApiModelProperty(value="父编号",name="parentId") - private Long parentId; - /*父编号列表**/ - @io.swagger.annotations.ApiModelProperty(value="父编号列表",name="parentIds") - private String parentIds; - /*权限字符串[LIST]**/ - @io.swagger.annotations.ApiModelProperty(value="权限字符串[LIST]",name="permission") + @io.swagger.annotations.ApiModelProperty(value="授权(多个用逗号分隔,如:user:list,user:create)",name="permission") private String permission; @Transient private List permissions; - /*资源类型0菜单 1,按钮**/ - @io.swagger.annotations.ApiModelProperty(value="资源类型0菜单 1,按钮",name="resourceType") - private String resourceType; - /*资源路径**/ - @io.swagger.annotations.ApiModelProperty(value="资源路径",name="url") + @io.swagger.annotations.ApiModelProperty(value="资源类型0:目录 1:菜单 2:按钮",name="resourceType") + private Integer resourceType; + @io.swagger.annotations.ApiModelProperty(value="菜单背景色-1级菜单使用",name="moduleColor") + private String moduleColor; + @io.swagger.annotations.ApiModelProperty(value="菜单字体颜色-1级菜单使用",name="moduleColorNum") + private String moduleColorNum; + @io.swagger.annotations.ApiModelProperty(value="资源路径(user/list or http://localhost/1.html)",name="url") private String url; - /*排序[FROM][TO][GTE][GT][LTE][LT]**/ - @io.swagger.annotations.ApiModelProperty(value="排序[FROM][TO][GTE][GT][LTE][LT]",name="sort") + @io.swagger.annotations.ApiModelProperty(value="菜单图标",name="icon") + private String icon; + @io.swagger.annotations.ApiModelProperty(value="版本类型(1:标准版)",name="versionType") + private Integer versionType; + @io.swagger.annotations.ApiModelProperty(value="排序",name="sort") private Integer sort; - @Transient - private Integer sortFrom; - @Transient - private Integer sortTo; - @Transient - private Integer sortGte; - @Transient - private Integer sortGt; - @Transient - private Integer sortLte; - @Transient - private Integer sortLt; - public String getName() { - return name; - } - public void setName(String _name) { - name = _name; - } - public String getNameLike() { - return nameLike; - } - public void setNameLike( String _nameLike) { - nameLike = _nameLike; - } - public String getAvailable() { - return available; - } - public void setAvailable(String _available) { - available = _available; - } - public Long getParentId() { - return parentId; - } - public void setParentId(Long _parentId) { - parentId = _parentId; - } - public String getParentIds() { - return parentIds; - } - public void setParentIds(String _parentIds) { - parentIds = _parentIds; - } - public String getPermission() { - return permission; - } - public void setPermission(String _permission) { - permission = _permission; - } - public List getPermissions() { - return permissions; - } - public void setPermissions( List _permissions) { - permissions = _permissions; - } - public String getResourceType() { - return resourceType; - } - public void setResourceType(String _resourceType) { - resourceType = _resourceType; - } - public String getUrl() { - return url; - } - public void setUrl(String _url) { - url = _url; - } - public Integer getSort() { - return sort; - } - public void setSort(Integer _sort) { - sort = _sort; - } - public Integer getSortFrom() { - return sortFrom; - } - public void setSortFrom( Integer _sortFrom) { - sortFrom = _sortFrom; - } - public Integer getSortTo() { - return sortTo; - } - public void setSortTo( Integer _sortTo) { - sortTo = _sortTo; - } - public Integer getSortGte() { - return sortGte; - } - public void setSortGte( Integer _sortGte) { - sortGte = _sortGte; - } - public Integer getSortGt() { - return sortGt; - } - public void setSortGt( Integer _sortGt) { - sortGt = _sortGt; - } - public Integer getSortLte() { - return sortLte; - } - public void setSortLte( Integer _sortLte) { - sortLte = _sortLte; - } - public Integer getSortLt() { - return sortLt; - } - public void setSortLt( Integer _sortLt) { - sortLt = _sortLt; - } - - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") + ,ParentId_ASC("`parentId` ASC"),ParentId_DESC("`parentId` DESC") ,Available_ASC("`available` ASC"),Available_DESC("`available` DESC") - ,ParentId_ASC("`parentId` ASC"),ParentId_DESC("`parentId` DESC") - ,ParentIds_ASC("`parentIds` ASC"),ParentIds_DESC("`parentIds` DESC") ,Permission_ASC("`permission` ASC"),Permission_DESC("`permission` DESC") - ,ResourceType_ASC("`resourceType` ASC"),ResourceType_DESC("`resourceType` DESC") + ,ResourceType_ASC("`resource_type` ASC"),ResourceType_DESC("`resource_type` DESC") + ,ModuleColor_ASC("`module_color` ASC"),ModuleColor_DESC("`module_color` DESC") + ,ModuleColorNum_ASC("`module_color_num` ASC"),ModuleColorNum_DESC("`module_color_num` DESC") ,Url_ASC("`url` ASC"),Url_DESC("`url` DESC") + ,Icon_ASC("`icon` ASC"),Icon_DESC("`icon` DESC") + ,VersionType_ASC("`version_type` ASC"),VersionType_DESC("`version_type` DESC") ,Sort_ASC("`sort` ASC"),Sort_DESC("`sort` DESC") ; private String value;