Skip to content

G
guns-vip
Commit 44885cab by fengshuonan
Options

新增修改用户增加职位

parent 5c794401
Showing with 810 additions and 228 deletions
_sqls/guns_mysql.sql
......@@ -4,19 +4,19 @@ CREATE DATABASE IF NOT EXISTS guns DEFAULT CHARSET utf8 COLLATE utf8_general_ci;
USE guns;
/*
Navicat MySQL Data Transfer
Navicat Premium Data Transfer
Source Server : localhost
Source Server Type : MySQL
Source Server Version : 50723
Source Server Version : 50724
Source Host : localhost:3306
Source Schema : guns
Target Server Type : MySQL
Target Server Version : 50723
Target Server Version : 50724
File Encoding : 65001
Date: 27/06/2019 21:28:30
Date: 28/06/2019 14:39:13
*/
SET NAMES utf8mb4;
......@@ -26,71 +26,74 @@ SET FOREIGN_KEY_CHECKS = 0;
-- Table structure for database_info
-- ----------------------------
DROP TABLE IF EXISTS `database_info`;
CREATE TABLE `database_info` (
CREATE TABLE `database_info` (
`db_id` bigint(20) NOT NULL COMMENT '主键id',
`db_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '数据库名称（英文名称）',
`jdbc_driver` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'jdbc的驱动类型',
`user_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '数据库连接的账号',
`password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '数据库连接密码',
`jdbc_url` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'jdbc的url',
`remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '备注，摘要',
`create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
`db_name` varchar(255) NOT NULL COMMENT '数据库名称（英文名称）',
`jdbc_driver` varchar(255) NOT NULL COMMENT 'jdbc的驱动类型',
`user_name` varchar(255) NOT NULL COMMENT '数据库连接的账号',
`password` varchar(255) NOT NULL COMMENT '数据库连接密码',
`jdbc_url` varchar(2000) NOT NULL COMMENT 'jdbc的url',
`remarks` varchar(255) DEFAULT NULL COMMENT '备注，摘要',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
PRIMARY KEY (`db_id`) USING BTREE,
UNIQUE INDEX `NAME_UNIQUE`(`db_name`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '数据库信息表' ROW_FORMAT = Dynamic;
UNIQUE KEY `NAME_UNIQUE` (`db_name`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='数据库信息表';
-- ----------------------------
-- Records of database_info
-- ----------------------------
BEGIN;
INSERT INTO `database_info` VALUES (1143387804278038529, 'master', 'com.mysql.cj.jdbc.Driver', 'root', 'root', 'jdbc:mysql://127.0.0.1:3306/guns?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT', '主数据源，项目启动数据源！', '2019-06-25 13:17:50');
COMMIT;
-- ----------------------------
-- Table structure for oauth_user_info
-- ----------------------------
DROP TABLE IF EXISTS `oauth_user_info`;
CREATE TABLE `oauth_user_info` (
CREATE TABLE `oauth_user_info` (
`oauth_id` bigint(20) NOT NULL COMMENT '主键id',
`user_id` bigint(20) NOT NULL COMMENT '用户主键id',
`nick_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '昵称',
`avatar` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '头像',
`blog` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '用户网址',
`company` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '所在公司',
`location` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '位置',
`email` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '邮箱',
`remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '用户备注（各平台中的用户个人介绍）',
`nick_name` varchar(255) DEFAULT NULL COMMENT '昵称',
`avatar` varchar(500) DEFAULT NULL COMMENT '头像',
`blog` varchar(255) DEFAULT NULL COMMENT '用户网址',
`company` varchar(255) DEFAULT NULL COMMENT '所在公司',
`location` varchar(255) DEFAULT NULL COMMENT '位置',
`email` varchar(255) DEFAULT NULL COMMENT '邮箱',
`remark` varchar(255) DEFAULT NULL COMMENT '用户备注（各平台中的用户个人介绍）',
`gender` int(11) DEFAULT NULL COMMENT '性别，1-男，0-女',
`source` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '用户来源',
`token` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '用户授权的token',
`uuid` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '第三方平台的用户唯一di',
`create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
`source` varchar(255) DEFAULT NULL COMMENT '用户来源',
`token` varchar(255) DEFAULT NULL COMMENT '用户授权的token',
`uuid` varchar(255) DEFAULT NULL COMMENT '第三方平台的用户唯一di',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`create_user` bigint(20) DEFAULT NULL COMMENT '创建用户',
`update_time` datetime(0) DEFAULT NULL COMMENT '更新时间',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
`update_user` bigint(20) DEFAULT NULL COMMENT '更新用户',
PRIMARY KEY (`oauth_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '第三方用户信息表' ROW_FORMAT = Dynamic;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='第三方用户信息表';
-- ----------------------------
-- Table structure for sys_config
-- ----------------------------
DROP TABLE IF EXISTS `sys_config`;
CREATE TABLE `sys_config` (
CREATE TABLE `sys_config` (
`id` bigint(20) NOT NULL COMMENT '主键',
`name` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称',
`code` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '属性编码标识',
`dict_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '是否是字典中的值',
`name` varchar(200) NOT NULL COMMENT '名称',
`code` varchar(200) NOT NULL COMMENT '属性编码标识',
`dict_flag` char(1) NOT NULL COMMENT '是否是字典中的值',
`dict_type_id` bigint(20) DEFAULT NULL COMMENT '字典类型的编码',
`value` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '属性值，如果是字典中的类型，则为dict的code',
`remark` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '备注',
`create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
`value` varchar(200) NOT NULL COMMENT '属性值，如果是字典中的类型，则为dict的code',
`remark` varchar(200) DEFAULT NULL COMMENT '备注',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`create_user` bigint(20) DEFAULT NULL COMMENT '创建人',
`update_time` datetime(0) DEFAULT NULL COMMENT '更新时间',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
`update_user` bigint(20) DEFAULT NULL COMMENT '更新人',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '参数配置' ROW_FORMAT = Dynamic;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='参数配置';
-- ----------------------------
-- Records of sys_config
-- ----------------------------
BEGIN;
INSERT INTO `sys_config` VALUES (1143324237579165697, '验证码开关', 'GUNS_KAPTCHA_OPEN', 'Y', 1106120265689055233, 'DISABLE', '是否开启验证码', '2019-06-24 12:46:43', 1, '2019-06-25 09:04:42', 1);
INSERT INTO `sys_config` VALUES (1143386834613694465, '阿里云短信的keyId', 'GUNS_SMS_ACCESSKEY_ID', 'N', NULL, 'xxxkey', '阿里云短信的密钥key', '2019-06-25 13:13:59', 1, '2019-06-25 13:19:21', 1);
INSERT INTO `sys_config` VALUES (1143386953933254657, '阿里云短信的secret', 'GUNS_SMS_ACCESSKEY_SECRET', 'N', NULL, 'xxxsecret', '阿里云短信的secret', '2019-06-25 13:14:28', 1, NULL, NULL);
......@@ -100,59 +103,63 @@ INSERT INTO `sys_config` VALUES (1143387225019510785, '验证码短信失效时
INSERT INTO `sys_config` VALUES (1143468689664876546, '管理系统名称', 'GUNS_SYSTEM_NAME', 'N', NULL, 'Guns快速开发平台', '管理系统名称', '2019-06-25 18:39:15', 1, NULL, NULL);
INSERT INTO `sys_config` VALUES (1143468867767607297, '默认系统密码', 'GUNS_DEFAULT_PASSWORD', 'N', NULL, '111111', '默认系统密码', '2019-06-25 18:39:57', 1, NULL, NULL);
INSERT INTO `sys_config` VALUES (1143469008025133058, 'OAuth2登录用户的账号标识', 'GUNS_OAUTH2_PREFIX', 'N', NULL, 'oauth2', 'OAuth2登录用户的账号标识', '2019-06-25 18:40:31', 1, NULL, NULL);
COMMIT;
-- ----------------------------
-- Table structure for sys_dept
-- ----------------------------
DROP TABLE IF EXISTS `sys_dept`;
CREATE TABLE `sys_dept` (
CREATE TABLE `sys_dept` (
`dept_id` bigint(20) NOT NULL COMMENT '主键id',
`pid` bigint(20) DEFAULT 0 COMMENT '父部门id',
`pids` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT '父级ids',
`simple_name` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '简称',
`full_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '全称',
`description` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '描述',
`pid` bigint(20) DEFAULT '0' COMMENT '父部门id',
`pids` varchar(512) DEFAULT '' COMMENT '父级ids',
`simple_name` varchar(45) DEFAULT NULL COMMENT '简称',
`full_name` varchar(255) DEFAULT NULL COMMENT '全称',
`description` varchar(255) DEFAULT NULL COMMENT '描述',
`version` int(11) DEFAULT NULL COMMENT '版本（乐观锁保留字段）',
`sort` int(11) DEFAULT NULL COMMENT '排序',
`create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) DEFAULT NULL COMMENT '修改时间',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_time` datetime DEFAULT NULL COMMENT '修改时间',
`create_user` bigint(20) DEFAULT NULL COMMENT '创建人',
`update_user` bigint(20) DEFAULT NULL COMMENT '修改人',
PRIMARY KEY (`dept_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '部门表' ROW_FORMAT = Dynamic;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='部门表';
-- ----------------------------
-- Records of sys_dept
-- ----------------------------
BEGIN;
INSERT INTO `sys_dept` VALUES (24, 0, '[0],', '总公司', '总公司', '', NULL, 1, NULL, NULL, NULL, NULL);
INSERT INTO `sys_dept` VALUES (25, 24, '[0],[24],', '开发部', '开发部', '', NULL, 2, NULL, NULL, NULL, NULL);
INSERT INTO `sys_dept` VALUES (26, 24, '[0],[24],', '运营部', '运营部', '', NULL, 3, NULL, NULL, NULL, NULL);
INSERT INTO `sys_dept` VALUES (27, 24, '[0],[24],', '战略部', '战略部', '', NULL, 4, NULL, NULL, NULL, NULL);
COMMIT;
-- ----------------------------
-- Table structure for sys_dict
-- ----------------------------
DROP TABLE IF EXISTS `sys_dict`;
CREATE TABLE `sys_dict` (
CREATE TABLE `sys_dict` (
`dict_id` bigint(20) NOT NULL COMMENT '字典id',
`dict_type_id` bigint(20) NOT NULL COMMENT '所属字典类型的id',
`code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典编码',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典名称',
`code` varchar(50) NOT NULL COMMENT '字典编码',
`name` varchar(255) NOT NULL COMMENT '字典名称',
`parent_id` bigint(20) NOT NULL COMMENT '上级代码id',
`parent_ids` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '所有上级id',
`status` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'ENABLE' COMMENT '状态（字典）',
`parent_ids` varchar(255) DEFAULT NULL COMMENT '所有上级id',
`status` varchar(10) NOT NULL DEFAULT 'ENABLE' COMMENT '状态（字典）',
`sort` int(11) DEFAULT NULL COMMENT '排序',
`description` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '字典的描述',
`create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) DEFAULT NULL COMMENT '更新时间',
`description` varchar(1000) DEFAULT NULL COMMENT '字典的描述',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
`create_user` bigint(20) DEFAULT NULL COMMENT '创建人',
`update_user` bigint(20) DEFAULT NULL COMMENT '修改人',
PRIMARY KEY (`dict_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '基础字典' ROW_FORMAT = Dynamic;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='基础字典';
-- ----------------------------
-- Records of sys_dict
-- ----------------------------
BEGIN;
INSERT INTO `sys_dict` VALUES (1106120532442595330, 1106120208097067009, 'M', '男', 0, '[0]', 'ENABLE', NULL, '', '2019-03-14 17:11:00', NULL, 1, NULL);
INSERT INTO `sys_dict` VALUES (1106120574163337218, 1106120208097067009, 'F', '女', 0, '[0]', 'ENABLE', NULL, '', '2019-03-14 17:11:10', NULL, 1, NULL);
INSERT INTO `sys_dict` VALUES (1106120645697191938, 1106120265689055233, 'ENABLE', '启用', 0, '[0]', 'ENABLE', NULL, '', '2019-03-14 17:11:27', NULL, 1, NULL);
......@@ -162,97 +169,101 @@ INSERT INTO `sys_dict` VALUES (1106120825993543682, 1106120322450571266, 'FREEZE
INSERT INTO `sys_dict` VALUES (1106120875872206849, 1106120322450571266, 'DELETED', '已删除', 0, '[0]', 'ENABLE', -1221, '', '2019-03-14 17:12:22', '2019-03-16 10:56:53', 1, 1);
INSERT INTO `sys_dict` VALUES (1106120935070613505, 1106120388036902914, 'Y', '删除', 0, '[0]', 'ENABLE', 23333, '', '2019-03-14 17:12:36', '2019-03-16 10:58:53', 1, 1);
INSERT INTO `sys_dict` VALUES (1106120968910258177, 1106120388036902914, 'N', '未删除', 0, '[0]', 'ENABLE', 1212211221, '', '2019-03-14 17:12:44', '2019-03-16 10:59:03', 1, 1);
COMMIT;
-- ----------------------------
-- Table structure for sys_dict_type
-- ----------------------------
DROP TABLE IF EXISTS `sys_dict_type`;
CREATE TABLE `sys_dict_type` (
CREATE TABLE `sys_dict_type` (
`dict_type_id` bigint(20) NOT NULL COMMENT '字典类型id',
`code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典类型编码',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典类型名称',
`description` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '字典描述',
`code` varchar(255) NOT NULL COMMENT '字典类型编码',
`name` varchar(255) NOT NULL COMMENT '字典类型名称',
`description` varchar(1000) DEFAULT NULL COMMENT '字典描述',
`system_flag` char(1) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '是否是系统字典，Y-是，N-否',
`status` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'ENABLE' COMMENT '状态(字典)',
`status` varchar(10) NOT NULL DEFAULT 'ENABLE' COMMENT '状态(字典)',
`sort` int(11) DEFAULT NULL COMMENT '排序',
`create_time` datetime(0) DEFAULT NULL COMMENT '添加时间',
`create_time` datetime DEFAULT NULL COMMENT '添加时间',
`create_user` bigint(20) DEFAULT NULL COMMENT '创建人',
`update_time` datetime(0) DEFAULT NULL COMMENT '修改时间',
`update_time` datetime DEFAULT NULL COMMENT '修改时间',
`update_user` bigint(20) DEFAULT NULL COMMENT '修改人',
PRIMARY KEY (`dict_type_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '字典类型表' ROW_FORMAT = Dynamic;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='字典类型表';
-- ----------------------------
-- Records of sys_dict_type
-- ----------------------------
BEGIN;
INSERT INTO `sys_dict_type` VALUES (1106120208097067009, 'SEX', '性别', '', 'Y', 'ENABLE', 4, '2019-03-14 17:09:43', 1, NULL, NULL);
INSERT INTO `sys_dict_type` VALUES (1106120265689055233, 'STATUS', '状态', '', 'Y', 'ENABLE', 3, '2019-03-14 17:09:57', 1, NULL, NULL);
INSERT INTO `sys_dict_type` VALUES (1106120322450571266, 'ACCOUNT_STATUS', '账号状态', '', 'Y', 'ENABLE', 21112, '2019-03-14 17:10:10', 1, '2019-03-16 10:56:15', 1);
INSERT INTO `sys_dict_type` VALUES (1106120388036902914, 'DEL_FLAG', '是否删除', '', 'Y', 'ENABLE', 2, '2019-03-14 17:10:26', 1, '2019-03-27 16:26:31', 1);
COMMIT;
-- ----------------------------
-- Table structure for sys_file_info
-- ----------------------------
DROP TABLE IF EXISTS `sys_file_info`;
CREATE TABLE `sys_file_info` (
`file_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键id',
`file_bucket` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '文件仓库（oss仓库）',
`file_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '文件名称',
`file_suffix` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '文件后缀',
CREATE TABLE `sys_file_info` (
`file_id` varchar(50) NOT NULL COMMENT '主键id',
`file_bucket` varchar(100) DEFAULT NULL COMMENT '文件仓库（oss仓库）',
`file_name` varchar(100) NOT NULL COMMENT '文件名称',
`file_suffix` varchar(50) DEFAULT NULL COMMENT '文件后缀',
`file_size_kb` bigint(20) DEFAULT NULL COMMENT '文件大小kb',
`final_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '文件唯一标识id',
`file_path` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '存储路径',
`create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) DEFAULT NULL COMMENT '修改时间',
`final_name` varchar(100) NOT NULL COMMENT '文件唯一标识id',
`file_path` varchar(1000) DEFAULT NULL COMMENT '存储路径',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_time` datetime DEFAULT NULL COMMENT '修改时间',
`create_user` bigint(20) DEFAULT NULL COMMENT '创建用户',
`update_user` bigint(20) DEFAULT NULL COMMENT '修改用户',
PRIMARY KEY (`file_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '文件信息表' ROW_FORMAT = Dynamic;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='文件信息表';
-- ----------------------------
-- Table structure for sys_login_log
-- ----------------------------
DROP TABLE IF EXISTS `sys_login_log`;
CREATE TABLE `sys_login_log` (
CREATE TABLE `sys_login_log` (
`login_log_id` bigint(20) NOT NULL COMMENT '主键',
`log_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '日志名称',
`log_name` varchar(255) DEFAULT NULL COMMENT '日志名称',
`user_id` bigint(20) DEFAULT NULL COMMENT '管理员id',
`create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
`succeed` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '是否执行成功',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`succeed` varchar(255) DEFAULT NULL COMMENT '是否执行成功',
`message` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT '具体消息',
`ip_address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '登录ip',
`ip_address` varchar(255) DEFAULT NULL COMMENT '登录ip',
PRIMARY KEY (`login_log_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '登录记录' ROW_FORMAT = Dynamic;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='登录记录';
-- ----------------------------
-- Table structure for sys_menu
-- ----------------------------
DROP TABLE IF EXISTS `sys_menu`;
CREATE TABLE `sys_menu` (
CREATE TABLE `sys_menu` (
`menu_id` bigint(20) NOT NULL COMMENT '主键id',
`code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '菜单编号',
`pcode` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '菜单父编号',
`pcodes` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '当前菜单的所有父菜单编号',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '菜单名称',
`icon` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '菜单图标',
`url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT 'url地址',
`code` varchar(255) DEFAULT NULL COMMENT '菜单编号',
`pcode` varchar(255) DEFAULT NULL COMMENT '菜单父编号',
`pcodes` varchar(255) DEFAULT NULL COMMENT '当前菜单的所有父菜单编号',
`name` varchar(255) DEFAULT NULL COMMENT '菜单名称',
`icon` varchar(255) DEFAULT NULL COMMENT '菜单图标',
`url` varchar(255) DEFAULT NULL COMMENT 'url地址',
`sort` int(65) DEFAULT NULL COMMENT '菜单排序号',
`levels` int(65) DEFAULT NULL COMMENT '菜单层级',
`menu_flag` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '是否是菜单(字典)',
`description` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '备注',
`status` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT 'ENABLE' COMMENT '菜单状态(字典)',
`new_page_flag` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '是否打开新页面的标识(字典)',
`open_flag` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '是否打开(字典)',
`create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) DEFAULT NULL COMMENT '修改时间',
`menu_flag` varchar(32) DEFAULT NULL COMMENT '是否是菜单(字典)',
`description` varchar(255) DEFAULT NULL COMMENT '备注',
`status` varchar(32) DEFAULT 'ENABLE' COMMENT '菜单状态(字典)',
`new_page_flag` varchar(32) DEFAULT NULL COMMENT '是否打开新页面的标识(字典)',
`open_flag` varchar(32) DEFAULT NULL COMMENT '是否打开(字典)',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_time` datetime DEFAULT NULL COMMENT '修改时间',
`create_user` bigint(20) DEFAULT NULL COMMENT '创建人',
`update_user` bigint(20) DEFAULT NULL COMMENT '修改人',
PRIMARY KEY (`menu_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '菜单表' ROW_FORMAT = Dynamic;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='菜单表';
-- ----------------------------
-- Records of sys_menu
-- ----------------------------
BEGIN;
INSERT INTO `sys_menu` VALUES (105, 'system', '0', '[0],', '系统管理', 'layui-icon layui-icon-set', '#', 20, 1, 'Y', NULL, 'ENABLE', NULL, '1', NULL, '2019-03-29 16:32:27', NULL, 1);
INSERT INTO `sys_menu` VALUES (106, 'mgr', 'system', '[0],[system],', '用户管理', '', '/mgr', 1, 2, 'Y', NULL, 'ENABLE', NULL, '0', NULL, '2019-03-29 16:32:27', NULL, 1);
INSERT INTO `sys_menu` VALUES (107, 'mgr_add', 'mgr', '[0],[system],[mgr],', '添加用户', NULL, '/mgr/add', 1, 3, 'N', NULL, 'ENABLE', NULL, '0', NULL, '2019-03-29 16:32:27', NULL, 1);
......@@ -323,84 +334,94 @@ INSERT INTO `sys_menu` VALUES (1142957882422112257, 'SYS_CONFIG', 'meta_data', '
INSERT INTO `sys_menu` VALUES (1142957882422112258, 'SYS_CONFIG_ADD', 'SYS_CONFIG', '[0],[dev_tools],[meta_data],[SYS_CONFIG],', '参数配置添加', 'fa-star', '', 999, 4, 'N', '', 'ENABLE', '', '', '2019-06-24 08:49:28', '2019-06-24 08:57:34', 1, 1);
INSERT INTO `sys_menu` VALUES (1142957882422112259, 'SYS_CONFIG_EDIT', 'SYS_CONFIG', '[0],[dev_tools],[meta_data],[SYS_CONFIG],', '参数配置修改', 'fa-star', '', 999, 4, 'N', '', 'ENABLE', '', '', '2019-06-24 08:49:28', '2019-06-24 08:57:34', 1, 1);
INSERT INTO `sys_menu` VALUES (1142957882426306562, 'SYS_CONFIG_DELETE', 'SYS_CONFIG', '[0],[dev_tools],[meta_data],[SYS_CONFIG],', '参数配置删除', 'fa-star', '', 999, 4, 'N', '', 'ENABLE', '', '', '2019-06-24 08:49:28', '2019-06-24 08:57:34', 1, 1);
INSERT INTO `sys_menu` VALUES (1144441072852684801, 'SYS_POSITION', 'system', '[0],[system],', '职位管理', 'fa-star', '/position', 35, 2, 'Y', '', 'ENABLE', '', '', '2019-06-28 11:03:09', '2019-06-28 11:06:42', 1, 1);
INSERT INTO `sys_menu` VALUES (1144441072852684802, 'SYS_POSITION_ADD', 'SYS_POSITION', '[0],[system],[SYS_POSITION],', '职位表添加', 'fa-star', '', 999, 3, 'N', '', 'ENABLE', '', '', '2019-06-28 11:03:09', '2019-06-28 11:06:42', 1, 1);
INSERT INTO `sys_menu` VALUES (1144441072852684803, 'SYS_POSITION_EDIT', 'SYS_POSITION', '[0],[system],[SYS_POSITION],', '职位表修改', 'fa-star', '', 999, 3, 'N', '', 'ENABLE', '', '', '2019-06-28 11:03:09', '2019-06-28 11:06:42', 1, 1);
INSERT INTO `sys_menu` VALUES (1144441072852684804, 'SYS_POSITION_DELETE', 'SYS_POSITION', '[0],[system],[SYS_POSITION],', '职位表删除', 'fa-star', '', 999, 3, 'N', '', 'ENABLE', '', '', '2019-06-28 11:03:09', '2019-06-28 11:06:42', 1, 1);
COMMIT;
-- ----------------------------
-- Table structure for sys_notice
-- ----------------------------
DROP TABLE IF EXISTS `sys_notice`;
CREATE TABLE `sys_notice` (
CREATE TABLE `sys_notice` (
`notice_id` bigint(20) NOT NULL COMMENT '主键',
`title` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '标题',
`title` varchar(255) DEFAULT NULL COMMENT '标题',
`content` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT '内容',
`create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`create_user` bigint(20) DEFAULT NULL COMMENT '创建人',
`update_time` datetime(0) DEFAULT NULL COMMENT '修改时间',
`update_time` datetime DEFAULT NULL COMMENT '修改时间',
`update_user` bigint(20) DEFAULT NULL COMMENT '修改人',
PRIMARY KEY (`notice_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '通知表' ROW_FORMAT = Dynamic;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='通知表';
-- ----------------------------
-- Records of sys_notice
-- ----------------------------
BEGIN;
INSERT INTO `sys_notice` VALUES (6, '欢迎', 'hi，Guns旗舰版发布了！', '2017-01-11 08:53:20', 1, '2018-12-28 23:24:48', 1);
INSERT INTO `sys_notice` VALUES (8, '你好', '你好，世界！', '2017-05-10 19:28:57', 1, '2018-12-28 23:28:26', 1);
COMMIT;
-- ----------------------------
-- Table structure for sys_operation_log
-- ----------------------------
DROP TABLE IF EXISTS `sys_operation_log`;
CREATE TABLE `sys_operation_log` (
CREATE TABLE `sys_operation_log` (
`operation_log_id` bigint(20) NOT NULL COMMENT '主键',
`log_type` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '日志类型(字典)',
`log_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '日志名称',
`log_type` varchar(32) DEFAULT NULL COMMENT '日志类型(字典)',
`log_name` varchar(255) DEFAULT NULL COMMENT '日志名称',
`user_id` bigint(65) DEFAULT NULL COMMENT '用户id',
`class_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '类名称',
`class_name` varchar(255) DEFAULT NULL COMMENT '类名称',
`method` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT '方法名称',
`create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
`succeed` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '是否成功(字典)',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`succeed` varchar(32) DEFAULT NULL COMMENT '是否成功(字典)',
`message` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT '备注',
PRIMARY KEY (`operation_log_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '操作日志' ROW_FORMAT = Dynamic;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='操作日志';
-- ----------------------------
-- Table structure for sys_position
-- ----------------------------
DROP TABLE IF EXISTS `sys_position`;
CREATE TABLE `sys_position` (
CREATE TABLE `sys_position` (
`position_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键id',
`name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '职位名称',
`code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '职位编码',
`name` varchar(50) NOT NULL COMMENT '职位名称',
`code` varchar(64) NOT NULL COMMENT '职位编码',
`sort` int(11) NOT NULL COMMENT '顺序',
`status` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '状态(字典)',
`remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '备注',
`create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
`status` varchar(100) NOT NULL COMMENT '状态(字典)',
`remark` varchar(500) DEFAULT NULL COMMENT '备注',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_user` bigint(20) DEFAULT NULL COMMENT '更新者',
`update_time` datetime(0) DEFAULT NULL COMMENT '更新时间',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
`create_user` bigint(20) DEFAULT NULL COMMENT '创建者',
PRIMARY KEY (`position_id`) USING BTREE,
UNIQUE INDEX `CODE_UNI`(`code`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '职位表' ROW_FORMAT = Dynamic;
UNIQUE KEY `CODE_UNI` (`code`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='职位表';
-- ----------------------------
-- Records of sys_position
-- ----------------------------
BEGIN;
INSERT INTO `sys_position` VALUES (1, '董事长', 'President', 1, 'ENABLE', NULL, '2019-06-27 18:14:43', 1, NULL, NULL);
INSERT INTO `sys_position` VALUES (2, '总经理', 'GM', 2, 'ENABLE', NULL, '2019-06-27 18:14:43', 1, NULL, NULL);
COMMIT;
-- ----------------------------
-- Table structure for sys_relation
-- ----------------------------
DROP TABLE IF EXISTS `sys_relation`;
CREATE TABLE `sys_relation` (
CREATE TABLE `sys_relation` (
`relation_id` bigint(20) NOT NULL COMMENT '主键',
`menu_id` bigint(20) DEFAULT NULL COMMENT '菜单id',
`role_id` bigint(20) DEFAULT NULL COMMENT '角色id',
PRIMARY KEY (`relation_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '角色和菜单关联表' ROW_FORMAT = Dynamic;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='角色和菜单关联表';
-- ----------------------------
-- Records of sys_relation
-- ----------------------------
BEGIN;
INSERT INTO `sys_relation` VALUES (1138325281010921473, 105, 5);
INSERT INTO `sys_relation` VALUES (1138325281031892994, 132, 5);
INSERT INTO `sys_relation` VALUES (1138325281044475906, 138, 5);
......@@ -420,141 +441,157 @@ INSERT INTO `sys_relation` VALUES (1138325281216442370, 172, 5);
INSERT INTO `sys_relation` VALUES (1138325281229025281, 145, 5);
INSERT INTO `sys_relation` VALUES (1138325281245802498, 1111545968697860098, 5);
INSERT INTO `sys_relation` VALUES (1138325281258385410, 1111546189892870145, 5);
INSERT INTO `sys_relation` VALUES (1142958067646771201, 105, 1);
INSERT INTO `sys_relation` VALUES (1142958067659354113, 106, 1);
INSERT INTO `sys_relation` VALUES (1142958067676131330, 107, 1);
INSERT INTO `sys_relation` VALUES (1142958067688714241, 108, 1);
INSERT INTO `sys_relation` VALUES (1142958067705491457, 109, 1);
INSERT INTO `sys_relation` VALUES (1142958067718074369, 110, 1);
INSERT INTO `sys_relation` VALUES (1142958067734851585, 111, 1);
INSERT INTO `sys_relation` VALUES (1142958067747434497, 112, 1);
INSERT INTO `sys_relation` VALUES (1142958067764211713, 113, 1);
INSERT INTO `sys_relation` VALUES (1142958067776794626, 165, 1);
INSERT INTO `sys_relation` VALUES (1142958067789377538, 166, 1);
INSERT INTO `sys_relation` VALUES (1142958067806154754, 167, 1);
INSERT INTO `sys_relation` VALUES (1142958067818737665, 114, 1);
INSERT INTO `sys_relation` VALUES (1142958067831320578, 115, 1);
INSERT INTO `sys_relation` VALUES (1142958067848097794, 116, 1);
INSERT INTO `sys_relation` VALUES (1142958067856486402, 117, 1);
INSERT INTO `sys_relation` VALUES (1142958067873263618, 118, 1);
INSERT INTO `sys_relation` VALUES (1142958067885846529, 162, 1);
INSERT INTO `sys_relation` VALUES (1142958067898429441, 163, 1);
INSERT INTO `sys_relation` VALUES (1142958067911012354, 164, 1);
INSERT INTO `sys_relation` VALUES (1142958067923595266, 119, 1);
INSERT INTO `sys_relation` VALUES (1142958067936178177, 120, 1);
INSERT INTO `sys_relation` VALUES (1142958067948761090, 121, 1);
INSERT INTO `sys_relation` VALUES (1142958067957149698, 122, 1);
INSERT INTO `sys_relation` VALUES (1142958067969732610, 150, 1);
INSERT INTO `sys_relation` VALUES (1142958067982315521, 151, 1);
INSERT INTO `sys_relation` VALUES (1142958067994898433, 128, 1);
INSERT INTO `sys_relation` VALUES (1142958068007481345, 134, 1);
INSERT INTO `sys_relation` VALUES (1142958068020064257, 158, 1);
INSERT INTO `sys_relation` VALUES (1142958068036841473, 159, 1);
INSERT INTO `sys_relation` VALUES (1142958068049424385, 130, 1);
INSERT INTO `sys_relation` VALUES (1142958068062007297, 131, 1);
INSERT INTO `sys_relation` VALUES (1142958068074590210, 135, 1);
INSERT INTO `sys_relation` VALUES (1142958068087173122, 136, 1);
INSERT INTO `sys_relation` VALUES (1142958068099756033, 137, 1);
INSERT INTO `sys_relation` VALUES (1142958068116533250, 152, 1);
INSERT INTO `sys_relation` VALUES (1142958068129116162, 153, 1);
INSERT INTO `sys_relation` VALUES (1142958068141699074, 154, 1);
INSERT INTO `sys_relation` VALUES (1142958068154281985, 132, 1);
INSERT INTO `sys_relation` VALUES (1142958068166864897, 138, 1);
INSERT INTO `sys_relation` VALUES (1142958068183642113, 139, 1);
INSERT INTO `sys_relation` VALUES (1142958068196225025, 140, 1);
INSERT INTO `sys_relation` VALUES (1142958068208807937, 155, 1);
INSERT INTO `sys_relation` VALUES (1142958068221390850, 156, 1);
INSERT INTO `sys_relation` VALUES (1142958068233973761, 157, 1);
INSERT INTO `sys_relation` VALUES (1142958068246556673, 133, 1);
INSERT INTO `sys_relation` VALUES (1142958068259139585, 160, 1);
INSERT INTO `sys_relation` VALUES (1142958068275916802, 161, 1);
INSERT INTO `sys_relation` VALUES (1142958068288499714, 141, 1);
INSERT INTO `sys_relation` VALUES (1142958068301082626, 142, 1);
INSERT INTO `sys_relation` VALUES (1142958068313665537, 143, 1);
INSERT INTO `sys_relation` VALUES (1142958068326248449, 144, 1);
INSERT INTO `sys_relation` VALUES (1142958068343025665, 171, 1);
INSERT INTO `sys_relation` VALUES (1142958068355608578, 149, 1);
INSERT INTO `sys_relation` VALUES (1142958068368191490, 1110777136265838594, 1);
INSERT INTO `sys_relation` VALUES (1142958068376580097, 1110777366856089602, 1);
INSERT INTO `sys_relation` VALUES (1142958068389163009, 1110777491464667137, 1);
INSERT INTO `sys_relation` VALUES (1142958068405940225, 1110787391943098370, 1);
INSERT INTO `sys_relation` VALUES (1142958068418523138, 1110839216310329346, 1);
INSERT INTO `sys_relation` VALUES (1142958068426911745, 1127085735660421122, 1);
INSERT INTO `sys_relation` VALUES (1142958068443688962, 1139826657964593154, 1);
INSERT INTO `sys_relation` VALUES (1142958068456271873, 1139827152854716418, 1);
INSERT INTO `sys_relation` VALUES (1142958068468854786, 1142957882422112257, 1);
INSERT INTO `sys_relation` VALUES (1142958068481437698, 1142957882422112258, 1);
INSERT INTO `sys_relation` VALUES (1142958068494020609, 1142957882422112259, 1);
INSERT INTO `sys_relation` VALUES (1142958068506603521, 1142957882426306562, 1);
INSERT INTO `sys_relation` VALUES (1142958068519186433, 172, 1);
INSERT INTO `sys_relation` VALUES (1142958068531769346, 145, 1);
INSERT INTO `sys_relation` VALUES (1142958068548546562, 1111545968697860098, 1);
INSERT INTO `sys_relation` VALUES (1142958068561129473, 1111546189892870145, 1);
INSERT INTO `sys_relation` VALUES (1144495297607614466, 105, 1);
INSERT INTO `sys_relation` VALUES (1144495297620197378, 106, 1);
INSERT INTO `sys_relation` VALUES (1144495297632780289, 107, 1);
INSERT INTO `sys_relation` VALUES (1144495297641168897, 108, 1);
INSERT INTO `sys_relation` VALUES (1144495297657946113, 109, 1);
INSERT INTO `sys_relation` VALUES (1144495297666334721, 110, 1);
INSERT INTO `sys_relation` VALUES (1144495297678917634, 111, 1);
INSERT INTO `sys_relation` VALUES (1144495297691500546, 112, 1);
INSERT INTO `sys_relation` VALUES (1144495297699889153, 113, 1);
INSERT INTO `sys_relation` VALUES (1144495297712472066, 165, 1);
INSERT INTO `sys_relation` VALUES (1144495297720860673, 166, 1);
INSERT INTO `sys_relation` VALUES (1144495297733443585, 167, 1);
INSERT INTO `sys_relation` VALUES (1144495297741832194, 114, 1);
INSERT INTO `sys_relation` VALUES (1144495297750220802, 115, 1);
INSERT INTO `sys_relation` VALUES (1144495297762803714, 116, 1);
INSERT INTO `sys_relation` VALUES (1144495297771192322, 117, 1);
INSERT INTO `sys_relation` VALUES (1144495297779580930, 118, 1);
INSERT INTO `sys_relation` VALUES (1144495297792163842, 162, 1);
INSERT INTO `sys_relation` VALUES (1144495297800552449, 163, 1);
INSERT INTO `sys_relation` VALUES (1144495297813135362, 164, 1);
INSERT INTO `sys_relation` VALUES (1144495297821523969, 119, 1);
INSERT INTO `sys_relation` VALUES (1144495297829912578, 120, 1);
INSERT INTO `sys_relation` VALUES (1144495297842495490, 121, 1);
INSERT INTO `sys_relation` VALUES (1144495297850884098, 122, 1);
INSERT INTO `sys_relation` VALUES (1144495297867661313, 150, 1);
INSERT INTO `sys_relation` VALUES (1144495297884438529, 151, 1);
INSERT INTO `sys_relation` VALUES (1144495297905410050, 128, 1);
INSERT INTO `sys_relation` VALUES (1144495297926381570, 134, 1);
INSERT INTO `sys_relation` VALUES (1144495297943158785, 158, 1);
INSERT INTO `sys_relation` VALUES (1144495297968324610, 159, 1);
INSERT INTO `sys_relation` VALUES (1144495297989296129, 130, 1);
INSERT INTO `sys_relation` VALUES (1144495298006073346, 131, 1);
INSERT INTO `sys_relation` VALUES (1144495298027044866, 135, 1);
INSERT INTO `sys_relation` VALUES (1144495298048016386, 136, 1);
INSERT INTO `sys_relation` VALUES (1144495298068987905, 137, 1);
INSERT INTO `sys_relation` VALUES (1144495298085765122, 152, 1);
INSERT INTO `sys_relation` VALUES (1144495298106736641, 153, 1);
INSERT INTO `sys_relation` VALUES (1144495298131902465, 154, 1);
INSERT INTO `sys_relation` VALUES (1144495298148679681, 132, 1);
INSERT INTO `sys_relation` VALUES (1144495298169651202, 138, 1);
INSERT INTO `sys_relation` VALUES (1144495298186428418, 139, 1);
INSERT INTO `sys_relation` VALUES (1144495298203205633, 140, 1);
INSERT INTO `sys_relation` VALUES (1144495298219982850, 155, 1);
INSERT INTO `sys_relation` VALUES (1144495298232565761, 156, 1);
INSERT INTO `sys_relation` VALUES (1144495298245148673, 157, 1);
INSERT INTO `sys_relation` VALUES (1144495298257731585, 133, 1);
INSERT INTO `sys_relation` VALUES (1144495298270314497, 160, 1);
INSERT INTO `sys_relation` VALUES (1144495298282897409, 161, 1);
INSERT INTO `sys_relation` VALUES (1144495298295480321, 141, 1);
INSERT INTO `sys_relation` VALUES (1144495298312257537, 142, 1);
INSERT INTO `sys_relation` VALUES (1144495298324840450, 143, 1);
INSERT INTO `sys_relation` VALUES (1144495298337423362, 144, 1);
INSERT INTO `sys_relation` VALUES (1144495298345811970, 1144441072852684801, 1);
INSERT INTO `sys_relation` VALUES (1144495298358394882, 1144441072852684802, 1);
INSERT INTO `sys_relation` VALUES (1144495298370977794, 1144441072852684803, 1);
INSERT INTO `sys_relation` VALUES (1144495298379366402, 1144441072852684804, 1);
INSERT INTO `sys_relation` VALUES (1144495298391949313, 171, 1);
INSERT INTO `sys_relation` VALUES (1144495298400337922, 149, 1);
INSERT INTO `sys_relation` VALUES (1144495298412920834, 1110777136265838594, 1);
INSERT INTO `sys_relation` VALUES (1144495298421309441, 1110777366856089602, 1);
INSERT INTO `sys_relation` VALUES (1144495298433892354, 1110777491464667137, 1);
INSERT INTO `sys_relation` VALUES (1144495298446475265, 1110787391943098370, 1);
INSERT INTO `sys_relation` VALUES (1144495298459058178, 1110839216310329346, 1);
INSERT INTO `sys_relation` VALUES (1144495298467446786, 1127085735660421122, 1);
INSERT INTO `sys_relation` VALUES (1144495298475835394, 1139826657964593154, 1);
INSERT INTO `sys_relation` VALUES (1144495298488418306, 1139827152854716418, 1);
INSERT INTO `sys_relation` VALUES (1144495298501001217, 1142957882422112257, 1);
INSERT INTO `sys_relation` VALUES (1144495298513584130, 1142957882422112258, 1);
INSERT INTO `sys_relation` VALUES (1144495298526167042, 1142957882422112259, 1);
INSERT INTO `sys_relation` VALUES (1144495298538749953, 1142957882426306562, 1);
INSERT INTO `sys_relation` VALUES (1144495298551332865, 172, 1);
INSERT INTO `sys_relation` VALUES (1144495298559721473, 145, 1);
INSERT INTO `sys_relation` VALUES (1144495298572304385, 1111545968697860098, 1);
INSERT INTO `sys_relation` VALUES (1144495298580692994, 1111546189892870145, 1);
COMMIT;
-- ----------------------------
-- Table structure for sys_role
-- ----------------------------
DROP TABLE IF EXISTS `sys_role`;
CREATE TABLE `sys_role` (
CREATE TABLE `sys_role` (
`role_id` bigint(20) NOT NULL COMMENT '主键id',
`pid` bigint(20) DEFAULT NULL COMMENT '父角色id',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '角色名称',
`description` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '提示',
`name` varchar(255) DEFAULT NULL COMMENT '角色名称',
`description` varchar(255) DEFAULT NULL COMMENT '提示',
`sort` int(11) DEFAULT NULL COMMENT '序号',
`version` int(11) DEFAULT NULL COMMENT '乐观锁',
`create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) DEFAULT NULL COMMENT '修改时间',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_time` datetime DEFAULT NULL COMMENT '修改时间',
`create_user` bigint(20) DEFAULT NULL COMMENT '创建用户',
`update_user` bigint(20) DEFAULT NULL COMMENT '修改用户',
PRIMARY KEY (`role_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '角色表' ROW_FORMAT = Dynamic;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='角色表';
-- ----------------------------
-- Records of sys_role
-- ----------------------------
BEGIN;
INSERT INTO `sys_role` VALUES (1, 0, '超级管理员', 'administrator', 1, 1, NULL, NULL, NULL, NULL);
INSERT INTO `sys_role` VALUES (5, 1, '第三方登录', 'oauth_role', 2, NULL, NULL, '2019-06-11 13:59:40', NULL, 1);
COMMIT;
-- ----------------------------
-- Table structure for sys_user
-- ----------------------------
DROP TABLE IF EXISTS `sys_user`;
CREATE TABLE `sys_user` (
CREATE TABLE `sys_user` (
`user_id` bigint(20) NOT NULL COMMENT '主键id',
`avatar` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '头像',
`account` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '账号',
`password` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '密码',
`salt` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT 'md5密码盐',
`name` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '名字',
`birthday` datetime(0) DEFAULT NULL COMMENT '生日',
`sex` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '性别(字典)',
`email` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '电子邮件',
`phone` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '电话',
`role_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '角色id(多个逗号隔开)',
`avatar` varchar(255) DEFAULT NULL COMMENT '头像',
`account` varchar(45) DEFAULT NULL COMMENT '账号',
`password` varchar(45) DEFAULT NULL COMMENT '密码',
`salt` varchar(45) DEFAULT NULL COMMENT 'md5密码盐',
`name` varchar(45) DEFAULT NULL COMMENT '名字',
`birthday` datetime DEFAULT NULL COMMENT '生日',
`sex` varchar(32) DEFAULT NULL COMMENT '性别(字典)',
`email` varchar(45) DEFAULT NULL COMMENT '电子邮件',
`phone` varchar(45) DEFAULT NULL COMMENT '电话',
`role_id` varchar(255) DEFAULT NULL COMMENT '角色id(多个逗号隔开)',
`dept_id` bigint(20) DEFAULT NULL COMMENT '部门id(多个逗号隔开)',
`status` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '状态(字典)',
`create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
`status` varchar(32) DEFAULT NULL COMMENT '状态(字典)',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`create_user` bigint(20) DEFAULT NULL COMMENT '创建人',
`update_time` datetime(0) DEFAULT NULL COMMENT '更新时间',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
`update_user` bigint(20) DEFAULT NULL COMMENT '更新人',
`version` int(11) DEFAULT NULL COMMENT '乐观锁',
PRIMARY KEY (`user_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '管理员表' ROW_FORMAT = Dynamic;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='管理员表';
-- ----------------------------
-- Records of sys_user
-- ----------------------------
INSERT INTO `sys_user` VALUES (1, '1124606971782160385', 'admin', '1d6b1208c7d151d335790276a18e3d99', 'q6taw', 'stylefeng', '2018-11-16 00:00:00', 'M', 'sn93@qq.com', '18200000000', '1', 27, 'ENABLE', '2016-01-29 08:49:53', NULL, '2019-05-04 17:29:31', 24, 25);
BEGIN;
INSERT INTO `sys_user` VALUES (1, '1124606971782160385', 'admin', '1d6b1208c7d151d335790276a18e3d99', 'q6taw', 'stylefeng', '2018-11-16 00:00:00', 'M', 'sn93@qq.com', '18200000000', '1', 25, 'ENABLE', '2016-01-29 08:49:53', NULL, '2019-06-28 14:38:19', 24, 25);
COMMIT;
-- ----------------------------
-- Table structure for sys_user_pos
-- ----------------------------
DROP TABLE IF EXISTS `sys_user_pos`;
CREATE TABLE `sys_user_pos` (
CREATE TABLE `sys_user_pos` (
`user_pos_id` bigint(20) NOT NULL COMMENT '主键id',
`user_id` bigint(20) NOT NULL COMMENT '用户id',
`pos_id` bigint(20) NOT NULL COMMENT '职位id',
PRIMARY KEY (`user_pos_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '用户职位关联表' ROW_FORMAT = Dynamic;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='用户职位关联表';
-- ----------------------------
-- Records of sys_user_pos
-- ----------------------------
BEGIN;
INSERT INTO `sys_user_pos` VALUES (1144495219551617025, 1, 1);
COMMIT;
SET FOREIGN_KEY_CHECKS = 1;
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/PositionController.java
......@@ -5,6 +5,7 @@ import cn.stylefeng.guns.base.pojo.page.LayuiPageInfo;
import cn.stylefeng.guns.sys.modular.system.entity.Position;
import cn.stylefeng.guns.sys.modular.system.model.params.PositionParam;
import cn.stylefeng.guns.sys.modular.system.service.PositionService;
import cn.stylefeng.guns.sys.modular.system.service.UserPosService;
import cn.stylefeng.roses.core.base.controller.BaseController;
import cn.stylefeng.roses.core.reqres.response.ResponseData;
import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
......@@ -32,6 +33,9 @@ public class PositionController extends BaseController {
@Autowired
private PositionService positionService;
@Autowired
private UserPosService userPosService;
/**
* 跳转到主页面
*
......@@ -163,6 +167,19 @@ public class PositionController extends BaseController {
return new SuccessResponseData();
}
/**
* 查询所有职位
*
* @author stylefeng
* @Date 2019-03-13
*/
@ResponseBody
@RequestMapping("/listPositions")
public LayuiPageInfo listlistPositionsTypes(@RequestParam(value = "userId", required = false) Long userId) {
return this.positionService.listPositions(userId);
}
}
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/entity/Position.java
......@@ -21,7 +21,7 @@ public class Position implements Serializable {
/**
* 主键id
*/
@TableId(value = "position_id", type = IdType.AUTO)
@TableId(value = "position_id", type = IdType.ID_WORKER)
private Long positionId;
/**
......
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/entity/UserPos.java 0 → 100755
package cn.stylefeng.guns.sys.modular.system.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
/**
* <p>
* 用户职位关联表
* </p>
*
* @author stylefeng
* @since 2019-06-28
*/
@TableName("sys_user_pos")
public class UserPos implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "user_pos_id", type = IdType.ID_WORKER)
private Long userPosId;
/**
* 用户id
*/
@TableField("user_id")
private Long userId;
/**
* 职位id
*/
@TableField("pos_id")
private Long posId;
public Long getUserPosId() {
return userPosId;
}
public void setUserPosId(Long userPosId) {
this.userPosId = userPosId;
}
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public Long getPosId() {
return posId;
}
public void setPosId(Long posId) {
this.posId = posId;
}
@Override
public String toString() {
return "UserPos{" +
"userPosId=" + userPosId +
", userId=" + userId +
", posId=" + posId +
"}";
}
}
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/mapper/UserPosMapper.java 0 → 100755
package cn.stylefeng.guns.sys.modular.system.mapper;
import cn.stylefeng.guns.sys.modular.system.entity.UserPos;
import cn.stylefeng.guns.sys.modular.system.model.params.UserPosParam;
import cn.stylefeng.guns.sys.modular.system.model.result.UserPosResult;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* <p>
* 用户职位关联表 Mapper 接口
* </p>
*
* @author stylefeng
* @since 2019-06-28
*/
public interface UserPosMapper extends BaseMapper<UserPos> {
/**
* 获取列表
*
* @author stylefeng
* @Date 2019-06-28
*/
List<UserPosResult> customList(@Param("paramCondition") UserPosParam paramCondition);
/**
* 获取map列表
*
* @author stylefeng
* @Date 2019-06-28
*/
List<Map<String, Object>> customMapList(@Param("paramCondition") UserPosParam paramCondition);
/**
* 获取分页实体列表
*
* @author stylefeng
* @Date 2019-06-28
*/
Page<UserPosResult> customPageList(@Param("page") Page page, @Param("paramCondition") UserPosParam paramCondition);
/**
* 获取分页map列表
*
* @author stylefeng
* @Date 2019-06-28
*/
Page<Map<String, Object>> customPageMapList(@Param("page") Page page, @Param("paramCondition") UserPosParam paramCondition);
}
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/mapper/mapping/UserPosMapper.xml 0 → 100755
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.stylefeng.guns.sys.modular.system.mapper.UserPosMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.sys.modular.system.entity.UserPos">
<id column="user_pos_id" property="userPosId" />
<result column="user_id" property="userId" />
<result column="pos_id" property="posId" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
user_pos_id AS "userPosId", user_id AS "userId", pos_id AS "posId"
</sql>
<select id="customList" resultType="cn.stylefeng.guns.sys.modular.system.model.result.UserPosResult" parameterType="cn.stylefeng.guns.sys.modular.system.model.params.UserPosParam">
select
<include refid="Base_Column_List"/>
from sys_user_pos where 1 = 1
</select>
<select id="customMapList" resultType="map" parameterType="cn.stylefeng.guns.sys.modular.system.model.params.UserPosParam">
select
<include refid="Base_Column_List"/>
from sys_user_pos where 1 = 1
</select>
<select id="customPageList" resultType="cn.stylefeng.guns.sys.modular.system.model.result.UserPosResult" parameterType="cn.stylefeng.guns.sys.modular.system.model.params.UserPosParam">
select
<include refid="Base_Column_List"/>
from sys_user_pos where 1 = 1
</select>
<select id="customPageMapList" resultType="map" parameterType="cn.stylefeng.guns.sys.modular.system.model.params.UserPosParam">
select
<include refid="Base_Column_List"/>
from sys_user_pos where 1 = 1
</select>
</mapper>
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/model/UserDto.java
......@@ -44,4 +44,6 @@ public class UserDto {
private String status;
private String avatar;
private String position;
}
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/model/params/UserPosParam.java 0 → 100755
package cn.stylefeng.guns.sys.modular.system.model.params;
import cn.stylefeng.roses.kernel.model.validator.BaseValidatingParam;
import lombok.Data;
import java.io.Serializable;
/**
* <p>
* 用户职位关联表
* </p>
*
* @author stylefeng
* @since 2019-06-28
*/
@Data
public class UserPosParam implements Serializable, BaseValidatingParam {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
private Long userPosId;
/**
* 用户id
*/
private Long userId;
/**
* 职位id
*/
private Long posId;
@Override
public String checkParam() {
return null;
}
}
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/model/result/UserPosResult.java 0 → 100755
package cn.stylefeng.guns.sys.modular.system.model.result;
import lombok.Data;
import java.io.Serializable;
/**
* <p>
* 用户职位关联表
* </p>
*
* @author stylefeng
* @since 2019-06-28
*/
@Data
public class UserPosResult implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
private Long userPosId;
/**
* 用户id
*/
private Long userId;
/**
* 职位id
*/
private Long posId;
}
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/service/PositionService.java
......@@ -66,4 +66,12 @@ public interface PositionService extends IService<Position> {
*/
LayuiPageInfo findPageBySpec(PositionParam param);
/**
* 获取多选框的职位列表
*
* @author stylefeng
* @Date 2019-06-27
*/
LayuiPageInfo listPositions(Long userId);
}
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/service/UserPosService.java 0 → 100755
package cn.stylefeng.guns.sys.modular.system.service;
import cn.stylefeng.guns.base.pojo.page.LayuiPageInfo;
import cn.stylefeng.guns.sys.modular.system.entity.UserPos;
import cn.stylefeng.guns.sys.modular.system.model.params.UserPosParam;
import cn.stylefeng.guns.sys.modular.system.model.result.UserPosResult;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 用户职位关联表 服务类
* </p>
*
* @author stylefeng
* @since 2019-06-28
*/
public interface UserPosService extends IService<UserPos> {
/**
* 新增
*
* @author stylefeng
* @Date 2019-06-28
*/
void add(UserPosParam param);
/**
* 删除
*
* @author stylefeng
* @Date 2019-06-28
*/
void delete(UserPosParam param);
/**
* 更新
*
* @author stylefeng
* @Date 2019-06-28
*/
void update(UserPosParam param);
/**
* 查询单条数据，Specification模式
*
* @author stylefeng
* @Date 2019-06-28
*/
UserPosResult findBySpec(UserPosParam param);
/**
* 查询列表，Specification模式
*
* @author stylefeng
* @Date 2019-06-28
*/
List<UserPosResult> findListBySpec(UserPosParam param);
/**
* 查询分页数据，Specification模式
*
* @author stylefeng
* @Date 2019-06-28
*/
LayuiPageInfo findPageBySpec(UserPosParam param);
}
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/service/UserService.java
......@@ -12,11 +12,14 @@ import cn.stylefeng.guns.sys.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.sys.core.shiro.ShiroKit;
import cn.stylefeng.guns.sys.core.shiro.service.UserAuthService;
import cn.stylefeng.guns.sys.modular.system.entity.User;
import cn.stylefeng.guns.sys.modular.system.entity.UserPos;
import cn.stylefeng.guns.sys.modular.system.factory.UserFactory;
import cn.stylefeng.guns.sys.modular.system.mapper.UserMapper;
import cn.stylefeng.guns.sys.modular.system.model.UserDto;
import cn.stylefeng.roses.core.datascope.DataScope;
import cn.stylefeng.roses.core.util.ToolUtil;
import cn.stylefeng.roses.kernel.model.exception.ServiceException;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
......@@ -46,12 +49,16 @@ public class UserService extends ServiceImpl<UserMapper, User> {
@Autowired
private UserAuthService userAuthService;
@Autowired
private UserPosService userPosService;
/**
* 添加用戶
*
* @author fengshuonan
* @Date 2018/12/24 22:51
*/
@Transactional(rollbackFor = Exception.class)
public void addUser(UserDto user) {
// 判断账号是否重复
......@@ -64,7 +71,11 @@ public class UserService extends ServiceImpl<UserMapper, User> {
String salt = ShiroKit.getRandomSalt(5);
String password = ShiroKit.md5(user.getPassword(), salt);
this.save(UserFactory.createUser(user, password, salt));
User newUser = UserFactory.createUser(user, password, salt);
this.save(newUser);
//添加职位关联
addPosition(user.getPosition(), newUser.getUserId());
}
/**
......@@ -73,6 +84,7 @@ public class UserService extends ServiceImpl<UserMapper, User> {
* @author fengshuonan
* @Date 2018/12/24 22:53
*/
@Transactional(rollbackFor = Exception.class)
public void editUser(UserDto user) {
User oldUser = this.getById(user.getUserId());
......@@ -87,6 +99,12 @@ public class UserService extends ServiceImpl<UserMapper, User> {
throw new ServiceException(BizExceptionEnum.NO_PERMITION);
}
}
//删除职位关联
userPosService.remove(new QueryWrapper<UserPos>().eq("user_id", user.getUserId()));
//添加职位关联
addPosition(user.getPosition(), user.getUserId());
}
/**
......@@ -107,6 +125,9 @@ public class UserService extends ServiceImpl<UserMapper, User> {
//删除对应的oauth2绑定表
SqlRunner.db().delete("delete from oauth_user_info where user_id = {0}", userId);
//删除职位关联
userPosService.remove(new QueryWrapper<UserPos>().eq("user_id", userId));
}
/**
......@@ -241,4 +262,25 @@ public class UserService extends ServiceImpl<UserMapper, User> {
return map;
}
/**
* 添加职位关联
*
* @author fengshuonan
* @Date 2019-06-28 13:35
*/
private void addPosition(String positions, Long userId) {
if (ToolUtil.isNotEmpty(positions)) {
String[] position = positions.split(",");
for (String item : position) {
UserPos entity = new UserPos();
entity.setUserId(userId);
entity.setPosId(Long.valueOf(item));
userPosService.save(entity);
}
}
}
}
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/service/impl/PositionServiceImpl.java
......@@ -3,18 +3,23 @@ package cn.stylefeng.guns.sys.modular.system.service.impl;
import cn.stylefeng.guns.base.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.base.pojo.page.LayuiPageInfo;
import cn.stylefeng.guns.sys.modular.system.entity.Position;
import cn.stylefeng.guns.sys.modular.system.entity.UserPos;
import cn.stylefeng.guns.sys.modular.system.mapper.PositionMapper;
import cn.stylefeng.guns.sys.modular.system.model.params.PositionParam;
import cn.stylefeng.guns.sys.modular.system.model.result.PositionResult;
import cn.stylefeng.guns.sys.modular.system.service.PositionService;
import cn.stylefeng.guns.sys.modular.system.service.UserPosService;
import cn.stylefeng.roses.core.util.ToolUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* <p>
......@@ -27,19 +32,22 @@ import java.util.List;
@Service
public class PositionServiceImpl extends ServiceImpl<PositionMapper, Position> implements PositionService {
@Autowired
private UserPosService userPosService;
@Override
public void add(PositionParam param){
public void add(PositionParam param) {
Position entity = getEntity(param);
this.save(entity);
}
@Override
public void delete(PositionParam param){
public void delete(PositionParam param) {
this.removeById(getKey(param));
}
@Override
public void update(PositionParam param){
public void update(PositionParam param) {
Position oldEntity = getOldEntity(param);
Position newEntity = getEntity(param);
ToolUtil.copyProperties(newEntity, oldEntity);
......@@ -47,23 +55,56 @@ public class PositionServiceImpl extends ServiceImpl<PositionMapper, Position> i
}
@Override
public PositionResult findBySpec(PositionParam param){
public PositionResult findBySpec(PositionParam param) {
return null;
}
@Override
public List<PositionResult> findListBySpec(PositionParam param){
public List<PositionResult> findListBySpec(PositionParam param) {
return null;
}
@Override
public LayuiPageInfo findPageBySpec(PositionParam param){
public LayuiPageInfo findPageBySpec(PositionParam param) {
Page pageContext = getPageContext();
IPage page = this.baseMapper.customPageList(pageContext, param);
return LayuiPageFactory.createPageInfo(page);
}
private Serializable getKey(PositionParam param){
@Override
public LayuiPageInfo listPositions(Long userId) {
//找出所有职位
QueryWrapper<Position> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.select("position_id", "name");
List<Map<String, Object>> list = this.listMaps(objectQueryWrapper);
//用户id为空，则直接返回
if (userId == null) {
} else {
//查询用户的职位id列表
List<UserPos> userPosList = this.userPosService.list(new QueryWrapper<UserPos>().eq("user_id", userId));
if (userPosList != null && userPosList.size() > 0) {
for (UserPos userPos : userPosList) {
for (Map<String, Object> positionMap : list) {
if (userPos.getPosId().equals(positionMap.get("position_id"))) {
positionMap.put("selected", true);
}
}
}
}
}
LayuiPageInfo layuiPageInfo = new LayuiPageInfo();
layuiPageInfo.setData(list);
return layuiPageInfo;
}
private Serializable getKey(PositionParam param) {
return param.getPositionId();
}
......
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/service/impl/UserPosServiceImpl.java 0 → 100755
package cn.stylefeng.guns.sys.modular.system.service.impl;
import cn.stylefeng.guns.base.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.base.pojo.page.LayuiPageInfo;
import cn.stylefeng.guns.sys.modular.system.entity.UserPos;
import cn.stylefeng.guns.sys.modular.system.mapper.UserPosMapper;
import cn.stylefeng.guns.sys.modular.system.model.params.UserPosParam;
import cn.stylefeng.guns.sys.modular.system.model.result.UserPosResult;
import cn.stylefeng.guns.sys.modular.system.service.UserPosService;
import cn.stylefeng.roses.core.util.ToolUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import java.io.Serializable;
import java.util.List;
/**
* <p>
* 用户职位关联表 服务实现类
* </p>
*
* @author stylefeng
* @since 2019-06-28
*/
@Service
public class UserPosServiceImpl extends ServiceImpl<UserPosMapper, UserPos> implements UserPosService {
@Override
public void add(UserPosParam param){
UserPos entity = getEntity(param);
this.save(entity);
}
@Override
public void delete(UserPosParam param){
this.removeById(getKey(param));
}
@Override
public void update(UserPosParam param){
UserPos oldEntity = getOldEntity(param);
UserPos newEntity = getEntity(param);
ToolUtil.copyProperties(newEntity, oldEntity);
this.updateById(newEntity);
}
@Override
public UserPosResult findBySpec(UserPosParam param){
return null;
}
@Override
public List<UserPosResult> findListBySpec(UserPosParam param){
return null;
}
@Override
public LayuiPageInfo findPageBySpec(UserPosParam param){
Page pageContext = getPageContext();
IPage page = this.baseMapper.customPageList(pageContext, param);
return LayuiPageFactory.createPageInfo(page);
}
private Serializable getKey(UserPosParam param){
return param.getUserPosId();
}
private Page getPageContext() {
return LayuiPageFactory.defaultPage();
}
private UserPos getOldEntity(UserPosParam param) {
return this.getById(getKey(param));
}
private UserPos getEntity(UserPosParam param) {
UserPos entity = new UserPos();
ToolUtil.copyProperties(param, entity);
return entity;
}
}
guns-sys/src/main/webapp/assets/modular/system/user/user_add.js
......@@ -8,13 +8,14 @@ var UserInfoDlg = {
}
};
layui.use(['layer', 'form', 'admin', 'laydate', 'ax'], function () {
layui.use(['layer', 'form', 'admin', 'laydate', 'ax', 'formSelects'], function () {
var $ = layui.jquery;
var $ax = layui.ax;
var form = layui.form;
var admin = layui.admin;
var laydate = layui.laydate;
var layer = layui.layer;
var formSelects = layui.formSelects;
// 让当前iframe弹层高度适应
admin.iframeAuto();
......@@ -73,4 +74,11 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'ax'], function () {
$("#backupPage").click(function () {
window.location.href = Feng.ctxPath + "/mgr";
});
//初始化所有的职位列表
formSelects.config('selPosition', {
searchUrl: Feng.ctxPath + "/position/listPositions",
keyName: 'name',
keyVal: 'position_id'
});
});
\ No newline at end of file
guns-sys/src/main/webapp/assets/modular/system/user/user_edit.js
......@@ -8,13 +8,14 @@ var UserInfoDlg = {
}
};
layui.use(['layer', 'form', 'admin', 'laydate', 'ax'], function () {
layui.use(['layer', 'form', 'admin', 'laydate', 'ax', 'formSelects'], function () {
var $ = layui.jquery;
var $ax = layui.ax;
var form = layui.form;
var admin = layui.admin;
var laydate = layui.laydate;
var layer = layui.layer;
var formSelects = layui.formSelects;
// 让当前iframe弹层高度适应
admin.iframeAuto();
......@@ -79,4 +80,11 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'ax'], function () {
$("#backupPage").click(function () {
window.location.href = Feng.ctxPath + "/mgr";
});
//初始化所有的职位列表
formSelects.config('selPosition', {
searchUrl: Feng.ctxPath + "/position/listPositions?userId=" + $("#userId").val(),
keyName: 'name',
keyVal: 'position_id'
});
});
\ No newline at end of file
guns-sys/src/main/webapp/pages/modular/system/user/user_add.html
@layout("/common/_container.html",{js:["/assets/modular/system/user/user_add.js"]}){
@layout("/common/_container.html",{js:["/assets/modular/system/user/user_add.js"],css:["/assets/common/module/formSelects/formSelects-v4.css"]}){
<div class="layui-body-header">
<span class="layui-body-header-title">用户管理-添加</span>
</div>
......@@ -29,19 +29,19 @@
<div class="layui-form-item">
<label class="layui-form-label">密码<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input name="password" placeholder="请输入密码" type="password" class="layui-input" lay-verify="required|psw" required/>
<input name="password" placeholder="请输入密码" type="password" class="layui-input" lay-verify="required|psw" autocomplete="new-password" required/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">重复密码<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input name="rePassword" placeholder="请输入重复密码" type="password" class="layui-input" lay-verify="required|repsw" required/>
<input name="rePassword" placeholder="请输入重复密码" type="password" class="layui-input" autocomplete="new-password" lay-verify="required|repsw" required/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">邮箱<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input name="email" placeholder="请输入邮箱" type="text" class="layui-input" lay-verify="required|email" required/>
<input name="email" placeholder="请输入邮箱" type="text" class="layui-input" lay-verify="required|email" autocomplete="off" required/>
</div>
</div>
<div class="layui-form-item">
......@@ -59,6 +59,14 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">职位<span style="color: red;">*</span></label>
<div class="layui-input-block">
<select name="position" xm-select="selPosition">
<option value="">请选择职位</option>
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">电话</label>
<div class="layui-input-block">
<input name="phone" placeholder="请输入电话" type="text" class="layui-input"/>
......
guns-sys/src/main/webapp/pages/modular/system/user/user_edit.html
@layout("/common/_container.html",{js:["/assets/modular/system/user/user_edit.js"]}){
@layout("/common/_container.html",{js:["/assets/modular/system/user/user_edit.js"],css:["/assets/common/module/formSelects/formSelects-v4.css"]}){
<div class="layui-body-header">
<span class="layui-body-header-title">用户管理-修改</span>
</div>
......@@ -7,7 +7,7 @@
<div class="layui-card">
<div class="layui-card-body">
<form id="userForm" lay-filter="userForm" class="layui-form model-form" style="max-width: 700px;margin: 40px auto;">
<input name="userId" type="hidden"/>
<input id="userId" name="userId" type="hidden"/>
<input name="account" type="hidden"/>
<div class="layui-form-item">
<label class="layui-form-label">姓名<span style="color: red;">*</span></label>
......@@ -42,6 +42,13 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">职位<span style="color: red;">*</span></label>
<div class="layui-input-block">
<select name="position" id="position" xm-select="selPosition" lay-verify="required" required>
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">电话</label>
<div class="layui-input-block">
<input name="phone" placeholder="请输入电话" type="text" class="layui-input"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment