Browse Source

Merge branch 'develop-v3.0.0' of http://39.106.8.246:3003/FM-dev/fm-cloud into develop-v3.0.0

lixing 4 years ago
parent
commit
1973b26c60

+ 5 - 1
fm-person/src/main/resources/bootstrap.yml

@@ -38,7 +38,11 @@ spring:
           url: jdbc:mysql://192.168.64.15:9934/${spring.application.name}?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
           url: jdbc:mysql://192.168.64.15:9934/${spring.application.name}?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
           username: root
           username: root
           password: brzj123456
           password: brzj123456
-          driver-class-name: com.mysql.jdbc.Driver
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          schema: classpath*:db/init/table.sql
+          data: classpath*:db/init/data.sql
+          continue-on-error: true
+          separator: ";"
           druid: # 以下是独立参数,每个库可以重新设置
           druid: # 以下是独立参数,每个库可以重新设置
             initial-size:
             initial-size:
             validation-query: select 1 FROM DUAL #比如oracle就需要重新设置这个
             validation-query: select 1 FROM DUAL #比如oracle就需要重新设置这个

+ 56 - 0
fm-person/src/main/resources/db/init/data.sql

@@ -0,0 +1,56 @@
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 标准产品-config
+Source Server Version : 50730
+Source Host           : 192.168.64.15:9934
+Source Database       : fm-person
+
+Target Server Type    : MYSQL
+Target Server Version : 50730
+File Encoding         : 65001
+
+Date: 2021-03-30 09:55:01
+*/
+-- ----------------------------
+-- Records of department
+-- ----------------------------
+INSERT INTO `department` VALUES ('1372751438137982978', '部门2', '0', '0', '0', '1374611634976149506', '部门2', '0', null, null, '1', '2021-03-19 11:27:02', '1', '2021-03-24 14:41:51', '1');
+INSERT INTO `department` VALUES ('1372751497730654210', '部门2_1', '1', '1372751438137982978', '0', null, '部门2-部门2_1', '0', null, null, '1', '2021-03-19 11:27:16', '1', '2021-03-24 14:41:51', '1');
+INSERT INTO `department` VALUES ('1372751527287914498', '部门2_1.1', '1', '1372751497730654210', '0', null, '部门2-部门2_1-部门2_1.1', '0', null, null, '1', '2021-03-19 11:27:23', '1', '2021-03-24 14:41:51', '1');
+INSERT INTO `department` VALUES ('1375280091291934722', '部门2_2', '1', '1372751438137982978', '0', null, '部门2-部门2_2', '0', null, null, 'AC1372371635352403969', '2021-03-26 10:55:00', null, '2021-03-26 10:55:00', '1');
+INSERT INTO `department` VALUES ('1375280134614900737', '部门2_2.1', '1', '1375280091291934722', '0', null, '部门2-部门2_2-部门2_2.1', '0', null, null, 'AC1372371635352403969', '2021-03-26 10:55:10', null, '2021-03-26 10:55:10', '1');
+INSERT INTO `department` VALUES ('1375280151765409794', '部门2_2.2', '1', '1375280091291934722', '0', null, '部门2-部门2_2-部门2_2.2', '0', null, null, 'AC1372371635352403969', '2021-03-26 10:55:14', null, '2021-03-26 10:55:14', '1');
+INSERT INTO `department` VALUES ('1375280193490345985', '部门2_2.2.1', '1', '1375280151765409794', '0', null, '部门2-部门2_2-部门2_2.2-部门2_2.2.1', '0', null, null, 'AC1372371635352403969', '2021-03-26 10:55:24', null, '2021-03-26 10:55:24', '1');
+INSERT INTO `department` VALUES ('1375280212515708930', '部门2_2.2.2', '1', '1375280151765409794', '0', null, '部门2-部门2_2-部门2_2.2-部门2_2.2.2', '0', null, null, 'AC1372371635352403969', '2021-03-26 10:55:29', null, '2021-03-26 10:55:29', '1');
+
+-- ----------------------------
+-- Records of person
+-- ----------------------------
+INSERT INTO `person` VALUES ('1374611634976149506', '人员a', 'renyuana', 'account1', null, null, null, null, null, null, null, null, null, null, null, null, '2021-03-24 14:38:47', '1', null, '2021-03-24 14:38:47', '1');
+
+-- ----------------------------
+-- Records of profession
+-- ----------------------------
+INSERT INTO `profession` VALUES ('1372835761096679425', '强电', '0', null, '1', '2021-03-19 17:02:06', null, '2021-03-19 17:02:06', '1');
+INSERT INTO `profession` VALUES ('1372835809620582402', '暖通', '0', null, '1', '2021-03-19 17:02:18', null, '2021-03-19 17:02:18', '1');
+INSERT INTO `profession` VALUES ('1372835835038064642', '弱电', '0', null, '1', '2021-03-19 17:02:24', null, '2021-03-19 17:02:24', '1');
+INSERT INTO `profession` VALUES ('1372835863060209665', '综合', '0', null, '1', '2021-03-19 17:02:30', null, '2021-03-19 17:02:30', '1');
+INSERT INTO `profession` VALUES ('1372835888351862786', '保安', '0', null, '1', '2021-03-19 17:02:36', null, '2021-03-19 17:02:36', '1');
+INSERT INTO `profession` VALUES ('1372835910363570178', '保洁', '0', null, '1', '2021-03-19 17:02:42', null, '2021-03-19 17:02:42', '1');
+ ----------------------------
+-- Records of work_resume
+-- ----------------------------
+INSERT INTO `work_resume` VALUES ('1374611635504631809', '1374611634976149506', '1372751438137982978', '0', '2021-03-24 14:38:48', null, null, null, '1', '2021-03-24 14:38:48', null, '2021-03-24 14:38:48', '1');
+INSERT INTO `work_resume` VALUES ('1374650120881999873', '1374650120391266305', '1372751438137982978', '0', '2021-03-24 17:11:43', null, null, null, '1', '2021-03-24 17:11:43', null, '2021-03-24 17:11:43', '1');
+INSERT INTO `work_resume` VALUES ('1374650644486328321', '1374650644431802369', '1372751438137982978', '0', '2021-03-24 17:13:48', null, null, null, '1', '2021-03-24 17:13:48', null, '2021-03-24 17:13:48', '1');
+INSERT INTO `work_resume` VALUES ('1374650976788451329', '1374650976478072833', '1372751438137982978', '0', '2021-03-24 17:15:07', null, null, null, '1', '2021-03-24 17:15:07', null, '2021-03-24 17:15:07', '1');
+INSERT INTO `work_resume` VALUES ('1374651167553785857', '1374651167503454210', '1372751438137982978', '0', '2021-03-24 17:15:53', null, null, null, '1', '2021-03-24 17:15:53', null, '2021-03-24 17:15:53', '1');
+INSERT INTO `work_resume` VALUES ('1374658317776756737', '1374658317093085186', '1372751438137982978', '0', '2021-03-24 17:44:18', null, null, null, '1', '2021-03-24 17:44:18', null, '2021-03-24 17:44:18', '1');
+INSERT INTO `work_resume` VALUES ('1374661787598626817', '1374661787523129346', '1372751438137982978', '0', '2021-03-24 17:58:05', null, null, null, '1', '2021-03-24 17:58:05', null, '2021-03-24 17:58:05', '1');
+INSERT INTO `work_resume` VALUES ('1374663554826670081', '1374663554239467522', '1372751438137982978', '0', '2021-03-24 18:05:06', null, null, null, '1', '2021-03-24 18:05:06', null, '2021-03-24 18:05:06', '1');
+INSERT INTO `work_resume` VALUES ('1374664666476683266', '1374664665981755393', '1372751438137982978', '0', '2021-03-24 18:09:31', null, null, null, '1', '2021-03-24 18:09:31', null, '2021-03-24 18:09:31', '1');
+INSERT INTO `work_resume` VALUES ('1374671336204316674', '1374671335839412225', '1372751438137982978', '0', '2021-03-24 18:36:01', null, null, null, '1', '2021-03-24 18:36:01', null, '2021-03-24 18:36:01', '1');
+INSERT INTO `work_resume` VALUES ('1374672209361920002', '1374672208929906689', '1372751438137982978', '0', '2021-03-24 18:39:30', null, null, null, '1', '2021-03-24 18:39:30', null, '2021-03-24 18:39:30', '1');
+INSERT INTO `work_resume` VALUES ('1374673094087524354', '1374673093638733826', '1372751438137982978', '0', '2021-03-24 18:43:00', null, null, null, '1', '2021-03-24 18:43:00', null, '2021-03-24 18:43:00', '1');
+INSERT INTO `work_resume` VALUES ('1374676187260792833', '1374676166096334850', '1372751438137982978', '0', '2021-03-24 18:55:18', null, null, null, '1', '2021-03-24 18:55:18', null, '2021-03-24 18:55:18', '1');

+ 119 - 0
fm-person/src/main/resources/db/init/table.sql

@@ -0,0 +1,119 @@
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 标准产品-config
+Source Server Version : 50730
+Source Host           : 192.168.64.15:9934
+Source Database       : fm-person
+
+Target Server Type    : MYSQL
+Target Server Version : 50730
+File Encoding         : 65001
+
+Date: 2021-03-30 09:55:01
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for department
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `department` (
+  `id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'id',
+  `name` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '部门名称',
+  `type` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '部门类型',
+  `parent_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0' COMMENT '上级部门id',
+  `resource_from` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0' COMMENT '数据来源',
+  `managers` text COLLATE utf8mb4_unicode_ci COMMENT '负责人',
+  `full_path` text COLLATE utf8mb4_unicode_ci COMMENT '部门全路径',
+  `staff_count` int(11) NOT NULL DEFAULT '0' COMMENT '编制人数',
+  `project_ids` json DEFAULT NULL COMMENT '关联的项目',
+  `ts` timestamp NULL DEFAULT NULL COMMENT '乐观锁',
+  `creator` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人',
+  `creation_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
+  `modifier` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '最后修改人',
+  `modified_time` datetime DEFAULT NULL COMMENT '最后修改时间',
+  `valid` int(11) DEFAULT NULL COMMENT '合法标识',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='部门';
+
+-- ----------------------------
+-- Table structure for dep_project
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `dep_project` (
+  `id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '主键',
+  `dep_id` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '部门id',
+  `project_id` varchar(80) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '项目id',
+  `ts` timestamp NULL DEFAULT NULL COMMENT '乐观锁',
+  `creator` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人',
+  `creation_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
+  `modifier` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '最后修改人',
+  `modified_time` datetime DEFAULT NULL COMMENT '最后修改时间',
+  `valid` int(11) DEFAULT NULL COMMENT '合法标识',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='部门项目';
+
+-- ----------------------------
+-- Records of dep_project
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for person
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `person` (
+  `id` varchar(64) NOT NULL DEFAULT '' COMMENT 'id',
+  `name` varchar(80) DEFAULT NULL COMMENT '姓名',
+  `name_pinyin` varchar(200) DEFAULT NULL COMMENT '姓名拼音',
+  `username` varchar(80) DEFAULT NULL COMMENT '账号',
+  `account_id` varchar(80) DEFAULT NULL COMMENT '账号id',
+  `id_number` varchar(80) DEFAULT NULL COMMENT '证件号码',
+  `certificate_type` varchar(10) DEFAULT NULL COMMENT '证件类型',
+  `gender` int(11) DEFAULT NULL COMMENT '性别',
+  `birthday` timestamp NULL DEFAULT NULL COMMENT '生日',
+  `job_number` varchar(80) DEFAULT NULL COMMENT '工号',
+  `person_type` varchar(10) DEFAULT NULL COMMENT '员工类型',
+  `user_from` varchar(80) DEFAULT NULL COMMENT '账号来源',
+  `leader` bigint(20) DEFAULT NULL COMMENT '直接领导',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  `profession` text COMMENT '专业',
+  `ts` timestamp NULL DEFAULT NULL COMMENT '乐观锁',
+  `creation_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
+  `creator` varchar(80) DEFAULT NULL COMMENT '创建用户',
+  `modifier` varchar(80) DEFAULT NULL COMMENT '更新用户',
+  `modified_time` timestamp NULL DEFAULT NULL COMMENT '更新时间',
+  `valid` int(11) DEFAULT NULL COMMENT '合法标识',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='人员';
+
+-- ----------------------------
+-- Table structure for profession
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `profession` (
+  `id` varchar(64) NOT NULL DEFAULT '' COMMENT '主键',
+  `name` varchar(20) NOT NULL DEFAULT '' COMMENT '专业名称',
+  `editable` char(11) NOT NULL DEFAULT '' COMMENT '是否可编辑',
+  `ts` timestamp NULL DEFAULT NULL COMMENT '乐观锁',
+  `creator` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人',
+  `creation_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
+  `modifier` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '最后修改人',
+  `modified_time` datetime DEFAULT NULL COMMENT '最后修改时间',
+  `valid` int(11) DEFAULT NULL COMMENT '合法标识',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='专业';
+
+CREATE TABLE IF NOT EXISTS `work_resume` (
+  `id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'id',
+  `person_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '人员主键',
+  `dep_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '部门主键',
+  `state` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0' COMMENT '状态',
+  `hired_date` timestamp NULL DEFAULT NULL COMMENT '入职时间',
+  `departure_date` timestamp NULL DEFAULT NULL COMMENT '离职时间',
+  `is_leader` varchar(10) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '是否是部门主管',
+  `ts` timestamp NULL DEFAULT NULL COMMENT '乐观锁',
+  `creator` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人',
+  `creation_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
+  `modifier` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '最后修改人',
+  `modified_time` datetime DEFAULT NULL COMMENT '最后修改时间',
+  `valid` int(11) DEFAULT NULL COMMENT '合法标识',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='工作信息';