继承atomikos事务上有点问题

.gitignore

@@ -147,3 +147,7 @@ logs/
 
 # Gradle
 /build/
+
+
+# bus
+transaction-logs/

sql/archives_mgr.sql

@@ -32,7 +32,7 @@ CREATE TABLE `mgr_archives_classification` (
   `update_time` datetime DEFAULT NULL,
   `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1002 DEFAULT CHARSET=utf8 COMMENT='分类表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='分类表';
 
 -- ----------------------------
 -- Table structure for mgr_archives_document
@@ -97,14 +97,14 @@ CREATE TABLE `mgr_archives_document` (
   `digital_software_version` varchar(20) DEFAULT NULL COMMENT '数字化软件版本',
   `digital_software_manufacturer` varchar(50) DEFAULT NULL COMMENT '数字化软件生产商',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='文书档案文件';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='文书档案文件';
 
 -- ----------------------------
 -- Table structure for mgr_archives_electronic_record
 -- ----------------------------
 DROP TABLE IF EXISTS `mgr_archives_electronic_record`;
 CREATE TABLE `mgr_archives_electronic_record` (
-  `id` bigint(20) NOT NULL COMMENT '主键',
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `enable` tinyint(1) DEFAULT '1' COMMENT '可用性（1可用；0不可用）',
   `remark` varchar(500) DEFAULT NULL COMMENT '备注',
   `create_by` varchar(20) DEFAULT NULL COMMENT '创建人',
@@ -115,14 +115,14 @@ CREATE TABLE `mgr_archives_electronic_record` (
   `electronic_record_title` varchar(50) DEFAULT NULL COMMENT '电子文件标题',
   `connect_configure_name` varchar(20) DEFAULT NULL COMMENT '挂接配置名',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='电子档案文件';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='电子档案文件';
 
 -- ----------------------------
 -- Table structure for mgr_archives_file
 -- ----------------------------
 DROP TABLE IF EXISTS `mgr_archives_file`;
 CREATE TABLE `mgr_archives_file` (
-  `id` bigint(20) NOT NULL COMMENT '主键',
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `enable` tinyint(1) DEFAULT '1' COMMENT '可用性（1可用；0不可用）',
   `remark` varchar(500) DEFAULT NULL COMMENT '备注/附注',
   `create_by` varchar(20) DEFAULT NULL COMMENT '创建人',
@@ -157,14 +157,14 @@ CREATE TABLE `mgr_archives_file` (
   `RFID` varchar(20) DEFAULT NULL COMMENT 'RFID',
   `filing_status` int(1) DEFAULT '0' COMMENT '归档状态（0：未归档，1归档）',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='文书档案案卷';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='文书档案案卷';
 
 -- ----------------------------
 -- Table structure for mgr_archives_file_note
 -- ----------------------------
 DROP TABLE IF EXISTS `mgr_archives_file_note`;
 CREATE TABLE `mgr_archives_file_note` (
-  `id` bigint(20) NOT NULL COMMENT '主键',
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `enable` tinyint(1) DEFAULT '1' COMMENT '可用性（0不可用；1可用）',
   `remark` varchar(500) DEFAULT NULL COMMENT '备注/附注',
   `create_by` varchar(20) DEFAULT NULL COMMENT '创建人',
@@ -177,7 +177,7 @@ CREATE TABLE `mgr_archives_file_note` (
   `collator` varchar(20) DEFAULT NULL COMMENT '整理人',
   `inspector` varchar(20) DEFAULT NULL COMMENT '检查人',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='文书档案备考表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='文书档案备考表';
 
 -- ----------------------------
 -- Table structure for mgr_archives_relation
@@ -195,7 +195,7 @@ CREATE TABLE `mgr_archives_relation` (
   `update_time` datetime DEFAULT NULL,
   `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1002 DEFAULT CHARSET=utf8 COMMENT='目录树关系表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='目录树关系表';
 
 -- ----------------------------
 -- Table structure for mgr_archives_type
@@ -213,7 +213,7 @@ CREATE TABLE `mgr_archives_type` (
   `update_time` datetime DEFAULT NULL,
   `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='档案类型表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='档案类型表';
 
 -- ----------------------------
 -- Table structure for mgr_fonds
@@ -230,4 +230,4 @@ CREATE TABLE `mgr_fonds` (
   `update_time` datetime DEFAULT NULL,
   `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='全宗表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='全宗表';

sql/archives_receive.sql

@@ -46,7 +46,7 @@ CREATE TABLE `arc_ electronic_accession` (
   `backups_number` int(255) DEFAULT NULL COMMENT '备份数',
   `file_carrier_relation` varchar(255) DEFAULT NULL COMMENT '文件与载体的关系（一件一盘、一件多盘、多件多盘、多件一盘）',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Table structure for arc_accession_examine
@@ -66,7 +66,7 @@ CREATE TABLE `arc_accession_examine` (
   `preparer` varchar(20) DEFAULT NULL COMMENT '填表人',
   `verifier` varchar(20) DEFAULT NULL COMMENT '审核人',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Table structure for arc_accession_receipt
@@ -84,7 +84,7 @@ CREATE TABLE `arc_accession_receipt` (
   `archives_number` int(255) DEFAULT NULL COMMENT '案卷数',
   `accession_unit` varchar(50) NOT NULL COMMENT '接收单位',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Table structure for rec_record
@@ -104,4 +104,4 @@ CREATE TABLE `rec_record` (
   `save_time` varchar(20) NOT NULL COMMENT '保管期限',
   `file_number` int(20) NOT NULL COMMENT '案卷目录数',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;

sql/archives_save.sql

@@ -37,7 +37,7 @@ CREATE TABLE `save _ Migration` (
   `new_medium` varchar(10) DEFAULT NULL COMMENT '新载体',
   `new_medium_num` varchar(20) DEFAULT NULL COMMENT '新载体编号',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='迁移表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='迁移表';
 
 -- ----------------------------
 -- Table structure for save _ sampling
@@ -63,7 +63,7 @@ CREATE TABLE `save _ sampling` (
   `asym` varchar(10) DEFAULT NULL,
   `dc_jitter` varchar(10) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='检测表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='检测表';
 
 -- ----------------------------
 -- Table structure for save _disposition
@@ -87,7 +87,7 @@ CREATE TABLE `save _disposition` (
   `disposal_person` varchar(10) DEFAULT NULL COMMENT '处置人',
   `security_supervisor` varchar(10) DEFAULT NULL COMMENT '监销人',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='处置表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='处置表';
 
 -- ----------------------------
 -- Table structure for save _warehousing
@@ -112,7 +112,7 @@ CREATE TABLE `save _warehousing` (
   `Backup_count` int(1) DEFAULT NULL COMMENT '备份套数',
   `Stowed_position` varchar(50) DEFAULT NULL COMMENT '存放位置',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='入库表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='入库表';
 
 -- ----------------------------
 -- Table structure for save_backups_record
@@ -139,7 +139,7 @@ CREATE TABLE `save_backups_record` (
   `rate_progress` int(1) DEFAULT NULL COMMENT '进度',
   `warehousing_tab` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='备份记录表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='备份记录表';
 
 -- ----------------------------
 -- Table structure for save_connect
@@ -172,7 +172,7 @@ CREATE TABLE `save_connect` (
   `accession_stamp` int(1) DEFAULT NULL COMMENT '接收单位签章',
   `rate_progress` int(1) DEFAULT NULL COMMENT '进度',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='交接表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='交接表';
 
 -- ----------------------------
 -- Table structure for save_label
@@ -194,7 +194,7 @@ CREATE TABLE `save_label` (
   `security_classification` varchar(20) DEFAULT NULL COMMENT '密级',
   `retention_period` varchar(10) DEFAULT NULL COMMENT '保管期限',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='备份标签表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='备份标签表';
 
 -- ----------------------------
 -- Table structure for save_recovery_application
@@ -215,7 +215,7 @@ CREATE TABLE `save_recovery_application` (
   `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=1000 DEFAULT CHARSET=utf8 COMMENT='恢复申请表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='恢复申请表';
 
 -- ----------------------------
 -- Table structure for save_recovery_record
@@ -234,4 +234,4 @@ CREATE TABLE `save_recovery_record` (
   `restoration_num` varchar(20) DEFAULT NULL COMMENT '恢复档案号',
   `restoration_content` varchar(255) DEFAULT NULL COMMENT '恢复内容',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='恢复信息表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='恢复信息表';

sql/archives_sys.sql

@@ -31,7 +31,7 @@ CREATE TABLE `sys_dept` (
   `update_time` datetime DEFAULT NULL,
   `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1002 DEFAULT CHARSET=utf8 COMMENT='部门管理';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='部门管理';
 
 -- ----------------------------
 -- Table structure for sys_dept_user
@@ -50,7 +50,7 @@ CREATE TABLE `sys_dept_user` (
   PRIMARY KEY (`id`),
   KEY `idx_dept_id` (`dept_id`),
   KEY `idx_user_id` (`user_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='部门用户表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='部门用户表';
 
 -- ----------------------------
 -- Table structure for sys_dic
@@ -68,7 +68,7 @@ CREATE TABLE `sys_dic` (
   `update_time` datetime DEFAULT NULL,
   `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1001 DEFAULT CHARSET=utf8 COMMENT='字典表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='字典表';
 
 -- ----------------------------
 -- Table structure for sys_event_login
@@ -91,7 +91,7 @@ CREATE TABLE `sys_event_login` (
   `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
   PRIMARY KEY (`id`),
   KEY `idx_account` (`account`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='登录日志表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='登录日志表';
 
 -- ----------------------------
 -- Table structure for sys_event_oper
@@ -114,7 +114,7 @@ CREATE TABLE `sys_event_oper` (
   `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
   PRIMARY KEY (`id`),
   KEY `idx_account` (`account`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='操作日志表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='操作日志表';
 
 -- ----------------------------
 -- Table structure for sys_menu
@@ -136,7 +136,7 @@ CREATE TABLE `sys_menu` (
   `update_time` datetime DEFAULT NULL,
   `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='菜单表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='菜单表';
 
 -- ----------------------------
 -- Table structure for sys_notice
@@ -157,7 +157,7 @@ CREATE TABLE `sys_notice` (
   `update_time` datetime DEFAULT NULL,
   `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='通知公告表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='通知公告表';
 
 -- ----------------------------
 -- Table structure for sys_param
@@ -175,7 +175,7 @@ CREATE TABLE `sys_param` (
   `update_time` datetime DEFAULT NULL,
   `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='系统参数表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='系统参数表';
 
 -- ----------------------------
 -- Table structure for sys_permission
@@ -195,7 +195,7 @@ CREATE TABLE `sys_permission` (
   `update_time` datetime DEFAULT NULL,
   `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='权限表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='权限表';
 
 -- ----------------------------
 -- Table structure for sys_role
@@ -211,7 +211,7 @@ CREATE TABLE `sys_role` (
   `update_time` datetime DEFAULT NULL,
   `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='角色表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='角色表';
 
 -- ----------------------------
 -- Table structure for sys_role_permission
@@ -228,7 +228,7 @@ CREATE TABLE `sys_role_permission` (
   `update_time` datetime DEFAULT NULL,
   `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='角色授权表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='角色授权表';
 
 -- ----------------------------
 -- Table structure for sys_user
@@ -259,7 +259,7 @@ CREATE TABLE `sys_user` (
   PRIMARY KEY (`id`),
   UNIQUE KEY `account` (`account`),
   KEY `index_account` (`account`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='用户管理';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='用户管理';
 
 -- ----------------------------
 -- Table structure for sys_user_role
@@ -278,4 +278,4 @@ CREATE TABLE `sys_user_role` (
   PRIMARY KEY (`id`),
   KEY `idx_role_id` (`role_id`),
   KEY `idx_user_id` (`user_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 COMMENT='用户角色表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='用户角色表';

sql/archives_usage.sql → sql/archives_utilization.sql

@@ -4,7 +4,7 @@ Navicat MariaDB Data Transfer
 Source Server         : archives
 Source Server Version : 100032
 Source Host           : 192.168.1.124:3307
-Source Database       : archives_usage
+Source Database       : archives_utilization
 
 Target Server Type    : MariaDB
 Target Server Version : 100032
@@ -16,11 +16,11 @@ Date: 2018-02-02 16:30:10
 SET FOREIGN_KEY_CHECKS=0;
 
 -- ----------------------------
--- Table structure for usage_apply
+-- Table structure for utilization_apply
 -- ----------------------------
-DROP TABLE IF EXISTS `usage_apply`;
-CREATE TABLE `usage_apply` (
-  `id` bigint(20) NOT NULL,
+DROP TABLE IF EXISTS `utilization_apply`;
+CREATE TABLE `utilization_apply` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `enable` tinyint(4) DEFAULT NULL,
   `remark` varchar(1024) DEFAULT NULL,
   `create_time` datetime DEFAULT NULL,
@@ -37,14 +37,14 @@ CREATE TABLE `usage_apply` (
   `apply_time` datetime NOT NULL,
   `apply_purpose` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
--- Table structure for usage_audit
+-- Table structure for utilization_audit
 -- ----------------------------
-DROP TABLE IF EXISTS `usage_audit`;
-CREATE TABLE `usage_audit` (
-  `id` bigint(20) NOT NULL,
+DROP TABLE IF EXISTS `utilization_audit`;
+CREATE TABLE `utilization_audit` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `enable` tinyint(4) DEFAULT NULL,
   `remark` varchar(1024) DEFAULT NULL,
   `create_time` datetime DEFAULT NULL,
@@ -55,16 +55,16 @@ CREATE TABLE `usage_audit` (
   `position` varchar(50) DEFAULT NULL,
   `result` varchar(50) DEFAULT NULL,
   `time` datetime NOT NULL,
-  PRIMARY KEY (`id`),
-  CONSTRAINT `usage_audit_ibfk_1` FOREIGN KEY (`id`) REFERENCES `usage_apply` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+  PRIMARY KEY (`id`)
+  -- CONSTRAINT `utilization_audit_ibfk_1` FOREIGN KEY (`id`) REFERENCES `utilization_apply` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
--- Table structure for usage_borrow
+-- Table structure for utilization_borrow
 -- ----------------------------
-DROP TABLE IF EXISTS `usage_borrow`;
-CREATE TABLE `usage_borrow` (
-  `id` bigint(20) NOT NULL,
+DROP TABLE IF EXISTS `utilization_borrow`;
+CREATE TABLE `utilization_borrow` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `enable` tinyint(4) DEFAULT NULL,
   `remark` varchar(1024) DEFAULT NULL,
   `create_time` datetime DEFAULT NULL,
@@ -75,16 +75,16 @@ CREATE TABLE `usage_borrow` (
   `duration` varchar(50) DEFAULT NULL,
   `deadline` datetime DEFAULT NULL,
   `status` varchar(50) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  CONSTRAINT `usage_borrow_ibfk_1` FOREIGN KEY (`id`) REFERENCES `usage_apply` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+  PRIMARY KEY (`id`)
+  -- CONSTRAINT `utilization_borrow_ibfk_1` FOREIGN KEY (`id`) REFERENCES `utilization_apply` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
--- Table structure for usage_evaluation
+-- Table structure for utilization_evaluation
 -- ----------------------------
-DROP TABLE IF EXISTS `usage_evaluation`;
-CREATE TABLE `usage_evaluation` (
-  `id` bigint(20) NOT NULL,
+DROP TABLE IF EXISTS `utilization_evaluation`;
+CREATE TABLE `utilization_evaluation` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `enable` tinyint(4) DEFAULT NULL,
   `remark` varchar(1024) DEFAULT NULL,
   `create_time` datetime DEFAULT NULL,
@@ -94,16 +94,16 @@ CREATE TABLE `usage_evaluation` (
   `evaluate_score` varchar(10) NOT NULL,
   `evaluate_content` varchar(255) DEFAULT NULL,
   `evaluate_time` datetime NOT NULL,
-  PRIMARY KEY (`id`),
-  CONSTRAINT `usage_evaluation_ibfk_1` FOREIGN KEY (`id`) REFERENCES `usage_borrow` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+  PRIMARY KEY (`id`)
+  -- CONSTRAINT `utilization_evaluation_ibfk_1` FOREIGN KEY (`id`) REFERENCES `utilization_borrow` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
--- Table structure for usage_remind
+-- Table structure for utilization_remind
 -- ----------------------------
-DROP TABLE IF EXISTS `usage_remind`;
-CREATE TABLE `usage_remind` (
-  `id` bigint(20) NOT NULL,
+DROP TABLE IF EXISTS `utilization_remind`;
+CREATE TABLE `utilization_remind` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `enable` tinyint(4) DEFAULT NULL,
   `remark` varchar(1024) DEFAULT NULL,
   `create_time` datetime DEFAULT NULL,
@@ -112,22 +112,22 @@ CREATE TABLE `usage_remind` (
   `update_by` varchar(20) DEFAULT NULL,
   `extra_time` datetime DEFAULT NULL,
   `remind` varchar(50) NOT NULL,
-  PRIMARY KEY (`id`),
-  CONSTRAINT `usage_remind_ibfk_1` FOREIGN KEY (`id`) REFERENCES `usage_borrow` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+  PRIMARY KEY (`id`)
+  -- CONSTRAINT `utilization_remind_ibfk_1` FOREIGN KEY (`id`) REFERENCES `utilization_borrow` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
--- Table structure for usage_rules
+-- Table structure for utilization_rules
 -- ----------------------------
-DROP TABLE IF EXISTS `usage_rules`;
-CREATE TABLE `usage_rules` (
-  `id` bigint(20) NOT NULL,
-  `enable` tinyint(4) DEFAULT NULL,
-  `remark` varchar(1024) DEFAULT NULL,
-  `create_time` datetime DEFAULT NULL,
-  `create_by` varchar(20) DEFAULT NULL,
-  `update_time` datetime DEFAULT NULL,
-  `update_by` varchar(20) DEFAULT NULL,
+DROP TABLE IF EXISTS `utilization_rules`;
+CREATE TABLE `utilization_rules` (
+  `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 '更新人',
   `borrow_time` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT = 1 DEFAULT CHARSET=utf8;

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

@@ -3,14 +3,13 @@ package com.gxzc.zen.api.bus.mapper
 import com.gxzc.zen.api.bus.model.MgrArchivesClassification
 import com.gxzc.zen.common.base.BaseMapper
 import org.springframework.stereotype.Repository
-
 /**
  * <p>
  * 分类表 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-02
+ * @since 2018-02-03
  */
 @Repository
 interface MgrArchivesClassificationMapper : BaseMapper<MgrArchivesClassification>

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

@@ -2,12 +2,14 @@ package com.gxzc.zen.api.bus.mapper
 
 import com.gxzc.zen.api.bus.model.MgrArchivesDocument
 import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
 /**
  * <p>
  * 文书档案文件 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-02
+ * @since 2018-02-03
  */
+@Repository
 interface MgrArchivesDocumentMapper : BaseMapper<MgrArchivesDocument>

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

@@ -2,12 +2,14 @@ package com.gxzc.zen.api.bus.mapper
 
 import com.gxzc.zen.api.bus.model.MgrArchivesElectronicRecord
 import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
 /**
  * <p>
  * 电子档案文件 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-02
+ * @since 2018-02-03
  */
+@Repository
 interface MgrArchivesElectronicRecordMapper : BaseMapper<MgrArchivesElectronicRecord>

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

@@ -2,12 +2,14 @@ package com.gxzc.zen.api.bus.mapper
 
 import com.gxzc.zen.api.bus.model.MgrArchivesFile
 import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
 /**
  * <p>
  * 文书档案案卷 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-02
+ * @since 2018-02-03
  */
+@Repository
 interface MgrArchivesFileMapper : BaseMapper<MgrArchivesFile>

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

@@ -2,12 +2,14 @@ package com.gxzc.zen.api.bus.mapper
 
 import com.gxzc.zen.api.bus.model.MgrArchivesFileNote
 import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
 /**
  * <p>
  * 文书档案备考表 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-02
+ * @since 2018-02-03
  */
+@Repository
 interface MgrArchivesFileNoteMapper : BaseMapper<MgrArchivesFileNote>

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

@@ -2,12 +2,14 @@ package com.gxzc.zen.api.bus.mapper
 
 import com.gxzc.zen.api.bus.model.MgrArchivesRelation
 import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
 /**
  * <p>
  * 目录树关系表 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-02
+ * @since 2018-02-03
  */
+@Repository
 interface MgrArchivesRelationMapper : BaseMapper<MgrArchivesRelation>

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

@@ -2,12 +2,14 @@ package com.gxzc.zen.api.bus.mapper
 
 import com.gxzc.zen.api.bus.model.MgrArchivesType
 import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
 /**
  * <p>
  * 档案类型表 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-02
+ * @since 2018-02-03
  */
+@Repository
 interface MgrArchivesTypeMapper : BaseMapper<MgrArchivesType>

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

@@ -2,12 +2,14 @@ package com.gxzc.zen.api.bus.mapper
 
 import com.gxzc.zen.api.bus.model.MgrFonds
 import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
 /**
  * <p>
  * 全宗表 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-02
+ * @since 2018-02-03
  */
+@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-02
+ * @since 2018-02-03
  */
 @TableName("mgr_archives_classification")
 data class MgrArchivesClassification(

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

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

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-02
+ * @since 2018-02-03
  */
 @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-02
+ * @since 2018-02-03
  */
 @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-02
+ * @since 2018-02-03
  */
 @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-02
+ * @since 2018-02-03
  */
 @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-02
+ * @since 2018-02-03
  */
 @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-02
+ * @since 2018-02-03
  */
 @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-02
+ * @since 2018-02-03
  */
 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-02
+ * @since 2018-02-03
  */
 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-02
+ * @since 2018-02-03
  */
 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-02
+ * @since 2018-02-03
  */
 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-02
+ * @since 2018-02-03
  */
 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-02
+ * @since 2018-02-03
  */
 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-02
+ * @since 2018-02-03
  */
 interface IMgrArchivesTypeService : BaseService<MgrArchivesType>

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

@@ -2,12 +2,15 @@ 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-02
+ * @since 2018-02-03
  */
-interface IMgrFondsService : BaseService<MgrFonds>
+interface IMgrFondsService : BaseService<MgrFonds> {
+    fun testTransaction()
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -4,7 +4,12 @@ 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.baomidou.mybatisplus.service.impl.ServiceImpl
+import com.gxzc.zen.api.sys.model.SysParam
+import com.gxzc.zen.api.sys.service.ISysParamService
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Propagation
+import org.springframework.transaction.annotation.Transactional
 
 /**
  * <p>
@@ -12,9 +17,28 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-02
+ * @since 2018-02-03
  */
 @Service
-open class MgrFondsServiceImpl : ServiceImpl<MgrFondsMapper, MgrFonds>(), IMgrFondsService {
+class MgrFondsServiceImpl : ServiceImpl<MgrFondsMapper, MgrFonds>(), IMgrFondsService {
+
+    @Autowired
+    private lateinit var sysParamService: ISysParamService
+
+    @Transactional(propagation = Propagation.NESTED)
+    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

@@ -2,12 +2,14 @@ package com.gxzc.zen.api.sys.mapper
 
 import com.gxzc.zen.api.sys.model.SysDept
 import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
 /**
  * <p>
  * 部门管理 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-03
  */
+@Repository
 interface SysDeptMapper : BaseMapper<SysDept>

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

@@ -2,12 +2,14 @@ package com.gxzc.zen.api.sys.mapper
 
 import com.gxzc.zen.api.sys.model.SysDeptUser
 import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
 /**
  * <p>
  * 部门用户表 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-03
  */
+@Repository
 interface SysDeptUserMapper : BaseMapper<SysDeptUser>

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

@@ -0,0 +1,15 @@
+package com.gxzc.zen.api.sys.mapper
+
+import com.gxzc.zen.api.sys.model.SysDic
+import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
+/**
+ * <p>
+ * 字典表 Mapper 接口
+ * </p>
+ *
+ * @author NorthLan123
+ * @since 2018-02-03
+ */
+@Repository
+interface SysDicMapper : BaseMapper<SysDic>

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

@@ -2,12 +2,14 @@ package com.gxzc.zen.api.sys.mapper
 
 import com.gxzc.zen.api.sys.model.SysEventLogin
 import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
 /**
  * <p>
  * 登录日志表 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-03
  */
+@Repository
 interface SysEventLoginMapper : BaseMapper<SysEventLogin>

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

@@ -2,12 +2,14 @@ package com.gxzc.zen.api.sys.mapper
 
 import com.gxzc.zen.api.sys.model.SysEventOper
 import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
 /**
  * <p>
  * 操作日志表 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-03
  */
+@Repository
 interface SysEventOperMapper : BaseMapper<SysEventOper>

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

@@ -2,12 +2,14 @@ package com.gxzc.zen.api.sys.mapper
 
 import com.gxzc.zen.api.sys.model.SysMenu
 import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
 /**
  * <p>
  * 菜单表 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-03
  */
+@Repository
 interface SysMenuMapper : BaseMapper<SysMenu>

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

@@ -2,12 +2,14 @@ package com.gxzc.zen.api.sys.mapper
 
 import com.gxzc.zen.api.sys.model.SysNotice
 import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
 /**
  * <p>
  * 通知公告表 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-03
  */
+@Repository
 interface SysNoticeMapper : BaseMapper<SysNotice>

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

@@ -3,14 +3,13 @@ package com.gxzc.zen.api.sys.mapper
 import com.gxzc.zen.api.sys.model.SysParam
 import com.gxzc.zen.common.base.BaseMapper
 import org.springframework.stereotype.Repository
-
 /**
  * <p>
  * 系统参数表 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-03
  */
 @Repository
 interface SysParamMapper : BaseMapper<SysParam>

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

@@ -2,12 +2,14 @@ package com.gxzc.zen.api.sys.mapper
 
 import com.gxzc.zen.api.sys.model.SysPermission
 import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
 /**
  * <p>
  * 权限表 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-03
  */
+@Repository
 interface SysPermissionMapper : BaseMapper<SysPermission>

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

@@ -2,12 +2,14 @@ package com.gxzc.zen.api.sys.mapper
 
 import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
 /**
  * <p>
  * 角色表 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-03
  */
+@Repository
 interface SysRoleMapper : BaseMapper<SysRole>

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

@@ -2,12 +2,14 @@ package com.gxzc.zen.api.sys.mapper
 
 import com.gxzc.zen.api.sys.model.SysRolePermission
 import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
 /**
  * <p>
  * 角色授权表 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-03
  */
+@Repository
 interface SysRolePermissionMapper : BaseMapper<SysRolePermission>

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

@@ -2,12 +2,14 @@ package com.gxzc.zen.api.sys.mapper
 
 import com.gxzc.zen.api.sys.model.SysUser
 import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
 /**
  * <p>
  * 用户管理 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-03
  */
+@Repository
 interface SysUserMapper : BaseMapper<SysUser>

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

@@ -2,12 +2,14 @@ package com.gxzc.zen.api.sys.mapper
 
 import com.gxzc.zen.api.sys.model.SysUserRole
 import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
 /**
  * <p>
  * 用户角色表 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-03
  */
+@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-01-31
+ * @since 2018-02-03
  */
 @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-01-31
+ * @since 2018-02-03
  */
 @TableName("sys_dept_user")
 data class SysDeptUser(

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

@@ -0,0 +1,29 @@
+package com.gxzc.zen.api.sys.model
+
+import com.baomidou.mybatisplus.annotations.TableName
+import com.gxzc.zen.common.base.BaseModel
+
+/**
+ * <p>
+ * 字典表
+ * </p>
+ *
+ * @author NorthLan123
+ * @since 2018-02-03
+ */
+@TableName("sys_dic")
+data class SysDic(
+        /**
+         * 字典代码
+         */
+        var key: String? = null,
+        /**
+         * 字典值
+         */
+        var value: String? = null,
+        /**
+         * 排序号
+         */
+        var sort: Int? = null
+) : BaseModel() {
+}

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-01-31
+ * @since 2018-02-03
  */
 @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-01-31
+ * @since 2018-02-03
  */
 @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-01-31
+ * @since 2018-02-03
  */
 @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-01-31
+ * @since 2018-02-03
  */
 @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-01-31
+ * @since 2018-02-03
  */
 @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-01-31
+ * @since 2018-02-03
  */
 @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-01-31
+ * @since 2018-02-03
  */
 @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-01-31
+ * @since 2018-02-03
  */
 @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-01-31
+ * @since 2018-02-03
  */
 @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-01-31
+ * @since 2018-02-03
  */
 @TableName("sys_user_role")
 data class SysUserRole(

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

@@ -2,15 +2,12 @@ package com.gxzc.zen.api.sys.service
 
 import com.gxzc.zen.api.sys.model.SysDept
 import com.gxzc.zen.common.base.BaseService
-
 /**
  * <p>
  * 部门管理 服务类
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-03
  */
-interface ISysDeptService : BaseService<SysDept> {
-    fun testTransaction()
-}
+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-01-31
+ * @since 2018-02-03
  */
 interface ISysDeptUserService : BaseService<SysDeptUser>

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

@@ -0,0 +1,13 @@
+package com.gxzc.zen.api.sys.service
+
+import com.gxzc.zen.api.sys.model.SysDic
+import com.gxzc.zen.common.base.BaseService
+/**
+ * <p>
+ * 字典表 服务类
+ * </p>
+ *
+ * @author NorthLan123
+ * @since 2018-02-03
+ */
+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-01-31
+ * @since 2018-02-03
  */
 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-01-31
+ * @since 2018-02-03
  */
 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-01-31
+ * @since 2018-02-03
  */
 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-01-31
+ * @since 2018-02-03
  */
 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-01-31
+ * @since 2018-02-03
  */
 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-01-31
+ * @since 2018-02-03
  */
 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-01-31
+ * @since 2018-02-03
  */
 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-01-31
+ * @since 2018-02-03
  */
 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-01-31
+ * @since 2018-02-03
  */
 interface ISysUserRoleService : BaseService<SysUserRole>

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

@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-03
  */
 interface ISysUserService : BaseService<SysUser>

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

@@ -1,14 +1,10 @@
 package com.gxzc.zen.api.sys.service.impl
 
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import com.gxzc.zen.api.bus.model.MgrFonds
-import com.gxzc.zen.api.bus.service.IMgrFondsService
-import com.gxzc.zen.api.sys.mapper.SysDeptMapper
 import com.gxzc.zen.api.sys.model.SysDept
+import com.gxzc.zen.api.sys.mapper.SysDeptMapper
 import com.gxzc.zen.api.sys.service.ISysDeptService
-import org.springframework.beans.factory.annotation.Autowired
+import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
 
 /**
  * <p>
@@ -16,27 +12,9 @@ import org.springframework.transaction.annotation.Transactional
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-03
  */
 @Service
-open class SysDeptServiceImpl : ServiceImpl<SysDeptMapper, SysDept>(), ISysDeptService {
-
-    @Autowired
-    lateinit var mgrFondsService: IMgrFondsService
-
-    @Transactional
-    override fun testTransaction() {
-        baseMapper.insert(SysDept().also {
-            it.principal = "2333"
-            it.deptName = "1"
-            it.sort = 1
-        })
-
-        mgrFondsService.insert(MgrFonds().also {
-            it.fondsNo = "1"
-            it.fondsName = "name"
-        })
-//        throw RuntimeException("test")
-    }
+class SysDeptServiceImpl : ServiceImpl<SysDeptMapper, SysDept>(), ISysDeptService {
 
 }

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

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

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

@@ -0,0 +1,20 @@
+package com.gxzc.zen.api.sys.service.impl
+
+import com.gxzc.zen.api.sys.model.SysDic
+import com.gxzc.zen.api.sys.mapper.SysDicMapper
+import com.gxzc.zen.api.sys.service.ISysDicService
+import com.baomidou.mybatisplus.service.impl.ServiceImpl
+import org.springframework.stereotype.Service
+
+/**
+ * <p>
+ * 字典表 服务实现类
+ * </p>
+ *
+ * @author NorthLan123
+ * @since 2018-02-03
+ */
+@Service
+class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService {
+
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -12,9 +12,9 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-03
  */
 @Service
-open class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserService {
+class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserService {
 
 }

zen-api/src/main/resources/mapping/sys/SysDicMapper.xml

@@ -0,0 +1,19 @@
+<?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="com.gxzc.zen.api.sys.mapper.SysDicMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysDic">
+    <result column="id" property="id" />
+    <result column="enable" property="enable" />
+    <result column="remark" property="remark" />
+    <result column="create_time" property="createTime" />
+    <result column="create_by" property="createBy" />
+    <result column="update_time" property="updateTime" />
+    <result column="update_by" property="updateBy" />
+        <result column="key" property="key" />
+        <result column="value" property="value" />
+        <result column="sort" property="sort" />
+    </resultMap>
+
+</mapper>

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

@@ -25,10 +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"
-        // "jdbc:mysql://127.0.0.1:3306/archives_mgr?characterEncoding=utf8"
+//        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"
     })
 }
 

zen-orm/src/main/kotlin/com/gxzc/zen/orm/aop/DataSourceSwitchAspect.kt

@@ -34,6 +34,10 @@ class DataSourceSwitchAspect {
     fun zenServicePointCut() {
     }
 
+    @Pointcut("execution(* com.gxzc.zen.api..*Mapper.*(..))")
+    fun zenMapperPointCut() {
+    }
+
     @Pointcut("execution(* com.baomidou.mybatisplus..*Service.*(..))")
     fun mpServicePointCut() {
     }
@@ -60,9 +64,9 @@ class DataSourceSwitchAspect {
         }
     }
 
-    @Before("zenServicePointCut() || mpServicePointCut() || mpMapperPointCut()")
+    @Before("zenMapperPointCut() || mpMapperPointCut()")
     fun dynamicDataSource(joinPoint: JoinPoint) {
-        logger.debug("*Service/*ServiceImpl/*Mapper aspect...")
+        logger.debug("*Mapper aspect...")
         if (isAnnotationAspect) {
             return
         }
@@ -88,7 +92,7 @@ class DataSourceSwitchAspect {
         matchDataSource((joinPoint.signature as MethodSignature).method, packageName)
     }
 
-    @After("zenServicePointCut() || mpServicePointCut() || mpMapperPointCut()")
+    @After("zenMapperPointCut() || mpMapperPointCut()")
     fun afterDynamicDataSource() {
         DynamicMultipleDataSource.clear()
     }

zen-orm/src/main/kotlin/com/gxzc/zen/orm/config/MultipleDataSourceConfig.kt

@@ -47,23 +47,23 @@ class MultipleDataSourceConfig {
     @Bean(DSKey.DSKEY_SYS)
     @DependsOn(DSKey.DSKEY_SYS + "druid")
     @Primary
-    fun dataSourceSys(@Qualifier(DSKey.DSKEY_SYS + "druid") xaDataSource: XADataSource): DataSource {
+    fun dataSourceSys(): DataSource {
         return AtomikosDataSourceBean().also {
-            it.xaDataSource = xaDataSource
+            it.xaDataSource = dataSourceSysDruid()
         }
     }
 
     @Bean(DSKey.DSKEY_BUSINESS)
     @DependsOn(DSKey.DSKEY_BUSINESS + "druid")
-    fun dataSourceBus(@Qualifier(DSKey.DSKEY_BUSINESS + "druid") xaDataSource: XADataSource): DataSource {
+    fun dataSourceBus(): DataSource {
         return AtomikosDataSourceBean().also {
-            it.xaDataSource = xaDataSource
+            it.xaDataSource = dataSourceBusDruid()
         }
     }
 
     @Bean
     fun multipleDataSource(@Qualifier(DSKey.DSKEY_SYS) dataSourceSys: DataSource,
-                           @Qualifier(DSKey.DSKEY_SYS) dataSourceBus: DataSource): DynamicMultipleDataSource {
+                           @Qualifier(DSKey.DSKEY_BUSINESS) dataSourceBus: DataSource): DynamicMultipleDataSource {
         return DynamicMultipleDataSource().also {
             it.setTargetDataSources(mapOf(
                     Pair(DSKey.DSKEY_SYS, dataSourceSys),

zen-orm/src/main/resources/application-orm-local.yml

@@ -19,7 +19,7 @@ mybatis-plus:
     lazyLoadingEnabled: true #延时加载的开关
     multipleResultSetsEnabled: true #延时加载一个属性时会加载该对象全部属性，否则按需加载属性
     interceptors: com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+    # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
 
 
 ################## Alibaba Druid 配置 ##################
@@ -53,8 +53,8 @@ datasource:
     timeBetweenEvictionRunsMillis: 60000
     minEvictableIdleTimeMillis: 30000
   bus:
-    name: archives_rec
-    url: jdbc:mysql://127.0.0.1:3306/archives_rec?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
+    name: archives_bus
+    url: jdbc:mysql://127.0.0.1:3306/archives_mgr?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
     username: root
     password: root
     testWhileIdle: true

zen-web/src/main/kotlin/com/gxzc/zen/controller/ExampleController.kt

@@ -1,11 +1,8 @@
 package com.gxzc.zen.controller
 
-import com.gxzc.zen.api.sys.model.SysDept
-import com.gxzc.zen.api.sys.service.ISysDeptService
-import com.gxzc.zen.common.dto.ResultDto
+import com.gxzc.zen.api.bus.service.IMgrFondsService
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RestController
 
@@ -17,38 +14,10 @@ class ExampleController {
     }
 
     @Autowired
-    lateinit var sysDeptService: ISysDeptService
-
-//    @Autowired
-//    lateinit var sender: Sender
-
-    @GetMapping("test")
-//    @Transactional
-    fun test() {
-//        logger.info("a: {}", sysDeptService.selectCount(EntityWrapper<SysDept>().where("1","1000L")))
-//        logger.info("b: {}", sysDeptMapper.selectCount(EntityWrapper<SysDept>()))
-        sysDeptService.insert(SysDept().also {
-            it.deptName = "ahaha"
-            it.sort = 2
-            it.principal = "ab"
-        })
-    }
+    private lateinit var mgrFondsService: IMgrFondsService
 
     @GetMapping("testTransaction")
     fun testTransaction() {
-        sysDeptService.testTransaction()
-    }
-
-    @GetMapping("testMq")
-    fun testMq() {
-//        for (i in 1..10) {
-//            sender.send("msg $i")
-////            Thread.sleep(1000)
-//        }
-    }
-
-    @GetMapping("testDto")
-    fun testDto(): ResponseEntity<*> {
-        return ResponseEntity.ok(ResultDto(1, "haha", null))
+        mgrFondsService.testTransaction()
     }
 }

zen-web/src/main/resources/application.yml

@@ -6,7 +6,7 @@ server:
 spring:
   profiles:
     active: dev
-    include: orm,mq
+    include: orm-local,mq
 #  redis:
 #    host: localhost
 #    port: 6379