更新数据源切换方式,事务方面估计要使用分布式事务才得以满足需求了

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.bus.mapper
-
-import com.gxzc.zen.api.bus.model.MgrArchivesClassification
-import com.gxzc.zen.common.base.BaseMapper
-/**
- * <p>
- * 分类表 Mapper 接口
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-interface MgrArchivesClassificationMapper : BaseMapper<MgrArchivesClassification>

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.bus.mapper
-
-import com.gxzc.zen.api.bus.model.MgrArchivesDocument
-import com.gxzc.zen.common.base.BaseMapper
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-interface MgrArchivesDocumentMapper : BaseMapper<MgrArchivesDocument>

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.bus.mapper
-
-import com.gxzc.zen.api.bus.model.MgrArchivesElectronicRecord
-import com.gxzc.zen.common.base.BaseMapper
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-interface MgrArchivesElectronicRecordMapper : BaseMapper<MgrArchivesElectronicRecord>

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.bus.mapper
-
-import com.gxzc.zen.api.bus.model.MgrArchivesFile
-import com.gxzc.zen.common.base.BaseMapper
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-interface MgrArchivesFileMapper : BaseMapper<MgrArchivesFile>

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.bus.mapper
-
-import com.gxzc.zen.api.bus.model.MgrArchivesFileNote
-import com.gxzc.zen.common.base.BaseMapper
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-interface MgrArchivesFileNoteMapper : BaseMapper<MgrArchivesFileNote>

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.bus.mapper
-
-import com.gxzc.zen.api.bus.model.MgrArchivesRelation
-import com.gxzc.zen.common.base.BaseMapper
-/**
- * <p>
- * 目录树关系表 Mapper 接口
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-interface MgrArchivesRelationMapper : BaseMapper<MgrArchivesRelation>

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.bus.mapper
-
-import com.gxzc.zen.api.bus.model.MgrArchivesType
-import com.gxzc.zen.common.base.BaseMapper
-/**
- * <p>
- * 档案类型表 Mapper 接口
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-interface MgrArchivesTypeMapper : BaseMapper<MgrArchivesType>

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.bus.mapper
-
-import com.gxzc.zen.api.bus.model.MgrFonds
-import com.gxzc.zen.common.base.BaseMapper
-/**
- * <p>
- * 全宗表 Mapper 接口
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-interface MgrFondsMapper : BaseMapper<MgrFonds>

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

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

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

@@ -1,33 +0,0 @@
-package com.gxzc.zen.api.bus.model
-
-import com.baomidou.mybatisplus.annotations.TableName
-import com.gxzc.zen.common.base.BaseModel
-
-/**
- * <p>
- * 分类表
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-@TableName("mgr_archives_classification")
-data class MgrArchivesClassification(
-        /**
-         * 分类代码
-         */
-        var classificationCode: String? = null,
-        /**
-         * 分类名称
-         */
-        var name: String? = null,
-        /**
-         * 父ID
-         */
-        var parentId: Long? = null,
-        /**
-         * 连接符
-         */
-        var connectionCode: String? = null
-) : BaseModel() {
-}

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

@@ -1,218 +0,0 @@
-package com.gxzc.zen.api.bus.model
-
-import com.baomidou.mybatisplus.annotations.TableName
-import java.util.Date
-import com.gxzc.zen.common.base.BaseModel
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-@TableName("mgr_archives_document")
-data class MgrArchivesDocument(
-        /**
-         * 归档人
-         */
-        var filingBy: String? = null,
-        /**
-         * 归档日期
-         */
-        var filingTime: Date? = null,
-        /**
-         * 全宗号
-         */
-        var fondsNo: String? = null,
-        /**
-         * 案卷目录号
-         */
-        var catalogueCode: Int? = null,
-        /**
-         * 案卷号
-         */
-        var fileCode: String? = null,
-        /**
-         * 档号
-         */
-        var archivalCode: String? = null,
-        /**
-         * 页号
-         */
-        var pageCode: String? = null,
-        /**
-         * 件号
-         */
-        var partNo: String? = null,
-        /**
-         * 责任者
-         */
-        var responsiblePerson: String? = null,
-        /**
-         * 文件编号
-         */
-        var documentCode: String? = null,
-        /**
-         * 文件题名
-         */
-        var documentTitle: String? = null,
-        /**
-         * 页数
-         */
-        var pagesCount: Int? = null,
-        /**
-         * 成文时间
-         */
-        var writtenTime: Date? = null,
-        /**
-         * 年度
-         */
-        var year: String? = null,
-        /**
-         * 盒号
-         */
-        var boxCode: String? = null,
-        /**
-         * 密级。（0无密；1秘密；2机密；3绝密；）
-         */
-        var securityClassification: Int? = null,
-        /**
-         * 分类号
-         */
-        var archivesTypeCode: Int? = null,
-        /**
-         * 电子档案名称
-         */
-        var electronicRecordTitle: String? = null,
-        /**
-         * 主题词
-         */
-        var descriptor: String? = null,
-        /**
-         * 机构（问题）
-         */
-        var organizationProblem: String? = null,
-        /**
-         * 人物
-         */
-        var personage: String? = null,
-        /**
-         * 档案馆名称
-         */
-        var archivesName: String? = null,
-        /**
-         * 附件题名
-         */
-        var attachmentTitle: String? = null,
-        /**
-         * 控制标识
-         */
-        var controlSign: String? = null,
-        /**
-         * 档案馆代码
-         */
-        var archivesCode: String? = null,
-        /**
-         * 电子档案生成方式
-         */
-        var produceWay: String? = null,
-        /**
-         * 保密期限
-         */
-        var secrecyPeriod: Int? = null,
-        /**
-         * 保管期限
-         */
-        var retentionPeriod: Int? = null,
-        /**
-         * 档案归档状态（0未归档；1归档）
-         */
-        var filingStatus: Int? = null,
-        /**
-         * 删除标识（0未删除；1删除）
-         */
-        var delFlag: Int? = null,
-        /**
-         * 数字化时间
-         */
-        var digitizationTime: Date? = null,
-        /**
-         * 数字化对象描述
-         */
-        var digitizationObjDescribe: String? = null,
-        /**
-         * 数字化授权描述
-         */
-        var digitizationAuthorizeDescribe: String? = null,
-        /**
-         * 格式名称
-         */
-        var formatName: String? = null,
-        /**
-         * 格式版本
-         */
-        var formatVersion: String? = null,
-        /**
-         * 色彩空间
-         */
-        var colorSpace: String? = null,
-        /**
-         * 压缩方案
-         */
-        var compressScheme: String? = null,
-        /**
-         * 压缩率
-         */
-        var compressionRatio: String? = null,
-        /**
-         * 水平分辨率
-         */
-        var horizontalResolution: String? = null,
-        /**
-         * 垂直分辨率
-         */
-        var verticalResolution: String? = null,
-        /**
-         * 图像宽度
-         */
-        var imageWidth: String? = null,
-        /**
-         * 图像高度
-         */
-        var imageHeight: String? = null,
-        /**
-         * 设备类型
-         */
-        var equipmentType: String? = null,
-        /**
-         * 设备制造商
-         */
-        var equipmentManufacturer: String? = null,
-        /**
-         * 设备型号
-         */
-        var equipmentModel: String? = null,
-        /**
-         * 设备系列号
-         */
-        var equipmentSeriesNumber: String? = null,
-        /**
-         * 设备感光器
-         */
-        var equipmentPhotoreceptor: String? = null,
-        /**
-         * 数字化软件名称
-         */
-        var digitalSoftwareName: String? = null,
-        /**
-         * 数字化软件版本
-         */
-        var digitalSoftwareVersion: String? = null,
-        /**
-         * 数字化软件生产商
-         */
-        var digitalSoftwareManufacturer: String? = null
-) : BaseModel() {
-}

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

