From 794f3f0d3f40c0711c6a1a086929f7538c572303 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 22 Apr 2020 12:32:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E6=96=B0=E5=A2=9Eepmet-user,gov-access,o?= =?UTF-8?q?per-customize=20db=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db.migration/epmet_gov_access.sql | 92 +++++++++++++++++++ .../db.migration/customer_foot_bar.sql | 36 ++++++++ .../resources/db/migration/epmet_user.sql | 33 ++++++- 3 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-access/gov-access-server/src/main/resources/db.migration/epmet_gov_access.sql create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db.migration/customer_foot_bar.sql diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/db.migration/epmet_gov_access.sql b/epmet-module/gov-access/gov-access-server/src/main/resources/db.migration/epmet_gov_access.sql new file mode 100644 index 0000000000..89cfdb3d94 --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/db.migration/epmet_gov_access.sql @@ -0,0 +1,92 @@ +/* + Date: 22/04/2020 12:13:38 +*/ + +-- SET NAMES utf8mb4; +-- #SET FOREIGN_KEY_CHECKS = 0; + +-- DROP TABLE IF EXISTS `permission_scope`; +CREATE TABLE `permission_scope` ( + `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'id', + `SCOPE_KEY` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '范围key', + `SCOPE_NAME` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '范围名称', + `DEL_FLAG` tinyint(1) NULL DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', + `REVISION` int(10) NULL DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者id', + `CREATED_TIME` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者id', + `UPDATED_TIME` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '权限范围表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for resource_ope +-- ---------------------------- +DROP TABLE IF EXISTS `resource_ope`; +CREATE TABLE `resource_ope` ( + `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `OPERATION_KEY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `OPERATION_NAME` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `BRIEF` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作简介', + `DEL_FLAG` tinyint(1) NULL DEFAULT NULL, + `REVISION` int(10) NULL DEFAULT NULL, + `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `CREATED_TIME` datetime(0) NULL DEFAULT NULL, + `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `UPDATED_TIME` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作类型表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for role_operation +-- ---------------------------- +DROP TABLE IF EXISTS `role_operation`; +CREATE TABLE `role_operation` ( + `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `ROLE_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色ID', + `OPERATION_KEY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '操作key', + `DEL_FLAG` tinyint(1) NULL DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', + `REVISION` int(10) NULL DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者id', + `CREATED_TIME` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者id', + `UPDATED_TIME` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色能进行那些操作' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for role_scope +-- ---------------------------- +DROP TABLE IF EXISTS `role_scope`; +CREATE TABLE `role_scope` ( + `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `ROLE_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色ID', + `PERMISSION_KEY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '权限key', + `DEL_FLAG` tinyint(1) NULL DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', + `REVISION` int(10) NULL DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者id', + `CREATED_TIME` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者id', + `UPDATED_TIME` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色能操作哪些范围' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for role_template +-- ---------------------------- +DROP TABLE IF EXISTS `role_template`; +CREATE TABLE `role_template` ( + `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', + `ROLE_KEY` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色key', + `ROLE_NAME` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色名称', + `ORG_TYPE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色所属体系类型：org,dept,grid', + `DEL_FLAG` tinyint(1) NULL DEFAULT NULL, + `REVISION` int(10) NULL DEFAULT NULL, + `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `CREATED_TIME` datetime(0) NULL DEFAULT NULL, + `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `UPDATED_TIME` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '政府端角色模板表' ROW_FORMAT = Dynamic; + +-- SET FOREIGN_KEY_CHECKS = 1; diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db.migration/customer_foot_bar.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db.migration/customer_foot_bar.sql new file mode 100644 index 0000000000..fc496afa9a --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db.migration/customer_foot_bar.sql @@ -0,0 +1,36 @@ +/* + Date: 22/04/2020 12:21:32 wxz +*/ + +-- SET NAMES utf8mb4; +-- SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for customer_foot_bar +-- ---------------------------- +DROP TABLE IF EXISTS `customer_foot_bar`; +CREATE TABLE `customer_foot_bar` ( + `ID` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '唯一标识', + `BAR_NAME` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'bar名称', + `KEY` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'KEY', + `PAGE_TITLE` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '页面标题', + `ICON_PATH` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图标路径', + `SELECTED_ICON_PATH` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '选中页面图标路径', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识：0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = 'APP底部菜单栏信息' ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of customer_foot_bar +-- ---------------------------- +INSERT INTO `customer_foot_bar` VALUES ('1', '工作', 'work', '党群e事通-政府端', NULL, NULL, 0, 0, 'wxz', '2020-04-22 10:53:22', 'wxz', '2020-04-22 10:53:26'); +INSERT INTO `customer_foot_bar` VALUES ('2', '组织', 'org', '组织机构', NULL, NULL, 0, 0, 'wxz', '2020-04-22 10:53:56', 'wxz', '2020-04-22 10:54:00'); +INSERT INTO `customer_foot_bar` VALUES ('3', '数据', 'data', '数据', NULL, NULL, 0, 0, 'wxz', '2020-04-22 11:20:54', 'wxz', '2020-04-22 11:20:58'); +INSERT INTO `customer_foot_bar` VALUES ('4', '发现', 'find', '发现', NULL, NULL, 0, 0, 'wxz', '2020-04-22 11:21:48', 'wxz', '2020-04-22 11:21:53'); + +-- SET FOREIGN_KEY_CHECKS = 1; diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql index 9283e23220..0076d0ef90 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql @@ -85,4 +85,35 @@ CREATE TABLE `staff_grid_visited` ( `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新人', `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`ID`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='工作人员进入网格日志表'; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='工作人员进入网格日志表'; + +-- 2020.4.22 增加政府端角色表&政府工作人员-角色关系表 + +CREATE TABLE `staff_role` ( + `ID` varchar(64) NOT NULL, + `STAFF_ID` varchar(64) NOT NULL COMMENT '用户ID', + `ROLE_ID` varchar(64) NOT NULL COMMENT '角色ID', + `ORG_ID` varchar(255) DEFAULT NULL COMMENT '角色所属类型的ID。例如，机关的角色，那该字段就是所属机关的ID；部门的角色，该字段就是所属部门的ID；网格的角色，该字段就是所属网格ID', + `DEL_FLAG` tinyint(1) DEFAULT NULL, + `REVISION` int(10) DEFAULT NULL, + `CREATED_BY` varchar(64) DEFAULT NULL, + `CREATED_TIME` datetime DEFAULT NULL, + `UPDATED_BY` varchar(64) DEFAULT NULL, + `UPDATED_TIME` datetime DEFAULT NULL, + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='工作人员-角色关系表'; + +CREATE TABLE `gov_staff_role` ( + `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID。如果该角色由客户定制，其下的机关和部门都不再各自定制自己的角色，这个字段会比较有用。包括通用角色以及客户定制角色。', + `ROLE_KEY` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色key', + `ROLE_NAME` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色名称', + `ORG_TYPE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色所属体系类型：agency,department,grid', + `DEL_FLAG` tinyint(1) NULL DEFAULT NULL, + `REVISION` int(10) NULL DEFAULT NULL, + `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `CREATED_TIME` datetime(0) NULL DEFAULT NULL, + `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `UPDATED_TIME` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '政府端角色表' ROW_FORMAT = Dynamic; From d521b63fa62443ea296de5bde79fb20e60a0025c Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 22 Apr 2020 12:45:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.db=E8=84=9A=E6=9C=AC=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db.migration/epmet_gov_access.sql | 18 --------------- .../resources/db/migration/epmet_user.sql | 23 +++++++++++++++++++ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/db.migration/epmet_gov_access.sql b/epmet-module/gov-access/gov-access-server/src/main/resources/db.migration/epmet_gov_access.sql index 89cfdb3d94..c7c63b6c42 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/db.migration/epmet_gov_access.sql +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/db.migration/epmet_gov_access.sql @@ -71,22 +71,4 @@ CREATE TABLE `role_scope` ( PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色能操作哪些范围' ROW_FORMAT = Dynamic; --- ---------------------------- --- Table structure for role_template --- ---------------------------- -DROP TABLE IF EXISTS `role_template`; -CREATE TABLE `role_template` ( - `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `ROLE_KEY` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色key', - `ROLE_NAME` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色名称', - `ORG_TYPE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色所属体系类型：org,dept,grid', - `DEL_FLAG` tinyint(1) NULL DEFAULT NULL, - `REVISION` int(10) NULL DEFAULT NULL, - `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `CREATED_TIME` datetime(0) NULL DEFAULT NULL, - `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `UPDATED_TIME` datetime(0) NULL DEFAULT NULL, - PRIMARY KEY (`ID`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '政府端角色模板表' ROW_FORMAT = Dynamic; - -- SET FOREIGN_KEY_CHECKS = 1; diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql index 0076d0ef90..bdefcc6a31 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql @@ -117,3 +117,26 @@ CREATE TABLE `gov_staff_role` ( `UPDATED_TIME` datetime(0) NULL DEFAULT NULL, PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '政府端角色表' ROW_FORMAT = Dynamic; + +CREATE TABLE `gov_role_template` ( + `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', + `ROLE_KEY` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色key', + `ROLE_NAME` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色名称', + `ORG_TYPE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色所属体系类型：org,dept,grid', + `DEL_FLAG` tinyint(1) NULL DEFAULT NULL, + `REVISION` int(10) NULL DEFAULT NULL, + `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `CREATED_TIME` datetime(0) NULL DEFAULT NULL, + `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `UPDATED_TIME` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '政府端角色模板表' ROW_FORMAT = Dynamic; + +INSERT INTO `gov_role_template` VALUES ('1', 'agency_leader', '单位领导', 'agency', 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `gov_role_template` VALUES ('2', 'dept_leader', '部门领导', 'department', 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `gov_role_template` VALUES ('3', 'party_principals', '党建负责人', '', 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `gov_role_template` VALUES ('4', 'manager', '管理员', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `gov_role_template` VALUES ('5', 'staff', '工作人员', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `gov_role_template` VALUES ('6', 'grid_manager', '网格长', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `gov_role_template` VALUES ('7', 'grid_party_director', '网格党建指导员', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `gov_role_template` VALUES ('8', 'grid_member', '网格员', NULL, 0, NULL, NULL, NULL, NULL, NULL); \ No newline at end of file From fd00986a70e1f2a0aaa87e4f995afc78956d8ddd Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 22 Apr 2020 12:50:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.db=E8=84=9A=E6=9C=AC=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/epmet_user.sql | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql index bdefcc6a31..10c5d34b4c 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql @@ -107,7 +107,7 @@ CREATE TABLE `gov_staff_role` ( `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID。如果该角色由客户定制，其下的机关和部门都不再各自定制自己的角色，这个字段会比较有用。包括通用角色以及客户定制角色。', `ROLE_KEY` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色key', - `ROLE_NAME` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色名称', + `ROLE_NAME` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色名称', `ORG_TYPE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色所属体系类型：agency,department,grid', `DEL_FLAG` tinyint(1) NULL DEFAULT NULL, `REVISION` int(10) NULL DEFAULT NULL, @@ -118,7 +118,7 @@ CREATE TABLE `gov_staff_role` ( PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '政府端角色表' ROW_FORMAT = Dynamic; -CREATE TABLE `gov_role_template` ( +CREATE TABLE `gov_staff_role_template` ( `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', `ROLE_KEY` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色key', `ROLE_NAME` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色名称', @@ -132,11 +132,11 @@ CREATE TABLE `gov_role_template` ( PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '政府端角色模板表' ROW_FORMAT = Dynamic; -INSERT INTO `gov_role_template` VALUES ('1', 'agency_leader', '单位领导', 'agency', 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `gov_role_template` VALUES ('2', 'dept_leader', '部门领导', 'department', 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `gov_role_template` VALUES ('3', 'party_principals', '党建负责人', '', 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `gov_role_template` VALUES ('4', 'manager', '管理员', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `gov_role_template` VALUES ('5', 'staff', '工作人员', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `gov_role_template` VALUES ('6', 'grid_manager', '网格长', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `gov_role_template` VALUES ('7', 'grid_party_director', '网格党建指导员', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `gov_role_template` VALUES ('8', 'grid_member', '网格员', NULL, 0, NULL, NULL, NULL, NULL, NULL); \ No newline at end of file +INSERT INTO `gov_staff_role_template` VALUES ('1', 'agency_leader', '单位领导', 'agency', 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `gov_staff_role_template` VALUES ('2', 'dept_leader', '部门领导', 'department', 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `gov_staff_role_template` VALUES ('3', 'party_principals', '党建负责人', '', 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `gov_staff_role_template` VALUES ('4', 'manager', '管理员', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `gov_staff_role_template` VALUES ('5', 'staff', '工作人员', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `gov_staff_role_template` VALUES ('6', 'grid_manager', '网格长', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `gov_staff_role_template` VALUES ('7', 'grid_party_director', '网格党建指导员', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `gov_staff_role_template` VALUES ('8', 'grid_member', '网格员', NULL, 0, NULL, NULL, NULL, NULL, NULL); \ No newline at end of file