Merge remote-tracking branch 'origin/master'

sql/archives_save.sql

@@ -1,133 +1,32 @@
 /*
-Navicat MariaDB Data Transfer
+Navicat MySQL Data Transfer
 
-Source Server         : archives
+Source Server         : mysql
 Source Server Version : 100032
 Source Host           : 192.168.1.124:3307
 Source Database       : archives_save
 
-Target Server Type    : MariaDB
+Target Server Type    : MYSQL
 Target Server Version : 100032
 File Encoding         : 65001
 
-Date: 2018-02-02 16:29:53
+Date: 2018-02-05 11:33:54
 */
 
 SET FOREIGN_KEY_CHECKS=0;
 
--- ----------------------------
--- Table structure for save _ Migration
--- ----------------------------
-DROP TABLE IF EXISTS `save _ Migration`;
-CREATE TABLE `save _ Migration` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '部门用户主键ID',
-  `dept_id` varchar(20) DEFAULT NULL COMMENT '部门ID',
-  `user_id` varchar(20) DEFAULT NULL COMMENT '用户ID',
-  `enable` tinyint(1) NOT NULL DEFAULT '1' COMMENT '启用状态',
-  `remark` varchar(1024) DEFAULT NULL,
-  `create_time` datetime DEFAULT NULL,
-  `create_by` bigint(20) DEFAULT NULL,
-  `update_time` datetime DEFAULT NULL,
-  `update_by` bigint(20) DEFAULT NULL,
-  `medium_num` varchar(20) DEFAULT NULL COMMENT '光盘号',
-  `data_format` varchar(20) DEFAULT NULL COMMENT '数据格式',
-  `data_size` varchar(20) DEFAULT NULL COMMENT '数据大小',
-  `Migration_ reason` varchar(50) DEFAULT NULL COMMENT '迁移原因',
-  `reviewer` varchar(10) DEFAULT NULL COMMENT '审批人',
-  `new_medium` varchar(10) DEFAULT NULL COMMENT '新载体',
-  `new_medium_num` varchar(20) DEFAULT NULL COMMENT '新载体编号',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='迁移表';
-
--- ----------------------------
--- Table structure for save _ sampling
--- ----------------------------
-DROP TABLE IF EXISTS `save _ sampling`;
-CREATE TABLE `save _ sampling` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '部门用户主键ID',
-  `dept_id` varchar(20) DEFAULT NULL COMMENT '部门ID',
-  `user_id` varchar(20) DEFAULT NULL COMMENT '用户ID',
-  `enable` tinyint(1) NOT NULL DEFAULT '1' COMMENT '启用状态',
-  `remark` varchar(1024) DEFAULT NULL,
-  `create_time` datetime DEFAULT NULL,
-  `create_by` bigint(20) DEFAULT NULL,
-  `update_time` datetime DEFAULT NULL,
-  `update_by` bigint(20) DEFAULT NULL,
-  `medium_num` varchar(20) DEFAULT NULL COMMENT '光盘号',
-  `bler` varchar(10) DEFAULT NULL COMMENT '块错误率  CD-R光盘的块错误率是指每秒测得的错误块数量，CD-R光盘技术规范规定：BLER＜220数据块／秒',
-  `e32` varchar(10) DEFAULT NULL COMMENT '不可校正错误  读CD-R光盘时不能被解码器校正的错误的总数称为E32，CD-R光盘技术规范规定：E32 = 0',
-  `sym` varchar(10) DEFAULT NULL,
-  `jitter` varchar(10) DEFAULT NULL,
-  `pie` varchar(10) DEFAULT NULL COMMENT '奇偶校验内码错误  PI 与PO分别是ECC（错误校正编码）块中的奇偶校验内码和外码，DVD 光盘用PI 与PO 校验中发现错误的次数与程度来评价其记录质量，DVD-R和DVD+R技术规范规定PIE不能超过280',
-  `pof` varchar(10) DEFAULT NULL COMMENT '奇偶校验外码失败  当DVDR读出解码器经过第一轮纠错后，不能校正ECC块内数据就叫奇偶校验外码失败，DVD-R和DVD+R技术规范都规定POF = 0',
-  `asym` varchar(10) DEFAULT NULL,
-  `dc_jitter` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='检测表';
-
--- ----------------------------
--- Table structure for save _disposition
--- ----------------------------
-DROP TABLE IF EXISTS `save _disposition`;
-CREATE TABLE `save _disposition` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '部门用户主键ID',
-  `dept_id` varchar(20) DEFAULT NULL COMMENT '部门ID',
-  `user_id` varchar(20) DEFAULT NULL COMMENT '用户ID',
-  `enable` tinyint(1) NOT NULL DEFAULT '1' COMMENT '启用状态',
-  `remark` varchar(1024) DEFAULT NULL,
-  `create_time` datetime DEFAULT NULL,
-  `create_by` bigint(20) DEFAULT NULL,
-  `update_time` datetime DEFAULT NULL,
-  `update_by` bigint(20) DEFAULT NULL,
-  `medium_num` varchar(20) DEFAULT NULL COMMENT '光盘编号',
-  `disposal_type` varchar(10) DEFAULT NULL COMMENT '处置类型',
-  `disposal_reason` varchar(50) DEFAULT NULL COMMENT '处置原因',
-  `reviewer` varchar(10) DEFAULT NULL COMMENT '审批人',
-  `disposal_opinion` varchar(10) DEFAULT NULL COMMENT '审批意见',
-  `disposal_person` varchar(10) DEFAULT NULL COMMENT '处置人',
-  `security_supervisor` varchar(10) DEFAULT NULL COMMENT '监销人',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='处置表';
-
--- ----------------------------
--- Table structure for save _warehousing
--- ----------------------------
-DROP TABLE IF EXISTS `save _warehousing`;
-CREATE TABLE `save _warehousing` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '部门用户主键ID',
-  `dept_id` varchar(20) DEFAULT NULL COMMENT '部门ID',
-  `user_id` varchar(20) DEFAULT NULL COMMENT '用户ID',
-  `enable` tinyint(1) NOT NULL DEFAULT '1' COMMENT '启用状态',
-  `remark` varchar(1024) DEFAULT NULL,
-  `create_time` datetime DEFAULT NULL COMMENT '刻录时间',
-  `create_by` bigint(20) DEFAULT NULL COMMENT '清点人员',
-  `update_time` datetime DEFAULT NULL,
-  `update_by` bigint(20) DEFAULT NULL,
-  `Medium_num` varchar(20) DEFAULT NULL COMMENT '光盘号',
-  `Archieves_type` varchar(20) DEFAULT NULL COMMENT '档案类型',
-  `filing_num` varchar(50) DEFAULT NULL COMMENT '起止档号或归档号',
-  `medium_content` varchar(255) DEFAULT NULL COMMENT '光盘内容',
-  `file_format` varchar(10) DEFAULT NULL COMMENT '文件格式',
-  `data_size` varchar(10) DEFAULT NULL COMMENT '数据大小',
-  `Backup_count` int(1) DEFAULT NULL COMMENT '备份套数',
-  `Stowed_position` varchar(50) DEFAULT NULL COMMENT '存放位置',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='入库表';
-
 -- ----------------------------
 -- Table structure for save_backups_record
 -- ----------------------------
 DROP TABLE IF EXISTS `save_backups_record`;
 CREATE TABLE `save_backups_record` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '部门用户主键ID',