@@ -1,29 +0,0 @@
-package com.gxzc.zen.api.bus.model
-
-import com.baomidou.mybatisplus.annotations.TableName
-import com.gxzc.zen.common.base.BaseModel
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-@TableName("mgr_archives_electronic_record")
-data class MgrArchivesElectronicRecord(
-        /**
-         * 文件id（mgr_archives_document表的id）
-         */
-        var documentId: Long? = null,
-        /**
-         * 电子文件标题
-         */
-        var electronicRecordTitle: String? = null,
-        /**
-         * 挂接配置名
-         */
-        var connectConfigureName: String? = null
-) : BaseModel() {
-}

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

@@ -1,125 +0,0 @@
-package com.gxzc.zen.api.bus.model
-
-import com.baomidou.mybatisplus.annotations.TableName
-import java.util.Date
-import com.baomidou.mybatisplus.annotations.TableField
-import com.gxzc.zen.common.base.BaseModel
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-@TableName("mgr_archives_file")
-data class MgrArchivesFile(
-        /**
-         * 归档人
-         */
-        var filingBy: String? = null,
-        /**
-         * 归档日期
-         */
-        var filingTime: Date? = null,
-        /**
-         * 案卷级档号
-         */
-        var archivalCode: String? = null,
-        /**
-         * 全宗号
-         */
-        var fondsNo: String? = null,
-        var fondsName: String? = null,
-        /**
-         * 目录号
-         */
-        var catalogueCode: Int? = null,
-        /**
-         * 案卷号
-         */
-        var fileCode: Int? = null,
-        /**
-         * 年度
-         */
-        var year: String? = null,
-        /**
-         * 保管期限
-         */
-        var retentionPeriod: Int? = null,
-        /**
-         * 保管期限代码
-         */
-        var retentionPeriodCode: String? = null,
-        /**
-         * 案卷题名
-         */
-        var fileTitle: String? = null,
-        /**
-         * 起时间
-         */
-        var startTime: Date? = null,
-        /**
-         * 止时间
-         */
-        var endTime: Date? = null,
-        /**
-         * 责任者
-         */
-        var responsiblePerson: String? = null,
-        /**
-         * 成文时间
-         */
-        var writtenTime: Date? = null,
-        /**
-         * 页数
-         */
-        var pagesCount: Int? = null,
-        /**
-         * 文件件数
-         */
-        var documentCount: Int? = null,
-        /**
-         * 人物
-         */
-        var personage: String? = null,
-        /**
-         * 盒号
-         */
-        var boxCode: String? = null,
-        /**
-         * 保密期限
-         */
-        var secrecyPeriod: Int? = null,
-        /**
-         * 密级（0无密；1秘密；2机密；3绝密；）
-         */
-        var securityClassification: String? = null,
-        /**
-         * 档案馆名称
-         */
-        var archivesName: String? = null,
-        /**
-         * 主题词
-         */
-        var descriptor: String? = null,
-        /**
-         * 档案馆代码
-         */
-        var archivesCode: String? = null,
-        /**
-         * 附件题名
-         */
-        var attachmentTitle: String? = null,
-        /**
-         * RFID
-         */
-        @TableField("RFID")
-        var rfid: String? = null,
-        /**
-         * 归档状态（0：未归档，1归档）
-         */
-        var filingStatus: Int? = null
-) : BaseModel() {
-}

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

@@ -1,37 +0,0 @@
-package com.gxzc.zen.api.bus.model
-
-import com.baomidou.mybatisplus.annotations.TableName
-import com.gxzc.zen.common.base.BaseModel
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-@TableName("mgr_archives_file_note")
-data class MgrArchivesFileNote(
-        /**
-         * 全宗名称
-         */
-        var fondsName: String? = null,
-        /**
-         * 全宗号
-         */
-        var fondsNo: String? = null,
-        /**
-         * 档案说明
-         */
-        var detail: String? = null,
-        /**
-         * 整理人
-         */
-        var collator: String? = null,
-        /**
-         * 检查人
-         */
-        var inspector: String? = null
-) : BaseModel() {
-}

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

@@ -1,29 +0,0 @@
-package com.gxzc.zen.api.bus.model
-
-import com.baomidou.mybatisplus.annotations.TableName
-import com.gxzc.zen.common.base.BaseModel
-
-/**
- * <p>
- * 目录树关系表
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-@TableName("mgr_archives_relation")
-data class MgrArchivesRelation(
-        /**
-         * 分类id
-         */
-        var classificationId: Long? = null,
-        /**
-         * 全宗ID
-         */
-        var fondsId: Long? = null,
-        /**
-         * 档案类型ID
-         */
-        var typeId: Long? = null
-) : BaseModel() {
-}

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

@@ -1,29 +0,0 @@
-package com.gxzc.zen.api.bus.model
-
-import com.baomidou.mybatisplus.annotations.TableName
-import com.gxzc.zen.common.base.BaseModel
-
-/**
- * <p>
- * 档案类型表
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-@TableName("mgr_archives_type")
-data class MgrArchivesType(
-        /**
-         * 档案类型代码
-         */
-        var typeCode: String? = null,
-        /**
-         * 类型名
-         */
-        var name: String? = null,
-        /**
-         * 父ID
-         */
-        var parentId: Long? = null
-) : BaseModel() {
-}

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

@@ -1,25 +0,0 @@
-package com.gxzc.zen.api.bus.model
-
-import com.baomidou.mybatisplus.annotations.TableName
-import com.gxzc.zen.common.base.BaseModel
-
-/**
- * <p>
- * 全宗表
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-@TableName("mgr_fonds")
-data class MgrFonds(
-        /**
-         * 全宗号
-         */
-        var fondsNo: String? = null,
-        /**
-         * 全宗名
-         */
-        var fondsName: String? = null
-) : BaseModel() {
-}

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

@@ -1,4 +1,4 @@
-package com.gxzc.zen.api.sys.model
+package com.gxzc.zen.api.bus.model
 
 import com.baomidou.mybatisplus.annotations.TableName
 import com.gxzc.zen.common.base.BaseModel
@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-02
  */
 @TableName("sys_dic")
 data class SysDic(

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.bus.service
-
-import com.gxzc.zen.api.bus.model.MgrArchivesClassification
-import com.gxzc.zen.common.base.BaseService
-/**
- * <p>
- * 分类表 服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-interface IMgrArchivesClassificationService : BaseService<MgrArchivesClassification>

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.bus.service
-
-import com.gxzc.zen.api.bus.model.MgrArchivesDocument
-import com.gxzc.zen.common.base.BaseService
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-interface IMgrArchivesDocumentService : BaseService<MgrArchivesDocument>

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.bus.service
-
-import com.gxzc.zen.api.bus.model.MgrArchivesElectronicRecord
-import com.gxzc.zen.common.base.BaseService
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-interface IMgrArchivesElectronicRecordService : BaseService<MgrArchivesElectronicRecord>

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.bus.service
-
-import com.gxzc.zen.api.bus.model.MgrArchivesFileNote
-import com.gxzc.zen.common.base.BaseService
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-interface IMgrArchivesFileNoteService : BaseService<MgrArchivesFileNote>

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.bus.service
-
-import com.gxzc.zen.api.bus.model.MgrArchivesFile
-import com.gxzc.zen.common.base.BaseService
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-interface IMgrArchivesFileService : BaseService<MgrArchivesFile>

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.bus.service
-
-import com.gxzc.zen.api.bus.model.MgrArchivesRelation
-import com.gxzc.zen.common.base.BaseService
-/**
- * <p>
- * 目录树关系表 服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-interface IMgrArchivesRelationService : BaseService<MgrArchivesRelation>

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.bus.service
-
-import com.gxzc.zen.api.bus.model.MgrArchivesType
-import com.gxzc.zen.common.base.BaseService
-/**
- * <p>
- * 档案类型表 服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-interface IMgrArchivesTypeService : BaseService<MgrArchivesType>

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

@@ -1,13 +0,0 @@
-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-01
- */
-interface IMgrFondsService : BaseService<MgrFonds>

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

@@ -1,6 +1,6 @@
-package com.gxzc.zen.api.sys.service
+package com.gxzc.zen.api.bus.service
 
-import com.gxzc.zen.api.sys.model.SysDic
+import com.gxzc.zen.api.bus.model.SysDic
 import com.gxzc.zen.common.base.BaseService
 /**
  * <p>
@@ -8,6 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-02
  */
 interface ISysDicService : BaseService<SysDic>

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

@@ -1,20 +0,0 @@
-package com.gxzc.zen.api.bus.service.impl
-
-import com.gxzc.zen.api.bus.model.MgrArchivesClassification
-import com.gxzc.zen.api.bus.mapper.MgrArchivesClassificationMapper
-import com.gxzc.zen.api.bus.service.IMgrArchivesClassificationService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import org.springframework.stereotype.Service
-
-/**
- * <p>
- * 分类表 服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-@Service
-open class MgrArchivesClassificationServiceImpl : ServiceImpl<MgrArchivesClassificationMapper, MgrArchivesClassification>(), IMgrArchivesClassificationService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.gxzc.zen.api.bus.service.impl
-
-import com.gxzc.zen.api.bus.model.MgrArchivesDocument
-import com.gxzc.zen.api.bus.mapper.MgrArchivesDocumentMapper
-import com.gxzc.zen.api.bus.service.IMgrArchivesDocumentService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import org.springframework.stereotype.Service
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-@Service
-open class MgrArchivesDocumentServiceImpl : ServiceImpl<MgrArchivesDocumentMapper, MgrArchivesDocument>(), IMgrArchivesDocumentService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.gxzc.zen.api.bus.service.impl
-
-import com.gxzc.zen.api.bus.model.MgrArchivesElectronicRecord
-import com.gxzc.zen.api.bus.mapper.MgrArchivesElectronicRecordMapper
-import com.gxzc.zen.api.bus.service.IMgrArchivesElectronicRecordService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import org.springframework.stereotype.Service
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-@Service
-open class MgrArchivesElectronicRecordServiceImpl : ServiceImpl<MgrArchivesElectronicRecordMapper, MgrArchivesElectronicRecord>(), IMgrArchivesElectronicRecordService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.gxzc.zen.api.bus.service.impl
-
-import com.gxzc.zen.api.bus.model.MgrArchivesFileNote
-import com.gxzc.zen.api.bus.mapper.MgrArchivesFileNoteMapper
-import com.gxzc.zen.api.bus.service.IMgrArchivesFileNoteService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import org.springframework.stereotype.Service
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-@Service
-open class MgrArchivesFileNoteServiceImpl : ServiceImpl<MgrArchivesFileNoteMapper, MgrArchivesFileNote>(), IMgrArchivesFileNoteService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.gxzc.zen.api.bus.service.impl
-
-import com.gxzc.zen.api.bus.model.MgrArchivesFile
-import com.gxzc.zen.api.bus.mapper.MgrArchivesFileMapper
-import com.gxzc.zen.api.bus.service.IMgrArchivesFileService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import org.springframework.stereotype.Service
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-@Service
-open class MgrArchivesFileServiceImpl : ServiceImpl<MgrArchivesFileMapper, MgrArchivesFile>(), IMgrArchivesFileService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.gxzc.zen.api.bus.service.impl
-
-import com.gxzc.zen.api.bus.model.MgrArchivesRelation
-import com.gxzc.zen.api.bus.mapper.MgrArchivesRelationMapper
-import com.gxzc.zen.api.bus.service.IMgrArchivesRelationService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import org.springframework.stereotype.Service
-
-/**
- * <p>
- * 目录树关系表 服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-@Service
-open class MgrArchivesRelationServiceImpl : ServiceImpl<MgrArchivesRelationMapper, MgrArchivesRelation>(), IMgrArchivesRelationService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.gxzc.zen.api.bus.service.impl
-
-import com.gxzc.zen.api.bus.model.MgrArchivesType
-import com.gxzc.zen.api.bus.mapper.MgrArchivesTypeMapper
-import com.gxzc.zen.api.bus.service.IMgrArchivesTypeService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import org.springframework.stereotype.Service
-
-/**
- * <p>
- * 档案类型表 服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-@Service
-open class MgrArchivesTypeServiceImpl : ServiceImpl<MgrArchivesTypeMapper, MgrArchivesType>(), IMgrArchivesTypeService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.gxzc.zen.api.bus.service.impl
-
-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 org.springframework.stereotype.Service
-
-/**
- * <p>
- * 全宗表 服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-01
- */
-@Service
-open class MgrFondsServiceImpl : ServiceImpl<MgrFondsMapper, MgrFonds>(), IMgrFondsService {
-
-}

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

@@ -1,8 +1,8 @@
-package com.gxzc.zen.api.sys.service.impl
+package com.gxzc.zen.api.bus.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.gxzc.zen.api.bus.model.SysDic
+import com.gxzc.zen.api.bus.mapper.SysDicMapper
+import com.gxzc.zen.api.bus.service.ISysDicService
 import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import org.springframework.stereotype.Service
 
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-31
+ * @since 2018-02-02
  */
 @Service
 open class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService {

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

@@ -2,6 +2,8 @@ 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 接口
@@ -10,4 +12,5 @@ import com.gxzc.zen.common.base.BaseMapper
  * @author NorthLan123
  * @since 2018-01-31
  */
+@Repository
 interface SysParamMapper : BaseMapper<SysParam>

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

@@ -2,6 +2,7 @@ package com.gxzc.zen.api.sys.service
 
 import com.gxzc.zen.api.sys.model.SysDept
 import com.gxzc.zen.common.base.BaseService
+
 /**
  * <p>
  * 部门管理 服务类
@@ -10,4 +11,6 @@ import com.gxzc.zen.common.base.BaseService
  * @author NorthLan123
  * @since 2018-01-31
  */
-interface ISysDeptService : BaseService<SysDept>
+interface ISysDeptService : BaseService<SysDept> {
+    fun testTransaction()
+}

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

@@ -1,10 +1,15 @@
 package com.gxzc.zen.api.sys.service.impl
 
-import com.gxzc.zen.api.sys.model.SysDept
+import com.baomidou.mybatisplus.service.impl.ServiceImpl
+import com.gxzc.zen.api.bus.mapper.SysDicMapper
+import com.gxzc.zen.api.bus.model.SysDic
 import com.gxzc.zen.api.sys.mapper.SysDeptMapper
+import com.gxzc.zen.api.sys.mapper.SysParamMapper
+import com.gxzc.zen.api.sys.model.SysDept
 import com.gxzc.zen.api.sys.service.ISysDeptService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
 
 /**
  * <p>
@@ -17,4 +22,31 @@ import org.springframework.stereotype.Service
 @Service
 open class SysDeptServiceImpl : ServiceImpl<SysDeptMapper, SysDept>(), ISysDeptService {
 
+    @Autowired
+    lateinit var sysParamMapper: SysParamMapper
+
+    @Autowired
+    lateinit var sysDicMapper: SysDicMapper
+
+    @Transactional
+    override fun testTransaction() {
+        baseMapper.insert(SysDept().also {
+            it.principal = "2333"
+            it.deptName = "1"
+            it.sort = 1
+        })
+
+        sysDicMapper.insert(SysDic().also {
+            it.key = "haha"
+            it.sort = 1
+            it.value = "hehehehehehe"
+        })
+
+//        sysParamMapper.insert(SysParam().also {
+//            it.key = "tesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesettesetteset"
+//            it.value = "haode"
+//            it.sort = 1
+//        })
+    }
+
 }

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

@@ -1,20 +0,0 @@
-<?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.bus.mapper.MgrArchivesClassificationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.bus.model.MgrArchivesClassification">
-    <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="classification_code" property="classificationCode" />
-        <result column="name" property="name" />
-        <result column="parent_id" property="parentId" />
-        <result column="connection_code" property="connectionCode" />
-    </resultMap>
-
-</mapper>

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

@@ -1,66 +0,0 @@
-<?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.bus.mapper.MgrArchivesDocumentMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.bus.model.MgrArchivesDocument">
-    <result column="id" property="id" />
-    <result column="enable" property="enable" />
-    <result column="remark" property="remark" />
-    <result column="create_by" property="createBy" />
-    <result column="create_time" property="createTime" />
-    <result column="update_by" property="updateBy" />
-    <result column="update_time" property="updateTime" />
-        <result column="filing_by" property="filingBy" />
-        <result column="filing_time" property="filingTime" />
-        <result column="fonds_no" property="fondsNo" />
-        <result column="catalogue_code" property="catalogueCode" />
-        <result column="file_code" property="fileCode" />
-        <result column="archival_code" property="archivalCode" />
-        <result column="page_code" property="pageCode" />
-        <result column="part_no" property="partNo" />
-        <result column="responsible_person" property="responsiblePerson" />
-        <result column="document_code" property="documentCode" />
-        <result column="document_title" property="documentTitle" />
-        <result column="pages_count" property="pagesCount" />
-        <result column="written_time" property="writtenTime" />
-        <result column="year" property="year" />
-        <result column="box_code" property="boxCode" />
-        <result column="security_classification" property="securityClassification" />
-        <result column="archives_type_code" property="archivesTypeCode" />
-        <result column="electronic_record_title" property="electronicRecordTitle" />
-        <result column="descriptor" property="descriptor" />
-        <result column="organization_problem" property="organizationProblem" />
-        <result column="personage" property="personage" />
-        <result column="archives_name" property="archivesName" />
-        <result column="attachment_title" property="attachmentTitle" />
-        <result column="control_sign" property="controlSign" />
-        <result column="archives_code" property="archivesCode" />
-        <result column="produce_way" property="produceWay" />
-        <result column="secrecy_period" property="secrecyPeriod" />
-        <result column="retention_period" property="retentionPeriod" />
-        <result column="filing_status" property="filingStatus" />
-        <result column="del_flag" property="delFlag" />
-        <result column="digitization_time" property="digitizationTime" />
-        <result column="digitization_obj_describe" property="digitizationObjDescribe" />
-        <result column="digitization_authorize_describe" property="digitizationAuthorizeDescribe" />
-        <result column="format_name" property="formatName" />
-        <result column="format_version" property="formatVersion" />
-        <result column="color_space" property="colorSpace" />
-        <result column="compress_scheme" property="compressScheme" />
-        <result column="compression_ratio" property="compressionRatio" />
-        <result column="horizontal_resolution" property="horizontalResolution" />
-        <result column="vertical_resolution" property="verticalResolution" />
-        <result column="image_width" property="imageWidth" />
-        <result column="image_height" property="imageHeight" />
-        <result column="equipment_type" property="equipmentType" />
-        <result column="equipment_manufacturer" property="equipmentManufacturer" />
-        <result column="equipment_model" property="equipmentModel" />
-        <result column="equipment_series_number" property="equipmentSeriesNumber" />
-        <result column="equipment_photoreceptor" property="equipmentPhotoreceptor" />
-        <result column="digital_software_name" property="digitalSoftwareName" />
-        <result column="digital_software_version" property="digitalSoftwareVersion" />
-        <result column="digital_software_manufacturer" property="digitalSoftwareManufacturer" />
-    </resultMap>
-
-</mapper>

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

@@ -1,19 +0,0 @@
-<?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.bus.mapper.MgrArchivesElectronicRecordMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.bus.model.MgrArchivesElectronicRecord">
-    <result column="id" property="id" />
-    <result column="enable" property="enable" />
-    <result column="remark" property="remark" />
-    <result column="create_by" property="createBy" />
-    <result column="create_time" property="createTime" />
-    <result column="update_by" property="updateBy" />
-    <result column="update_time" property="updateTime" />
-        <result column="document_id" property="documentId" />
-        <result column="electronic_record_title" property="electronicRecordTitle" />
-        <result column="connect_configure_name" property="connectConfigureName" />
-    </resultMap>
-
-</mapper>

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

@@ -1,43 +0,0 @@
-<?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.bus.mapper.MgrArchivesFileMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.bus.model.MgrArchivesFile">
-    <result column="id" property="id" />
-    <result column="enable" property="enable" />
-    <result column="remark" property="remark" />
-    <result column="create_by" property="createBy" />
-    <result column="create_time" property="createTime" />
-    <result column="update_by" property="updateBy" />
-    <result column="update_time" property="updateTime" />
-        <result column="filing_by" property="filingBy" />
-        <result column="filing_time" property="filingTime" />
-        <result column="archival_code" property="archivalCode" />
-        <result column="fonds_no" property="fondsNo" />
-        <result column="fonds_name" property="fondsName" />
-        <result column="catalogue_code" property="catalogueCode" />
-        <result column="file_code" property="fileCode" />
-        <result column="year" property="year" />
-        <result column="retention_period" property="retentionPeriod" />
-        <result column="retention_period_code" property="retentionPeriodCode" />
-        <result column="file_title" property="fileTitle" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="responsible_person" property="responsiblePerson" />
-        <result column="written_time" property="writtenTime" />
-        <result column="pages_count" property="pagesCount" />
-        <result column="document_count" property="documentCount" />
-        <result column="personage" property="personage" />
-        <result column="box_code" property="boxCode" />
-        <result column="secrecy_period" property="secrecyPeriod" />
-        <result column="security_classification" property="securityClassification" />
-        <result column="archives_name" property="archivesName" />
-        <result column="descriptor" property="descriptor" />
-        <result column="archives_code" property="archivesCode" />
-        <result column="attachment_title" property="attachmentTitle" />
-        <result column="RFID" property="rfid" />
-        <result column="filing_status" property="filingStatus" />
-    </resultMap>
-
-</mapper>

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

@@ -1,21 +0,0 @@
-<?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.bus.mapper.MgrArchivesFileNoteMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.bus.model.MgrArchivesFileNote">
-    <result column="id" property="id" />
-    <result column="enable" property="enable" />
-    <result column="remark" property="remark" />
-    <result column="create_by" property="createBy" />
-    <result column="create_time" property="createTime" />
-    <result column="update_by" property="updateBy" />
-    <result column="update_time" property="updateTime" />
-        <result column="fonds_name" property="fondsName" />
-        <result column="fonds_no" property="fondsNo" />
-        <result column="detail" property="detail" />
-        <result column="collator" property="collator" />
-        <result column="inspector" property="inspector" />
-    </resultMap>
-
-</mapper>

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

@@ -1,19 +0,0 @@
-<?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.bus.mapper.MgrArchivesRelationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.bus.model.MgrArchivesRelation">
-    <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="classification_id" property="classificationId" />
-        <result column="fonds_id" property="fondsId" />
-        <result column="type_id" property="typeId" />
-    </resultMap>
-
-</mapper>

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

@@ -1,19 +0,0 @@
-<?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.bus.mapper.MgrArchivesTypeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.bus.model.MgrArchivesType">
-    <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="type_code" property="typeCode" />
-        <result column="name" property="name" />
-        <result column="parent_id" property="parentId" />
-    </resultMap>
-
-</mapper>

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

@@ -1,18 +0,0 @@
-<?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.bus.mapper.MgrFondsMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.bus.model.MgrFonds">
-    <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="fonds_no" property="fondsNo" />
-        <result column="fonds_name" property="fondsName" />
-    </resultMap>
-
-</mapper>

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

@@ -1,9 +1,9 @@
 <?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">
+<mapper namespace="com.gxzc.zen.api.bus.mapper.SysDicMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysDic">
+    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.bus.model.SysDic">
     <result column="id" property="id" />
     <result column="enable" property="enable" />
     <result column="remark" property="remark" />

zen-mq/src/main/kotlin/com/gxzc/zen/mq/config/RabbitConfig.kt

@@ -1,33 +1,33 @@
-package com.gxzc.zen.mq.config
-
-import org.springframework.amqp.core.Binding
-import org.springframework.amqp.core.BindingBuilder
-import org.springframework.amqp.core.Queue
-import org.springframework.amqp.core.TopicExchange
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-
-/**
- *
- * @author NorthLan
- * @date 2018/1/31
- * @url https://noahlan.com
- */
-@Configuration
-class RabbitConfig {
-
-    @Bean
-    fun queue(): Queue {
-        return Queue("q1")
-    }
-
-    @Bean
-    fun topicExchange(): TopicExchange {
-        return TopicExchange("te")
-    }
-
-    @Bean
-    fun binding(queue: Queue, topicExchange: TopicExchange): Binding {
-        return BindingBuilder.bind(queue).to(topicExchange).with("key.1")
-    }
-}
+//package com.gxzc.zen.mq.config
+//
+//import org.springframework.amqp.core.Binding
+//import org.springframework.amqp.core.BindingBuilder
+//import org.springframework.amqp.core.Queue
+//import org.springframework.amqp.core.TopicExchange
+//import org.springframework.context.annotation.Bean
+//import org.springframework.context.annotation.Configuration
+//
+///**
+// *
+// * @author NorthLan
+// * @date 2018/1/31
+// * @url https://noahlan.com
+// */
+//@Configuration
+//class RabbitConfig {
+//
+//    @Bean
+//    fun queue(): Queue {
+//        return Queue("q1")
+//    }
+//
+//    @Bean
+//    fun topicExchange(): TopicExchange {
+//        return TopicExchange("te")
+//    }
+//
+//    @Bean
+//    fun binding(queue: Queue, topicExchange: TopicExchange): Binding {
+//        return BindingBuilder.bind(queue).to(topicExchange).with("key.1")
+//    }
+//}

zen-mq/src/main/kotlin/com/gxzc/zen/mq/consumer/Receiver.kt

@@ -1,24 +1,24 @@
-package com.gxzc.zen.mq.consumer
-
-import org.slf4j.LoggerFactory
-import org.springframework.amqp.rabbit.annotation.RabbitListener
-import org.springframework.stereotype.Component
-
-/**
- *
- * @author NorthLan
- * @date 2018/1/31
- * @url https://noahlan.com
- */
-@Component
-class Receiver {
-    companion object {
-        val logger = LoggerFactory.getLogger(Receiver::class.java)!!
-    }
-
-    @RabbitListener(queues = ["q1"])
-    fun processMessage(msg: String): String {
-        logger.info("接收到来自q1的消息:{}", msg)
-        return msg
-    }
-}
+//package com.gxzc.zen.mq.consumer
+//
+//import org.slf4j.LoggerFactory
+//import org.springframework.amqp.rabbit.annotation.RabbitListener
+//import org.springframework.stereotype.Component
+//
+///**
+// *
+// * @author NorthLan
+// * @date 2018/1/31
+// * @url https://noahlan.com
+// */
+//@Component
+//class Receiver {
+//    companion object {
+//        val logger = LoggerFactory.getLogger(Receiver::class.java)!!
+//    }
+//
+//    @RabbitListener(queues = ["q1"])
+//    fun processMessage(msg: String): String {
+//        logger.info("接收到来自q1的消息:{}", msg)
+//        return msg
+//    }
+//}

zen-mq/src/main/kotlin/com/gxzc/zen/mq/publisher/Sender.kt

@@ -1,51 +1,51 @@
-package com.gxzc.zen.mq.publisher
-
-import org.slf4j.LoggerFactory
-import org.springframework.amqp.core.Message
-import org.springframework.amqp.rabbit.core.RabbitTemplate
-import org.springframework.amqp.rabbit.support.CorrelationData
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Component
-import javax.annotation.PostConstruct
-
-
-/**
- *
- * @author NorthLan
- * @date 2018/1/31
- * @url https://noahlan.com
- */
-@Component
-class Sender : RabbitTemplate.ConfirmCallback, RabbitTemplate.ReturnCallback {
-    companion object {
-        val logger = LoggerFactory.getLogger(Sender::class.java)
-    }
-
-    @Autowired
-    private lateinit var rabbitTemplate: RabbitTemplate
-
-    @PostConstruct
-    fun init() {
-        rabbitTemplate.setConfirmCallback(this)
-        rabbitTemplate.setReturnCallback(this)
-    }
-
-    override fun returnedMessage(message: Message, replyCode: Int, replyText: String?, exchange: String?, routingKey: String?) {
-        logger.info(message.messageProperties.correlationIdString + " 发送失败")
-    }
-
-    override fun confirm(correlationData: CorrelationData?, ack: Boolean, cause: String?) {
-        if (ack) {
-            logger.info("消息发送成功:" + correlationData)
-        } else {
-            logger.info("消息发送失败:" + cause)
-        }
-    }
-
-    fun send(msg: String) {
-        val correlationData = CorrelationData("2333")
-        logger.info("发消息: {}", msg)
-        val response = rabbitTemplate.convertSendAndReceive("te", "key.1", msg, correlationData).toString()
-        logger.info("回执: {}", response)
-    }
-}
+//package com.gxzc.zen.mq.publisher
+//
+//import org.slf4j.LoggerFactory
+//import org.springframework.amqp.core.Message
+//import org.springframework.amqp.rabbit.core.RabbitTemplate
+//import org.springframework.amqp.rabbit.support.CorrelationData
+//import org.springframework.beans.factory.annotation.Autowired
+//import org.springframework.stereotype.Component
+//import javax.annotation.PostConstruct
+//
+//
+///**
+// *
+// * @author NorthLan
+// * @date 2018/1/31
+// * @url https://noahlan.com
+// */
+//@Component
+//class Sender : RabbitTemplate.ConfirmCallback, RabbitTemplate.ReturnCallback {
+//    companion object {
+//        val logger = LoggerFactory.getLogger(Sender::class.java)
+//    }
+//
+//    @Autowired
+//    private lateinit var rabbitTemplate: RabbitTemplate
+//
+//    @PostConstruct
+//    fun init() {
+//        rabbitTemplate.setConfirmCallback(this)
+//        rabbitTemplate.setReturnCallback(this)
+//    }
+//
+//    override fun returnedMessage(message: Message, replyCode: Int, replyText: String?, exchange: String?, routingKey: String?) {
+//        logger.info(message.messageProperties.correlationIdString + " 发送失败")
+//    }
+//
+//    override fun confirm(correlationData: CorrelationData?, ack: Boolean, cause: String?) {
+//        if (ack) {
+//            logger.info("消息发送成功:" + correlationData)
+//        } else {
+//            logger.info("消息发送失败:" + cause)
+//        }
+//    }
+//
+//    fun send(msg: String) {
+//        val correlationData = CorrelationData("2333")
+//        logger.info("发消息: {}", msg)
+//        val response = rabbitTemplate.convertSendAndReceive("te", "key.1", msg, correlationData).toString()
+//        logger.info("回执: {}", response)
+//    }
+//}

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

@@ -11,4 +11,5 @@ spring:
     listener:
       simple:
         concurrency: 2 # 最小消息监听线程数
-        max-concurrency: 2 # 最大消息监听线程数
+        max-concurrency: 2 # 最大消息监听线程数
+    virtual-host: /

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

@@ -25,9 +25,9 @@ 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.username = "root"// "archives"
+        it.password = "root"// "archives"
+        it.url = "jdbc:mysql://127.0.0.1:3306/archives_rec?characterEncoding=utf8" // "jdbc:mysql://192.168.1.124:3307/archives_mgr?characterEncoding=utf8"
     })
 }
 

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