-  `dept_id` varchar(20) DEFAULT NULL COMMENT '部门ID',
-  `user_id` varchar(20) DEFAULT NULL COMMENT '用户ID',
-  `enable` tinyint(1) NOT NULL DEFAULT '1' COMMENT '启用状态',
-  `remark` varchar(1024) DEFAULT NULL,
-  `create_time` datetime DEFAULT NULL COMMENT '备份说明',
-  `create_by` bigint(20) DEFAULT NULL,
-  `update_time` datetime DEFAULT NULL,
-  `update_by` bigint(20) DEFAULT NULL COMMENT '备份方式',
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '逻辑删表示，0表示删除',
+  `remark` varchar(1024) DEFAULT NULL COMMENT '备注，备份说明',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `create_by` varchar(20) DEFAULT NULL COMMENT '创建人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `update_by` varchar(20) DEFAULT NULL COMMENT '更新人',
   `backups_mode` varchar(20) DEFAULT NULL COMMENT '备份方式',
   `backups_medium` varchar(20) DEFAULT NULL COMMENT '备份介质',
   `backups_num` int(1) DEFAULT NULL COMMENT '备份套数',
@@ -137,24 +36,22 @@ CREATE TABLE `save_backups_record` (
   `connect_tab` varchar(20) DEFAULT NULL COMMENT '交接表',
   `leader` varchar(10) NOT NULL COMMENT '领导审核',
   `rate_progress` int(1) DEFAULT NULL COMMENT '进度',
-  `warehousing_tab` varchar(20) DEFAULT NULL,
+  `warehousing_tab` varchar(20) DEFAULT NULL COMMENT '入库表',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='备份记录表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='备份记录表';
 
 -- ----------------------------
 -- Table structure for save_connect
 -- ----------------------------
 DROP TABLE IF EXISTS `save_connect`;
 CREATE TABLE `save_connect` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '部门用户主键ID',
-  `dept_id` varchar(20) DEFAULT NULL COMMENT '部门ID',
-  `user_id` varchar(20) DEFAULT NULL COMMENT '用户ID',
-  `enable` tinyint(1) NOT NULL DEFAULT '1' COMMENT '启用状态',
-  `remark` varchar(1024) DEFAULT NULL,
-  `create_time` datetime DEFAULT NULL COMMENT '移出时间',
-  `create_by` bigint(20) DEFAULT NULL COMMENT '移出填表人',
-  `update_time` datetime DEFAULT NULL,
-  `update_by` bigint(20) DEFAULT NULL,
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '逻辑删表示，0表示删除',
+  `remark` varchar(1024) DEFAULT NULL COMMENT '备注',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间，移出时间',
+  `create_by` varchar(20) DEFAULT NULL COMMENT '创建人，移出填表人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `update_by` varchar(20) DEFAULT NULL COMMENT '更新人',
   `connect_name` varchar(20) DEFAULT NULL COMMENT '交接工作名',
   `connect_content` varchar(255) DEFAULT NULL COMMENT '内容描述',
   `connect_num` varchar(50) DEFAULT NULL COMMENT '移交电子数量',
@@ -162,76 +59,161 @@ CREATE TABLE `save_connect` (
   `serial` varchar(50) DEFAULT NULL COMMENT '载体起止顺序号',
   `specification` varchar(50) DEFAULT NULL COMMENT '载体规格',
   `accuracy_detection` int(1) DEFAULT NULL COMMENT '准确性检测',
-  `Integrity_ testing` int(1) DEFAULT NULL COMMENT '完整性检测',
-  `Availability_ detection` int(1) DEFAULT NULL COMMENT '可用性检测',
+  `integrity_ testing` int(1) DEFAULT NULL COMMENT '完整性检测',
+  `availability_ detection` int(1) DEFAULT NULL COMMENT '可用性检测',
   `safety_inspection` int(1) DEFAULT NULL COMMENT '安全性检测',
-  `Appearance_ detection` int(1) DEFAULT NULL COMMENT '载体外观检测',
+  `appearance_ detection` int(1) DEFAULT NULL COMMENT '载体外观检测',
   `transfer_reviewer` varchar(10) DEFAULT NULL COMMENT '移交审核人',
   `transfer_stamp` int(1) DEFAULT NULL COMMENT '移交单位签章',
   `accession_reviewer` varchar(10) DEFAULT NULL COMMENT '接收审核人',
   `accession_stamp` int(1) DEFAULT NULL COMMENT '接收单位签章',
   `rate_progress` int(1) DEFAULT NULL COMMENT '进度',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='交接表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='交接表';
+
+-- ----------------------------
+-- Table structure for save_disposition
+-- ----------------------------
+DROP TABLE IF EXISTS `save_disposition`;
+CREATE TABLE `save_disposition` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '逻辑删表示，0表示删除',
+  `remark` varchar(1024) DEFAULT NULL COMMENT '备注',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `create_by` varchar(20) DEFAULT NULL COMMENT '创建人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `update_by` varchar(20) DEFAULT NULL COMMENT '更新人',
+  `medium_num` varchar(20) DEFAULT NULL COMMENT '光盘编号',
+  `disposal_type` varchar(10) DEFAULT NULL COMMENT '处置类型',
+  `disposal_reason` varchar(50) DEFAULT NULL COMMENT '处置原因',
+  `reviewer` varchar(10) DEFAULT NULL COMMENT '审批人',
+  `disposal_opinion` varchar(10) DEFAULT NULL COMMENT '审批意见',
+  `disposal_person` varchar(10) DEFAULT NULL COMMENT '处置人',
+  `security_supervisor` varchar(10) DEFAULT NULL COMMENT '监销人',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='处置表';
 
 -- ----------------------------
 -- Table structure for save_label
 -- ----------------------------
 DROP TABLE IF EXISTS `save_label`;
 CREATE TABLE `save_label` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '部门用户主键ID',
-  `dept_id` varchar(20) DEFAULT NULL COMMENT '部门ID',
-  `user_id` varchar(20) DEFAULT NULL COMMENT '用户ID',
-  `enable` tinyint(1) NOT NULL DEFAULT '1' COMMENT '启用状态',
-  `remark` varchar(1024) DEFAULT NULL,
-  `create_time` datetime DEFAULT NULL COMMENT '存入日期',
-  `create_by` bigint(20) DEFAULT NULL,
-  `update_time` datetime DEFAULT NULL,
-  `update_by` bigint(20) DEFAULT NULL,
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '逻辑删表示，0表示删除',
+  `remark` varchar(1024) DEFAULT NULL COMMENT '备注',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间，存入日期',
+  `create_by` varchar(20) DEFAULT NULL COMMENT '创建人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `update_by` varchar(20) DEFAULT NULL COMMENT '更信新人',
   `num` varchar(20) DEFAULT NULL COMMENT '编号',
   `fonds_code` varchar(20) DEFAULT NULL COMMENT '全宗号',
   `category_code` varchar(20) DEFAULT NULL COMMENT '类别号',
   `security_classification` varchar(20) DEFAULT NULL COMMENT '密级',
   `retention_period` varchar(10) DEFAULT NULL COMMENT '保管期限',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='备份标签表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='备份标签表';
+
+-- ----------------------------
+-- Table structure for save_migration
+-- ----------------------------
+DROP TABLE IF EXISTS `save_migration`;
+CREATE TABLE `save_migration` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '逻辑删表示，0表示删除',
+  `remark` varchar(1024) DEFAULT NULL COMMENT '备注',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `create_by` varchar(20) DEFAULT NULL COMMENT '创建人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `update_by` varchar(20) DEFAULT NULL COMMENT '更新人',
+  `medium_num` varchar(20) DEFAULT NULL COMMENT '光盘号',
+  `data_format` varchar(20) DEFAULT NULL COMMENT '数据格式',
+  `data_size` varchar(20) DEFAULT NULL COMMENT '数据大小',
+  `migration_ reason` varchar(50) DEFAULT NULL COMMENT '迁移原因',
+  `reviewer` varchar(10) DEFAULT NULL COMMENT '审批人',
+  `new_medium` varchar(10) DEFAULT NULL COMMENT '新载体',
+  `new_medium_num` varchar(20) DEFAULT NULL COMMENT '新载体编号',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='迁移表';
 
 -- ----------------------------
 -- Table structure for save_recovery_application
 -- ----------------------------
 DROP TABLE IF EXISTS `save_recovery_application`;
 CREATE TABLE `save_recovery_application` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '部门用户主键ID',
-  `dept_id` varchar(20) DEFAULT NULL COMMENT '部门ID',
-  `user_id` varchar(20) DEFAULT NULL COMMENT '用户ID',
-  `enable` tinyint(1) NOT NULL DEFAULT '1' COMMENT '启用状态',
-  `remark` varchar(1024) DEFAULT NULL,
-  `create_time` datetime DEFAULT NULL COMMENT '申请时间',
-  `create_by` bigint(20) DEFAULT NULL COMMENT '申请人',
-  `update_time` datetime DEFAULT NULL,
-  `update_by` bigint(20) DEFAULT NULL,
-  `Instruction` varchar(255) DEFAULT NULL COMMENT '申请说明',
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '逻辑删表示，0表示删除',
+  `remark` varchar(1024) DEFAULT NULL COMMENT '备注',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间，申请时间',
+  `create_by` varchar(20) DEFAULT NULL COMMENT '创建人，申请人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `update_by` varchar(20) DEFAULT NULL COMMENT '更新人',
+  `instruction` varchar(255) DEFAULT NULL COMMENT '申请说明',
   `director_opinion` int(1) DEFAULT NULL COMMENT '局长审核',
-  `Recovery_information_tab` varchar(20) DEFAULT NULL COMMENT '恢复信息表',
+  `recovery_information_tab` varchar(20) DEFAULT NULL COMMENT '恢复信息表',
   `rate_progress` int(1) DEFAULT NULL COMMENT '进度 -1审核不通过  0审核中  1审核通过  2恢复成功 不是2的话都显示还未恢复',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='恢复申请表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='恢复申请表';
 
 -- ----------------------------
 -- Table structure for save_recovery_record
 -- ----------------------------
 DROP TABLE IF EXISTS `save_recovery_record`;
 CREATE TABLE `save_recovery_record` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '部门用户主键ID',
-  `dept_id` varchar(20) DEFAULT NULL COMMENT '部门ID',
-  `user_id` varchar(20) DEFAULT NULL COMMENT '用户ID',
-  `enable` tinyint(1) NOT NULL DEFAULT '1' COMMENT '启用状态',
-  `remark` varchar(1024) DEFAULT NULL,
-  `create_time` datetime DEFAULT NULL COMMENT '恢复时间',
-  `create_by` bigint(20) DEFAULT NULL COMMENT '操作人员',
-  `update_time` datetime DEFAULT NULL,
-  `update_by` bigint(20) DEFAULT NULL,
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '逻辑删表示，0表示删除',
+  `remark` varchar(1024) DEFAULT NULL COMMENT '备注',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间，恢复时间',
+  `create_by` varchar(20) DEFAULT NULL COMMENT '创建人，操作人员',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `update_by` varchar(20) DEFAULT NULL COMMENT '更新人',
   `restoration_num` varchar(20) DEFAULT NULL COMMENT '恢复档案号',
   `restoration_content` varchar(255) DEFAULT NULL COMMENT '恢复内容',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='恢复信息表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='恢复信息表';
+
+-- ----------------------------
+-- Table structure for save_sampling
+-- ----------------------------
+DROP TABLE IF EXISTS `save_sampling`;
+CREATE TABLE `save_sampling` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '逻辑删表示，0表示删除',
+  `remark` varchar(1024) DEFAULT NULL COMMENT '备注',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `create_by` varchar(20) DEFAULT NULL COMMENT '创建人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `update_by` varchar(20) DEFAULT NULL COMMENT '更新人',
+  `medium_num` varchar(20) DEFAULT NULL COMMENT '光盘号',
+  `bler` varchar(10) DEFAULT NULL COMMENT '块错误率  CD-R光盘的块错误率是指每秒测得的错误块数量，CD-R光盘技术规范规定：BLER＜220数据块／秒',
+  `e32` varchar(10) DEFAULT NULL COMMENT '不可校正错误  读CD-R光盘时不能被解码器校正的错误的总数称为E32，CD-R光盘技术规范规定：E32 = 0',
+  `sym` varchar(10) DEFAULT NULL,
+  `jitter` varchar(10) DEFAULT NULL,
+  `pie` varchar(10) DEFAULT NULL COMMENT '奇偶校验内码错误  PI 与PO分别是ECC（错误校正编码）块中的奇偶校验内码和外码，DVD 光盘用PI 与PO 校验中发现错误的次数与程度来评价其记录质量，DVD-R和DVD+R技术规范规定PIE不能超过280',
+  `pof` varchar(10) DEFAULT NULL COMMENT '奇偶校验外码失败  当DVDR读出解码器经过第一轮纠错后，不能校正ECC块内数据就叫奇偶校验外码失败，DVD-R和DVD+R技术规范都规定POF = 0',
+  `asym` varchar(10) DEFAULT NULL,
+  `dc_jitter` varchar(10) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='检测表';
+
+-- ----------------------------
+-- Table structure for save_warehousing
+-- ----------------------------
+DROP TABLE IF EXISTS `save_warehousing`;
+CREATE TABLE `save_warehousing` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '逻辑删表示，0表示删除',
+  `remark` varchar(1024) DEFAULT NULL COMMENT '备注',
+  `create_time` datetime DEFAULT NULL COMMENT '清点时间，创建时间',
+  `create_by` varchar(20) DEFAULT NULL COMMENT '创建人，清点人员',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `update_by` varchar(20) DEFAULT NULL COMMENT '更新人',
+  `medium_num` varchar(20) DEFAULT NULL COMMENT '光盘号',
+  `archieves_type` varchar(20) DEFAULT NULL COMMENT '档案类型',
+  `filing_num` varchar(50) DEFAULT NULL COMMENT '起止档号或归档号',
+  `medium_content` varchar(255) DEFAULT NULL COMMENT '光盘内容',
+  `file_format` varchar(10) DEFAULT NULL COMMENT '文件格式',
+  `data_size` varchar(10) DEFAULT NULL COMMENT '数据大小',
+  `backup_count` int(1) DEFAULT NULL COMMENT '备份套数',
+  `stowed_position` varchar(50) DEFAULT NULL COMMENT '存放位置',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='入库表';

sql/archives_sys.sql

@@ -246,10 +246,10 @@ CREATE TABLE `sys_user` (
   `position` varchar(64) DEFAULT NULL COMMENT '职位',
   `address` varchar(256) DEFAULT NULL COMMENT '详细地址',
   `staff_no` varchar(32) DEFAULT NULL COMMENT '工号',
-  `ext_01` varchar(100) DEFAULT NULL COMMENT '备用字段',
-  `ext_02` varchar(100) DEFAULT NULL COMMENT '备用字段',
-  `ext_03` varchar(100) DEFAULT NULL COMMENT '备用字段',
-  `ext_04` varchar(100) DEFAULT NULL COMMENT '备用字段',
+  `ext1` varchar(100) DEFAULT NULL COMMENT '备用字段',
+  `ext2` varchar(100) DEFAULT NULL COMMENT '备用字段',
+  `ext3` varchar(100) DEFAULT NULL COMMENT '备用字段',
+  `ext4` varchar(100) DEFAULT NULL COMMENT '备用字段',
   `enable` tinyint(1) NOT NULL DEFAULT '1',
   `remark` varchar(1024) DEFAULT NULL,
   `create_time` datetime DEFAULT NULL,

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/mapper/MgrArchivesClassificationMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface MgrArchivesClassificationMapper : BaseMapper<MgrArchivesClassification>

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/mapper/MgrArchivesDocumentMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface MgrArchivesDocumentMapper : BaseMapper<MgrArchivesDocument>

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/mapper/MgrArchivesElectronicRecordMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface MgrArchivesElectronicRecordMapper : BaseMapper<MgrArchivesElectronicRecord>

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/mapper/MgrArchivesFileMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface MgrArchivesFileMapper : BaseMapper<MgrArchivesFile>

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/mapper/MgrArchivesFileNoteMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface MgrArchivesFileNoteMapper : BaseMapper<MgrArchivesFileNote>

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/mapper/MgrArchivesRelationMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface MgrArchivesRelationMapper : BaseMapper<MgrArchivesRelation>

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/mapper/MgrArchivesTypeMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface MgrArchivesTypeMapper : BaseMapper<MgrArchivesType>

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/mapper/MgrFondsMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface MgrFondsMapper : BaseMapper<MgrFonds>

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/model/MgrArchivesClassification.kt

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("mgr_archives_classification")
 data class MgrArchivesClassification(

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/model/MgrArchivesDocument.kt

@@ -10,10 +10,14 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("mgr_archives_document")
 data class MgrArchivesDocument(
+        /**
+         * 案卷id
+         */
+        var fileId: Long? = null,
         /**
          * 归档人
          */

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/model/MgrArchivesElectronicRecord.kt

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("mgr_archives_electronic_record")
 data class MgrArchivesElectronicRecord(

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/model/MgrArchivesFile.kt

@@ -11,7 +11,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("mgr_archives_file")
 data class MgrArchivesFile(

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/model/MgrArchivesFileNote.kt

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("mgr_archives_file_note")
 data class MgrArchivesFileNote(

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/model/MgrArchivesRelation.kt

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("mgr_archives_relation")
 data class MgrArchivesRelation(

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/model/MgrArchivesType.kt

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("mgr_archives_type")
 data class MgrArchivesType(

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/model/MgrFonds.kt

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("mgr_fonds")
 data class MgrFonds(

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/IMgrArchivesClassificationService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface IMgrArchivesClassificationService : BaseService<MgrArchivesClassification>

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/IMgrArchivesDocumentService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface IMgrArchivesDocumentService : BaseService<MgrArchivesDocument>

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/IMgrArchivesElectronicRecordService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface IMgrArchivesElectronicRecordService : BaseService<MgrArchivesElectronicRecord>

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/IMgrArchivesFileNoteService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface IMgrArchivesFileNoteService : BaseService<MgrArchivesFileNote>

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/IMgrArchivesFileService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface IMgrArchivesFileService : BaseService<MgrArchivesFile>

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/IMgrArchivesRelationService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface IMgrArchivesRelationService : BaseService<MgrArchivesRelation>

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/IMgrArchivesTypeService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface IMgrArchivesTypeService : BaseService<MgrArchivesType>

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/IMgrFondsService.kt

@@ -2,15 +2,12 @@ package com.gxzc.zen.api.bus.service
 
 import com.gxzc.zen.api.bus.model.MgrFonds
 import com.gxzc.zen.common.base.BaseService
-
 /**
  * <p>
  * 全宗表 服务类
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
-interface IMgrFondsService : BaseService<MgrFonds> {
-    fun testTransaction()
-}
+interface IMgrFondsService : BaseService<MgrFonds>

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/impl/MgrArchivesClassificationServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class MgrArchivesClassificationServiceImpl : ServiceImpl<MgrArchivesClassificationMapper, MgrArchivesClassification>(), IMgrArchivesClassificationService {

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/impl/MgrArchivesDocumentServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class MgrArchivesDocumentServiceImpl : ServiceImpl<MgrArchivesDocumentMapper, MgrArchivesDocument>(), IMgrArchivesDocumentService {

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/impl/MgrArchivesElectronicRecordServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class MgrArchivesElectronicRecordServiceImpl : ServiceImpl<MgrArchivesElectronicRecordMapper, MgrArchivesElectronicRecord>(), IMgrArchivesElectronicRecordService {

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/impl/MgrArchivesFileNoteServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class MgrArchivesFileNoteServiceImpl : ServiceImpl<MgrArchivesFileNoteMapper, MgrArchivesFileNote>(), IMgrArchivesFileNoteService {

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/impl/MgrArchivesFileServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class MgrArchivesFileServiceImpl : ServiceImpl<MgrArchivesFileMapper, MgrArchivesFile>(), IMgrArchivesFileService {

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/impl/MgrArchivesRelationServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class MgrArchivesRelationServiceImpl : ServiceImpl<MgrArchivesRelationMapper, MgrArchivesRelation>(), IMgrArchivesRelationService {

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/impl/MgrArchivesTypeServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class MgrArchivesTypeServiceImpl : ServiceImpl<MgrArchivesTypeMapper, MgrArchivesType>(), IMgrArchivesTypeService {

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/impl/MgrFondsServiceImpl.kt

@@ -1,13 +1,9 @@
 package com.gxzc.zen.api.bus.service.impl
 
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import com.gxzc.zen.api.bus.mapper.MgrFondsMapper
 import com.gxzc.zen.api.bus.model.MgrFonds
+import com.gxzc.zen.api.bus.mapper.MgrFondsMapper
 import com.gxzc.zen.api.bus.service.IMgrFondsService
-import com.gxzc.zen.api.sys.model.SysParam
-import com.gxzc.zen.api.sys.service.ISysParamService
-import com.gxzc.zen.orm.annotation.MultiTransactional
-import org.springframework.beans.factory.annotation.Autowired
+import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import org.springframework.stereotype.Service
 
 /**
@@ -16,29 +12,9 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class MgrFondsServiceImpl : ServiceImpl<MgrFondsMapper, MgrFonds>(), IMgrFondsService {
 
-    @Autowired
-    private lateinit var sysParamService: ISysParamService
-
-
-    @MultiTransactional(noRollbackFor = [RuntimeException::class])
-    override fun testTransaction() {
-        baseMapper.insert(MgrFonds().also {
-            it.fondsName = "2333"
-            it.fondsNo = "1"
-        })
-
-        sysParamService.insert(SysParam().also {
-            it.sort = 1
-            it.value = "val"
-            it.key = "key"
-        })
-
-        throw RuntimeException("test")
-    }
-
 }

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysDeptMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface SysDeptMapper : BaseMapper<SysDept>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysDeptUserMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface SysDeptUserMapper : BaseMapper<SysDeptUser>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysDicMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface SysDicMapper : BaseMapper<SysDic>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysEventLoginMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface SysEventLoginMapper : BaseMapper<SysEventLogin>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysEventOperMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface SysEventOperMapper : BaseMapper<SysEventOper>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysMenuMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface SysMenuMapper : BaseMapper<SysMenu>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysNoticeMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface SysNoticeMapper : BaseMapper<SysNotice>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysParamMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface SysParamMapper : BaseMapper<SysParam>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysPermissionMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface SysPermissionMapper : BaseMapper<SysPermission>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysRoleMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface SysRoleMapper : BaseMapper<SysRole>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysRolePermissionMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface SysRolePermissionMapper : BaseMapper<SysRolePermission>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysUserMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface SysUserMapper : BaseMapper<SysUser>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysUserRoleMapper.kt

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Repository
 interface SysUserRoleMapper : BaseMapper<SysUserRole>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysDept.kt

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("sys_dept")
 data class SysDept(

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysDeptUser.kt

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("sys_dept_user")
 data class SysDeptUser(

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysDic.kt

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("sys_dic")
 data class SysDic(

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysEventLogin.kt

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("sys_event_login")
 data class SysEventLogin(

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysEventOper.kt

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("sys_event_oper")
 data class SysEventOper(

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysMenu.kt

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("sys_menu")
 data class SysMenu(

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysNotice.kt

@@ -10,7 +10,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("sys_notice")
 data class SysNotice(

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysParam.kt

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("sys_param")
 data class SysParam(

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysPermission.kt

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("sys_permission")
 data class SysPermission(

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysRole.kt

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("sys_role")
 data class SysRole(

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysRolePermission.kt

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("sys_role_permission")
 data class SysRolePermission(

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysUser.kt

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("sys_user")
 data class SysUser(

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysUserRole.kt

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @TableName("sys_user_role")
 data class SysUserRole(

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysDeptService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface ISysDeptService : BaseService<SysDept>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysDeptUserService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface ISysDeptUserService : BaseService<SysDeptUser>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysDicService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface ISysDicService : BaseService<SysDic>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysEventLoginService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface ISysEventLoginService : BaseService<SysEventLogin>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysEventOperService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface ISysEventOperService : BaseService<SysEventOper>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysMenuService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface ISysMenuService : BaseService<SysMenu>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysNoticeService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface ISysNoticeService : BaseService<SysNotice>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysParamService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface ISysParamService : BaseService<SysParam>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysPermissionService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface ISysPermissionService : BaseService<SysPermission>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysRolePermissionService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface ISysRolePermissionService : BaseService<SysRolePermission>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysRoleService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface ISysRoleService : BaseService<SysRole>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysUserRoleService.kt

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface ISysUserRoleService : BaseService<SysUserRole>

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysUserService.kt

@@ -9,8 +9,8 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 interface ISysUserService : BaseService<SysUser> {
-    fun selectListCacheable(): MutableList<SysUser>
+    fun getUserListCacheable(): MutableList<SysUser>
 }

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysDeptServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class SysDeptServiceImpl : ServiceImpl<SysDeptMapper, SysDept>(), ISysDeptService {

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysDeptUserServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class SysDeptUserServiceImpl : ServiceImpl<SysDeptUserMapper, SysDeptUser>(), ISysDeptUserService {

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysDicServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService {

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysEventLoginServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class SysEventLoginServiceImpl : ServiceImpl<SysEventLoginMapper, SysEventLogin>(), ISysEventLoginService {

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysEventOperServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class SysEventOperServiceImpl : ServiceImpl<SysEventOperMapper, SysEventOper>(), ISysEventOperService {

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysMenuServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class SysMenuServiceImpl : ServiceImpl<SysMenuMapper, SysMenu>(), ISysMenuService {

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysNoticeServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class SysNoticeServiceImpl : ServiceImpl<SysNoticeMapper, SysNotice>(), ISysNoticeService {

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysParamServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamService {

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysPermissionServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class SysPermissionServiceImpl : ServiceImpl<SysPermissionMapper, SysPermission>(), ISysPermissionService {

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysRolePermissionServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class SysRolePermissionServiceImpl : ServiceImpl<SysRolePermissionMapper, SysRolePermission>(), ISysRolePermissionService {

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysRoleServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleService {

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysUserRoleServiceImpl.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class SysUserRoleServiceImpl : ServiceImpl<SysUserRoleMapper, SysUserRole>(), ISysUserRoleService {

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysUserServiceImpl.kt

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import com.gxzc.zen.api.sys.mapper.SysUserMapper
 import com.gxzc.zen.api.sys.model.SysUser
 import com.gxzc.zen.api.sys.service.ISysUserService
-import org.slf4j.LoggerFactory
+import com.gxzc.zen.common.contants.CACHEKEYS
 import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Service
 
@@ -15,18 +15,13 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-03
+ * @since 2018-02-05
  */
 @Service
 class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserService {
-    companion object {
-        private val logger = LoggerFactory.getLogger(SysUserServiceImpl::class.java)
-    }
 
-    @Cacheable("user")
-    override fun selectListCacheable(): MutableList<SysUser> {
-        logger.info("selectListCacheable!!!")
+    @Cacheable(CACHEKEYS.USER)
+    override fun getUserListCacheable(): MutableList<SysUser> {
         return baseMapper.selectList(EntityWrapper<SysUser>())
     }
-
 }

zen-api/src/main/resources/mapping/bus/MgrArchivesDocumentMapper.xml

@@ -11,6 +11,7 @@
     <result column="create_time" property="createTime" />
     <result column="update_by" property="updateBy" />
     <result column="update_time" property="updateTime" />
+        <result column="file_id" property="fileId" />
         <result column="filing_by" property="filingBy" />
         <result column="filing_time" property="filingTime" />
         <result column="fonds_no" property="fondsNo" />

zen-core/src/main/kotlin/com/gxzc/zen/common/contants/CACHEKEYS.kt

@@ -0,0 +1,13 @@
+package com.gxzc.zen.common.contants
+
+/**
+ * 缓存key 列表
+ * @author NorthLan
+ * @date 2018/2/5
+ * @url https://noahlan.com
+ */
+object CACHEKEYS {
+    const val USER = "user"
+    const val USER_ROLE = "user_role"
+    const val SYS_PERMISSION = "sys_permission"
+}

zen-orm/src/main/kotlin/com/gxzc/zen/Generator.kt

@@ -25,12 +25,12 @@ fun main(args: Array<String>) {
             }
         }
         it.driverName = "com.mysql.jdbc.Driver"
-//        it.username = "archives"
-//        it.password = "archives"
-//        it.url = "jdbc:mysql://192.168.1.124:3307/archives_mgr?characterEncoding=utf8"
-        it.url = "jdbc:mysql://127.0.0.1:3306/archives_mgr?characterEncoding=utf8"
-        it.username = "root"
-        it.password = "root"
+        it.username = "archives"
+        it.password = "archives"
+        it.url = "jdbc:mysql://192.168.1.124:3307/archives_mgr?characterEncoding=utf8"
+//        it.url = "jdbc:mysql://127.0.0.1:3306/archives_mgr?characterEncoding=utf8"
+//        it.username = "root"
+//        it.password = "root"
     })
 }