@@ -1,14 +1,11 @@
-package com.gxzc.zen.orm.aspect
+package com.gxzc.zen.orm.aop
 
 import com.gxzc.zen.orm.DynamicMultipleDataSource
 import com.gxzc.zen.orm.annotation.DynamicDataSource
 import com.gxzc.zen.orm.contants.DSKey
 import org.aspectj.lang.JoinPoint
 import org.aspectj.lang.ProceedingJoinPoint
-import org.aspectj.lang.annotation.Around
-import org.aspectj.lang.annotation.Aspect
-import org.aspectj.lang.annotation.Before
-import org.aspectj.lang.annotation.Pointcut
+import org.aspectj.lang.annotation.*
 import org.aspectj.lang.reflect.MethodSignature
 import org.slf4j.LoggerFactory
 import org.springframework.core.annotation.Order
@@ -21,9 +18,12 @@ import java.lang.reflect.Method
  */
 @Suppress("unused")
 @Aspect
-@Order(-100) // 保证先于事务执行
+@Order(-1) // 保证先于事务执行
 @Component
 class DataSourceSwitchAspect {
+    init {
+        logger.debug("${this::class.java.simpleName} initialized...")
+    }
     companion object {
         private val logger = LoggerFactory.getLogger(DataSourceSwitchAspect::class.java)
     }
@@ -48,6 +48,7 @@ class DataSourceSwitchAspect {
 
     @Around("annotationCut()")
     fun annotationAround(joinPoint: ProceedingJoinPoint): Any? {
+        logger.debug("@DynamicDatasource aspect...")
         isAnnotationAspect = true
         val method = (joinPoint.signature as MethodSignature).method
         setDataSource(method, DSKey.DSKEY_SYS)
@@ -61,6 +62,7 @@ class DataSourceSwitchAspect {
 
     @Before("zenServicePointCut() || mpServicePointCut() || mpMapperPointCut()")
     fun dynamicDataSource(joinPoint: JoinPoint) {
+        logger.debug("*Service/*ServiceImpl/*Mapper aspect...")
         if (isAnnotationAspect) {
             return
         }
@@ -86,10 +88,18 @@ class DataSourceSwitchAspect {
         matchDataSource((joinPoint.signature as MethodSignature).method, packageName)
     }
 
+    @After("zenServicePointCut() || mpServicePointCut() || mpMapperPointCut()")
+    fun afterDynamicDataSource() {
+        DynamicMultipleDataSource.clear()
+    }
+
     private fun matchDataSource(method: Method, packageName: String) {
         DSKey.values()
                 .filter { it.pkgName in packageName }
-                .forEach { setDataSource(method, it.dsKey) }
+                .forEach {
+                    setDataSource(method, it.dsKey)
+                    logger.debug("setDataSource: {}", it.dsKey)
+                }
     }
 
     /**

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

@@ -12,6 +12,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Primary
+import org.springframework.core.annotation.Order
 import org.springframework.jdbc.datasource.DataSourceTransactionManager
 import org.springframework.transaction.PlatformTransactionManager
 import org.springframework.transaction.annotation.TransactionManagementConfigurer
@@ -23,7 +24,7 @@ import javax.sql.DataSource
  */
 @Configuration
 @EnableConfigurationProperties(MybatisPlusProperties::class)
-class MultipleDataSourceConfig : TransactionManagementConfigurer{
+class MultipleDataSourceConfig : TransactionManagementConfigurer {
 
     @Autowired
     private lateinit var properties: MybatisPlusProperties
@@ -54,6 +55,7 @@ class MultipleDataSourceConfig : TransactionManagementConfigurer{
     }
 
     @Bean
+    @Order(3)
     fun transactionManager(): PlatformTransactionManager {
         return DataSourceTransactionManager(multipleDataSource())
     }

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

@@ -13,8 +13,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement
  * @author NorthLan at 2018/1/30
  */
 @Configuration
-//@EnableTransactionManagement
 @MapperScan("com.gxzc.zen.api.*.mapper")
+@EnableTransactionManagement(order = 2)
 class MybatisPlusConfig {
 
     /**

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

@@ -1,138 +1,148 @@
-//package com.gxzc.zen.orm.config
-//
-//import com.gxzc.zen.orm.DataSourceSwitchMethodInterceptor
-//import org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator
-//import org.springframework.context.annotation.Bean
-//import org.springframework.context.annotation.Configuration
-//import org.springframework.transaction.PlatformTransactionManager
-//import org.springframework.transaction.TransactionDefinition
-//import org.springframework.transaction.interceptor.NameMatchTransactionAttributeSource
-//import org.springframework.transaction.interceptor.RollbackRuleAttribute
-//import org.springframework.transaction.interceptor.RuleBasedTransactionAttribute
-//import org.springframework.transaction.interceptor.TransactionInterceptor
-//
-//
-///**
-// * 事务配置 支持动态数据源
-// * @author NorthLan at 2018/1/31
-// */
-//@Configuration
-//class TransactionalConfig {
-//    companion object {
-//        private const val CUSTOMIZE_TRANSACTION_INTERCEPTOR_NAME = "customizeTransactionInterceptor"
-//        private const val DATA_SOURCE_SWITCH_METHOD_INTERCEPTOR_NAME = "dataSourceSwitchMethodInterceptor"
-//        /**
-//         * 默认只对 "*Service" , "*ServiceImpl" Bean 进行事务处理,"*"表示模糊匹配, 比如 : userService,orderServiceImpl
-//         */
-//        private val DEFAULT_TRANSACTION_BEAN_NAMES = arrayOf("*Service", "*ServiceImpl", "*Mapper")
-//        /**
-//         * 可传播事务配置
-//         */
-//        private val DEFAULT_REQUIRED_METHOD_RULE_TRANSACTION_ATTRIBUTES = arrayOf(
-//                "add*",
-//                "save*",
-//                "insert*",
-//                "delete*",
-//                "update*",
-//                "edit*",
-//                "batch*",
-//                "create*",
-//                "remove*"
-//        )
-//        /**
-//         * 默认的只读事务
-//         */
-//        private val DEFAULT_READ_ONLY_METHOD_RULE_TRANSACTION_ATTRIBUTES = arrayOf(
-//                "get*",
-//                "count*",
-//                "find*",
-//                "query*",
-//                "select*",
-//                "list*",
-//                "*"
-//        )
-//    }
-//
-//    /**
-//     * 自定义事务 BeanName 拦截
-//     */
-//    private val customizeTransactionBeanNames = arrayOf<String>()
-//    /**
-//     * 自定义方法名的事务属性相关联,可以使用通配符(*)字符关联相同的事务属性的设置方法; 只读事务
-//     */
-//    private val customizeReadOnlyMethodRuleTransactionAttributes = arrayOf<String>()
-//    /**
-//     * 自定义方法名的事务属性相关联,可以使用通配符(*)字符关联相同的事务属性的设置方法;
-//     * 传播事务(默认的)[org.springframework.transaction.annotation.Propagation.REQUIRED]
-//     */
-//    private val customizeRequiredMethodRuleTransactionAttributes = arrayOf<String>()
-//
-//    /**
-//     * 配置事务拦截器
-//     * @param platformTransactionManager 事务管理器
-//     */
-//    @Bean(CUSTOMIZE_TRANSACTION_INTERCEPTOR_NAME)
-//    fun customizeTransactionInterceptor(platformTransactionManager: PlatformTransactionManager): TransactionInterceptor {
-//        val transactionAttributeSource = NameMatchTransactionAttributeSource()
-//        val readOnly = this.readOnlyTransactionRule()
-//        val required = this.requiredTransactionRule()
-//        // 默认的只读事务配置
-//        for (methodName in DEFAULT_READ_ONLY_METHOD_RULE_TRANSACTION_ATTRIBUTES) {
-//            transactionAttributeSource.addTransactionalMethod(methodName, readOnly)
+package com.gxzc.zen.orm.config
+
+import com.gxzc.zen.orm.DataSourceSwitchMethodInterceptor
+import org.springframework.aop.aspectj.AspectJExpressionPointcutAdvisor
+import org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator
+import org.springframework.beans.factory.annotation.Qualifier
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.transaction.PlatformTransactionManager
+import org.springframework.transaction.TransactionDefinition
+import org.springframework.transaction.interceptor.NameMatchTransactionAttributeSource
+import org.springframework.transaction.interceptor.RollbackRuleAttribute
+import org.springframework.transaction.interceptor.RuleBasedTransactionAttribute
+import org.springframework.transaction.interceptor.TransactionInterceptor
+
+
+/**
+ * 事务配置 支持动态数据源
+ * @author NorthLan at 2018/1/31
+ */
+@Configuration
+class TransactionalConfig {
+    companion object {
+        private const val CUSTOMIZE_TRANSACTION_INTERCEPTOR_NAME = "customizeTransactionInterceptor"
+        private const val DATA_SOURCE_SWITCH_METHOD_INTERCEPTOR_NAME = "dataSourceSwitchMethodInterceptor"
+        /**
+         * 默认只对 "*Service" , "*ServiceImpl" Bean 进行事务处理,"*"表示模糊匹配, 比如 : userService,orderServiceImpl
+         */
+        private val DEFAULT_TRANSACTION_BEAN_NAMES = arrayOf("*Service", "*ServiceImpl", "*Mapper")
+        /**
+         * 可传播事务配置
+         */
+        private val DEFAULT_REQUIRED_METHOD_RULE_TRANSACTION_ATTRIBUTES = arrayOf(
+                "add*",
+                "save*",
+                "insert*",
+                "delete*",
+                "update*",
+                "edit*",
+                "batch*",
+                "create*",
+                "remove*"
+        )
+        /**
+         * 默认的只读事务
+         */
+        private val DEFAULT_READ_ONLY_METHOD_RULE_TRANSACTION_ATTRIBUTES = arrayOf(
+                "get*",
+                "count*",
+                "find*",
+                "query*",
+                "select*",
+                "list*",
+                "*"
+        )
+    }
+
+    /**
+     * 自定义事务 BeanName 拦截
+     */
+    private val customizeTransactionBeanNames = arrayOf<String>()
+    /**
+     * 自定义方法名的事务属性相关联,可以使用通配符(*)字符关联相同的事务属性的设置方法; 只读事务
+     */
+    private val customizeReadOnlyMethodRuleTransactionAttributes = arrayOf<String>()
+    /**
+     * 自定义方法名的事务属性相关联,可以使用通配符(*)字符关联相同的事务属性的设置方法;
+     * 传播事务(默认的)[org.springframework.transaction.annotation.Propagation.REQUIRED]
+     */
+    private val customizeRequiredMethodRuleTransactionAttributes = arrayOf<String>()
+
+    /**
+     * 配置事务拦截器
+     * @param platformTransactionManager 事务管理器
+     */
+    @Bean(CUSTOMIZE_TRANSACTION_INTERCEPTOR_NAME)
+    fun customizeTransactionInterceptor(platformTransactionManager: PlatformTransactionManager): TransactionInterceptor {
+        val transactionAttributeSource = NameMatchTransactionAttributeSource()
+        val readOnly = this.readOnlyTransactionRule()
+        val required = this.requiredTransactionRule()
+        // 默认的只读事务配置
+        for (methodName in DEFAULT_READ_ONLY_METHOD_RULE_TRANSACTION_ATTRIBUTES) {
+            transactionAttributeSource.addTransactionalMethod(methodName, readOnly)
+        }
+        // 默认的传播事务配置
+        for (methodName in DEFAULT_REQUIRED_METHOD_RULE_TRANSACTION_ATTRIBUTES) {
+            transactionAttributeSource.addTransactionalMethod(methodName, required)
+        }
+        // 定制的只读事务配置
+        for (methodName in customizeReadOnlyMethodRuleTransactionAttributes) {
+            transactionAttributeSource.addTransactionalMethod(methodName, readOnly)
+        }
+        // 定制的传播事务配置
+        for (methodName in customizeRequiredMethodRuleTransactionAttributes) {
+            transactionAttributeSource.addTransactionalMethod(methodName, required)
+        }
+        return TransactionInterceptor(platformTransactionManager, transactionAttributeSource)
+    }
+
+//    @Bean
+//    fun aspectJExpressionPointcutAdvisor(@Qualifier(CUSTOMIZE_TRANSACTION_INTERCEPTOR_NAME) transactionInterceptor: TransactionInterceptor): AspectJExpressionPointcutAdvisor {
+//        return AspectJExpressionPointcutAdvisor().also {
+//            it.advice = transactionInterceptor
+//            it.expression = "execution (* com.gxzc.zen.api..*Service.*(..))"
 //        }
-//        // 默认的传播事务配置
-//        for (methodName in DEFAULT_REQUIRED_METHOD_RULE_TRANSACTION_ATTRIBUTES) {
-//            transactionAttributeSource.addTransactionalMethod(methodName, required)
-//        }
-//        // 定制的只读事务配置
-//        for (methodName in customizeReadOnlyMethodRuleTransactionAttributes) {
-//            transactionAttributeSource.addTransactionalMethod(methodName, readOnly)
-//        }
-//        // 定制的传播事务配置
-//        for (methodName in customizeRequiredMethodRuleTransactionAttributes) {
-//            transactionAttributeSource.addTransactionalMethod(methodName, required)
-//        }
-//        return TransactionInterceptor(platformTransactionManager, transactionAttributeSource)
 //    }
-//
-////    @Bean
-////    fun beanNameAutoProxyCreator(): BeanNameAutoProxyCreator {
-////        return BeanNameAutoProxyCreator().also {
-////            it.setInterceptorNames(DATA_SOURCE_SWITCH_METHOD_INTERCEPTOR_NAME,
-////                    CUSTOMIZE_TRANSACTION_INTERCEPTOR_NAME)
-////            // 归集
-////            it.setBeanNames(*arrayListOf<String>().also {
-////                it.addAll(DEFAULT_TRANSACTION_BEAN_NAMES) // 默认
-////                it.addAll(customizeTransactionBeanNames) // 定制
-////            }.toTypedArray())
-////            it.isProxyTargetClass = true
-////        }
-////    }
-////
-////    @Bean(DATA_SOURCE_SWITCH_METHOD_INTERCEPTOR_NAME)
-////    fun dataSourceSwitchMethodInterceptor(): DataSourceSwitchMethodInterceptor {
-////        return DataSourceSwitchMethodInterceptor()
-////    }
-//
-//    /**
-//     * 支持当前事务
-//     * 如果不存在创建一个新的
-//     */
-//    private fun requiredTransactionRule(): RuleBasedTransactionAttribute {
-//        return RuleBasedTransactionAttribute().also {
-//            it.rollbackRules = arrayListOf(RollbackRuleAttribute(Exception::class.java))
-//            it.propagationBehavior = TransactionDefinition.PROPAGATION_REQUIRED
-//            it.timeout = TransactionDefinition.TIMEOUT_DEFAULT
+
+//    @Bean
+//    fun beanNameAutoProxyCreator(): BeanNameAutoProxyCreator {
+//        return BeanNameAutoProxyCreator().also {
+//            it.setInterceptorNames(DATA_SOURCE_SWITCH_METHOD_INTERCEPTOR_NAME,
+//                    CUSTOMIZE_TRANSACTION_INTERCEPTOR_NAME)
+//            // 归集
+//            it.setBeanNames(*arrayListOf<String>().also {
+//                it.addAll(DEFAULT_TRANSACTION_BEAN_NAMES) // 默认
+//                it.addAll(customizeTransactionBeanNames) // 定制
+//            }.toTypedArray())
+//            it.isProxyTargetClass = true
 //        }
 //    }
 //
-//    /**
-//     * 只读事务
-//     */
-//    private fun readOnlyTransactionRule(): RuleBasedTransactionAttribute {
-//        return RuleBasedTransactionAttribute().also {
-//            it.isReadOnly = true
-//            it.propagationBehavior = TransactionDefinition.PROPAGATION_NOT_SUPPORTED
-//        }
+//    @Bean(DATA_SOURCE_SWITCH_METHOD_INTERCEPTOR_NAME)
+//    fun dataSourceSwitchMethodInterceptor(): DataSourceSwitchMethodInterceptor {
+//        return DataSourceSwitchMethodInterceptor()
 //    }
-//}
+
+    /**
+     * 支持当前事务
+     * 如果不存在创建一个新的
+     */
+    private fun requiredTransactionRule(): RuleBasedTransactionAttribute {
+        return RuleBasedTransactionAttribute().also {
+            it.rollbackRules = arrayListOf(RollbackRuleAttribute(Exception::class.java))
+            it.propagationBehavior = TransactionDefinition.PROPAGATION_REQUIRED
+            it.timeout = TransactionDefinition.TIMEOUT_DEFAULT
+        }
+    }
+
+    /**
+     * 只读事务
+     */
+    private fun readOnlyTransactionRule(): RuleBasedTransactionAttribute {
+        return RuleBasedTransactionAttribute().also {
+            it.isReadOnly = true
+            it.propagationBehavior = TransactionDefinition.PROPAGATION_NOT_SUPPORTED
+        }
+    }
+}

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

@@ -0,0 +1,100 @@
+#spring:
+#  datasource:
+#    type: com.alibaba.druid.pool.DruidDataSource
+
+###################  mybatis-plus配置  ###################
+mybatis-plus:
+  mapper-locations: classpath*:mapping/**/*.xml
+#  type-aliases-package: com.gxzc.zen.api.bus.mapper,com.gxzc.zen.api.sys.mapper #,com.gxzc.zen.api.useage.mapper
+  global-config:
+    id-type: 0  #0:数据库ID自增   1:用户输入id  2:全局唯一id(IdWorker)  3:全局唯一ID(uuid)
+    db-column-underline: true
+    refresh-mapper: true
+    logic-delete-value: 0
+    logic-not-delete-value: 1
+    sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: true #配置的缓存的全局开关
+    lazyLoadingEnabled: true #延时加载的开关
+    multipleResultSetsEnabled: true #延时加载一个属性时会加载该对象全部属性，否则按需加载属性
+    interceptors: com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+
+
+################## Alibaba Druid 配置 ##################
+spring:
+  datasource:
+    druid:
+      stat-view-servlet:
+        enabled: true
+        login-username: root
+        login-password: root
+        reset-enable: false
+
+datasource:
+  sys:
+    name: archives_sys
+    url: jdbc:mysql://127.0.0.1:3306/archives_sys?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
+    username: root
+    password: root
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    validationQuery: SELECT 1
+    asyncInit: false # 异步初始化
+    filters: log4j,wall,mergeStat
+    keepAlive: false
+    driver-class-name: com.mysql.jdbc.Driver
+    initialize: false #指定初始化数据源，是否用data.sql来初始化，默认: true
+    initialSize: 5
+    minIdle: 5
+    maxActive: 20
+    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
+    username: root
+    password: root
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    validationQuery: SELECT 1
+    asyncInit: false # 异步初始化
+    filters: log4j,wall,mergeStat
+    keepAlive: false
+    driver-class-name: com.mysql.jdbc.Driver
+    initialize: false #指定初始化数据源，是否用data.sql来初始化，默认: true
+    initialSize: 5
+    minIdle: 5
+    maxActive: 20
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 30000
+
+##sharding-jdbc
+#sharding:
+#  jdbc:
+#    datasource:
+#      names: ds_sys,ds_rec
+#      ds_sys:
+#        type: com.alibaba.druid.pool.DruidDataSource
+#        driver-class-name: com.mysql.jdbc.Driver
+#        url: jdbc:mysql://127.0.0.1:3306/archives_sys?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
+#        username: root
+#        password: root
+#        maxActive: 20
+#      ds_rec:
+#        type: com.alibaba.druid.pool.DruidDataSource
+#        driver-class-name: com.mysql.jdbc.Driver
+#        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
+#        username: root
+#        password: root
+#        maxActive: 20
+#    config:
+#      sharding:
+#        tables:
+#          sys_dept:
+#            actualDataNodes: 'ds_sys
+#          sys_dic:
+#          sys_param:

zen-orm/src/main/resources/application-orm.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 配置 ##################

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

@@ -1,19 +1,11 @@
 package com.gxzc.zen.controller
 
-import com.gxzc.zen.api.bus.model.MgrArchivesType
-import com.gxzc.zen.api.bus.model.MgrFonds
-import com.gxzc.zen.api.bus.service.IMgrArchivesTypeService
-import com.gxzc.zen.api.bus.service.IMgrFondsService
 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.mq.publisher.Sender
-import com.gxzc.zen.orm.annotation.DynamicDataSource
-import com.gxzc.zen.orm.contants.DSKey
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.ResponseEntity
-import org.springframework.transaction.annotation.Transactional
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RestController
 
@@ -27,11 +19,11 @@ class ExampleController {
     @Autowired
     lateinit var sysDeptService: ISysDeptService
 
-    @Autowired
-    lateinit var sender: Sender
+//    @Autowired
+//    lateinit var sender: Sender
 
     @GetMapping("test")
-    @Transactional
+//    @Transactional
     fun test() {
 //        logger.info("a: {}", sysDeptService.selectCount(EntityWrapper<SysDept>().where("1","1000L")))
 //        logger.info("b: {}", sysDeptMapper.selectCount(EntityWrapper<SysDept>()))
@@ -42,34 +34,17 @@ class ExampleController {
         })
     }
 
-    @Autowired
-    private lateinit var mgrFondsService: IMgrFondsService
-
-    @Autowired
-    private lateinit var mgrArchivesTypeService: IMgrArchivesTypeService
-
     @GetMapping("testTransaction")
-    @DynamicDataSource(DSKey.DSKEY_BUSINESS)
-    @Transactional
     fun testTransaction() {
-        mgrFondsService.insert(MgrFonds().also {
-            it.fondsName = "1"
-            it.fondsNo = "1"
-        })
-
-        mgrArchivesTypeService.insert(MgrArchivesType().also {
-            it.name = "sldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjsklsldfjskldjfklsdjfklsdjljsdklfjskl"
-            it.parentId = 0
-            it.typeCode = "2333"
-        })
+        sysDeptService.testTransaction()
     }
 
     @GetMapping("testMq")
     fun testMq() {
-        for (i in 1..10) {
-            sender.send("msg $i")
-//            Thread.sleep(1000)
-        }
+//        for (i in 1..10) {
+//            sender.send("msg $i")
+////            Thread.sleep(1000)
+//        }
     }
 
     @GetMapping("testDto")

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
@@ -21,4 +21,10 @@ spring:
     proxy-target-class: true #false为启用jdk默认动态代理,true为cglib动态代理
     auto: true
 logging:
-  level: debug
+  level:
+    root: info
+    com.gxzc.zen: debug
+  path: logs/
+  file: zen.log
+
+#debug: true

zen-web/src/test/kotlin/com/gxzc/zen/fun/TestLogicDelete.kt

@@ -1,10 +1,6 @@
 package com.gxzc.zen.`fun`
 
-import com.gxzc.zen.api.sys.model.SysDic
-import com.gxzc.zen.api.sys.service.ISysDicService
 import com.gxzc.zen.base.BaseTestKt
-import org.junit.Test
-import org.springframework.beans.factory.annotation.Autowired
 
 /**
  *
@@ -13,20 +9,4 @@ import org.springframework.beans.factory.annotation.Autowired
  * @url https://noahlan.com
  */
 class TestLogicDelete : BaseTestKt() {
-    @Autowired
-    private lateinit var sysDicService: ISysDicService
-
-    @Test
-    fun insertSysData() {
-        sysDicService.insert(SysDic().also {
-            it.key = "test"
-            it.value = "testValue"
-            it.sort = 1
-        })
-    }
-
-    @Test
-    fun testLogicDelete() {
-        sysDicService.deleteById(1000L)
-    }
 }