事物配置有问题

build.gradle

@@ -56,6 +56,7 @@ subprojects {
 
     repositories {
         mavenCentral()
+        jcenter()
     }
 
     dependencies {
@@ -112,13 +113,14 @@ subprojects {
 
         // sso
         compile("com.baomidou:kisso:$kisso_version")
-        // compile("io.jsonwebtoken:jjwt:0.7.0")
 
         // activiti
-        compile("org.activiti:activiti-spring-boot-starter-basic:$activiti_starter_version")
-        compile("org.activiti:activiti-spring-boot-starter-rest-api:$activiti_starter_version")
-        compile("org.activiti:activiti-spring-boot-starter-actuator:$activiti_starter_version")
+//        compile("org.activiti:activiti-spring-boot-starter-basic:$activiti_starter_version")
+//        compile("org.activiti:activiti-spring-boot-starter-rest-api:$activiti_starter_version")
+//        compile("org.activiti:activiti-spring-boot-starter-actuator:$activiti_starter_version")
 
         compile("org.apache.velocity:velocity-engine-core:2.0")
+
+        compile('com.github.hotchemi:khronos:0.9.0')
     }
 }

zen-activiti/src/main/resources/processes/test.bpmn

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="m1517475747589" name="" targetNamespace="http://www.activiti.org/test" typeLanguage="http://www.w3.org/2001/XMLSchema">
+  <process id="myProcess_1" isClosed="false" isExecutable="true" processType="None">
+    <startEvent id="_2" name="StartEvent"/>
+    <userTask activiti:exclusive="true" id="_3" name="UserTask"/>
+    <sequenceFlow id="_4" sourceRef="_2" targetRef="_3"/>
+    <endEvent id="_5" name="EndEvent"/>
+    <userTask activiti:exclusive="true" id="_7" name="UserTask"/>
+    <sequenceFlow id="_8" sourceRef="_3" targetRef="_7"/>
+    <userTask activiti:exclusive="true" id="_9" name="UserTask"/>
+    <sequenceFlow id="_10" sourceRef="_7" targetRef="_9"/>
+    <sequenceFlow id="_11" sourceRef="_9" targetRef="_5"/>
+  </process>
+  <bpmndi:BPMNDiagram documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
+    <bpmndi:BPMNPlane bpmnElement="myProcess_1">
+      <bpmndi:BPMNShape bpmnElement="_2" id="Shape-_2">
+        <omgdc:Bounds height="32.0" width="32.0" x="75.0" y="70.0"/>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="_3" id="Shape-_3">
+        <omgdc:Bounds height="55.0" width="155.0" x="290.0" y="45.0"/>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="55.0" width="155.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="_5" id="Shape-_5">
+        <omgdc:Bounds height="32.0" width="32.0" x="615.0" y="115.0"/>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="_7" id="Shape-_7">
+        <omgdc:Bounds height="55.0" width="85.0" x="315.0" y="205.0"/>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="_9" id="Shape-_9">
+        <omgdc:Bounds height="55.0" width="85.0" x="490.0" y="90.0"/>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="_4" id="BPMNEdge__4" sourceElement="_2" targetElement="_3">
+        <omgdi:waypoint x="107.0" y="86.0"/>
+        <omgdi:waypoint x="290.0" y="72.5"/>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="_8" id="BPMNEdge__8" sourceElement="_3" targetElement="_7">
+        <omgdi:waypoint x="357.5" y="100.0"/>
+        <omgdi:waypoint x="357.5" y="205.0"/>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="_11" id="BPMNEdge__11" sourceElement="_9" targetElement="_5">
+        <omgdi:waypoint x="575.0" y="117.5"/>
+        <omgdi:waypoint x="615.0" y="131.0"/>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="_10" id="BPMNEdge__10" sourceElement="_7" targetElement="_9">
+        <omgdi:waypoint x="400.0" y="232.5"/>
+        <omgdi:waypoint x="490.0" y="117.5"/>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,13 @@
+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/bus/model/MgrArchivesClassification.kt

@@ -0,0 +1,33 @@
+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

@@ -0,0 +1,218 @@
+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

@@ -0,0 +1,29 @@
+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

@@ -0,0 +1,125 @@
+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

@@ -0,0 +1,37 @@
+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

@@ -0,0 +1,29 @@
+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

@@ -0,0 +1,29 @@
+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

@@ -0,0 +1,25 @@
+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/bus/service/IMgrArchivesClassificationService.kt

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,13 @@
+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/bus/service/impl/MgrArchivesClassificationServiceImpl.kt

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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/resources/mapping/bus/MgrArchivesClassificationMapper.xml

@@ -0,0 +1,20 @@
+<?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

@@ -0,0 +1,66 @@
+<?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

@@ -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.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

@@ -0,0 +1,43 @@
+<?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

@@ -0,0 +1,21 @@
+<?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

@@ -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.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

@@ -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.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

@@ -0,0 +1,18 @@
+<?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-common/src/main/kotlin/com/gxzc/zen/common/dto/RD.java

@@ -0,0 +1,27 @@
+package com.gxzc.zen.common.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author NorthLan
+ * @date 2018/2/1
+ * @url https://noahlan.com
+ */
+
+public class RD {
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date time;
+
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    public Date getTime() {
+        return time;
+    }
+    public void setTime(Date time) {
+        this.time = time;
+    }
+}

zen-common/src/main/kotlin/com/gxzc/zen/common/dto/ResultDto.kt

@@ -0,0 +1,21 @@
+package com.gxzc.zen.common.dto
+
+import com.fasterxml.jackson.annotation.JsonFormat
+import khronos.Dates
+import java.util.*
+
+
+/**
+ * 基础 数据传输对象
+ * @author NorthLan
+ * @date 2018/2/1
+ * @url https://noahlan.com
+ */
+data class ResultDto(
+        val code: Int,
+        val msg: String?,
+        val data: Any?
+) {
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    val time: Date = Dates.today
+}

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

@@ -17,7 +17,7 @@ import java.io.File
  * @url https://noahlan.me
  */
 fun main(args: Array<String>) {
-    generate(true, "NorthLan", "sys", DataSourceConfig().also {
+    generate(true, "NorthLan", "bus", DataSourceConfig().also {
         it.dbType = DbType.MYSQL
         it.typeConvert = object : MySqlTypeConvert() {
             override fun processTypeConvert(fieldType: String?): DbColumnType {
@@ -27,7 +27,7 @@ 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_sys?characterEncoding=utf8"
+        it.url = "jdbc:mysql://192.168.1.124:3307/archives_mgr?characterEncoding=utf8"
     })
 }
 

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

@@ -2,6 +2,7 @@ package com.gxzc.zen.orm
 
 import com.baomidou.mybatisplus.mapper.MetaObjectHandler
 import org.apache.ibatis.reflection.MetaObject
+import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Component
 import java.util.*
 
@@ -13,7 +14,12 @@ import java.util.*
  */
 @Component
 class CustomMetaObjectHandler : MetaObjectHandler() {
+    companion object {
+        val logger = LoggerFactory.getLogger(CustomMetaObjectHandler::class.java)!!
+    }
+
     override fun insertFill(metaObject: MetaObject?) {
+        logger.debug("公共字段自动填充: insertFill")
         if (getFieldValByName("createBy", metaObject) == null) {
             // TODO 公共字段填充 createBy
             setFieldValByName("createBy", "admin", metaObject)
@@ -24,6 +30,7 @@ class CustomMetaObjectHandler : MetaObjectHandler() {
     }
 
     override fun updateFill(metaObject: MetaObject?) {
+        logger.debug("公共字段自动填充: updateFill")
         if (getFieldValByName("updateBy", metaObject) == null) {
             // TODO 公共字段填充 updateBy
             setFieldValByName("updateBy", "admin", metaObject)

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

@@ -7,13 +7,14 @@ import com.baomidou.mybatisplus.spring.boot.starter.SpringBootVFS
 import com.gxzc.zen.orm.DynamicMultipleDataSource
 import com.gxzc.zen.orm.contants.DSKey
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.boot.context.properties.ConfigurationProperties
 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.jdbc.datasource.DataSourceTransactionManager
+import org.springframework.transaction.PlatformTransactionManager
+import org.springframework.transaction.annotation.TransactionManagementConfigurer
 import javax.sql.DataSource
 
 /**
@@ -22,7 +23,8 @@ import javax.sql.DataSource
  */
 @Configuration
 @EnableConfigurationProperties(MybatisPlusProperties::class)
-class MultipleDataSourceConfig {
+class MultipleDataSourceConfig : TransactionManagementConfigurer{
+
     @Autowired
     private lateinit var properties: MybatisPlusProperties
 
@@ -35,22 +37,25 @@ class MultipleDataSourceConfig {
 
     @Bean(DSKey.DSKEY_BUSINESS)
     @ConfigurationProperties(prefix = "datasource.bus")
-    fun dataSourceRec(): DataSource {
+    fun dataSourceBus(): DataSource {
         return DruidDataSource()
     }
 
     @Bean
-    fun multipleDataSource(@Qualifier(DSKey.DSKEY_SYS) dataSourceSys: DataSource,
-                           @Qualifier(DSKey.DSKEY_BUSINESS) dataSourceRec: DataSource): DynamicMultipleDataSource {
+    fun multipleDataSource(): DynamicMultipleDataSource {
+        val dataSourceSys = dataSourceSys()
+        val dataSourceBus = dataSourceBus()
         return DynamicMultipleDataSource().also {
-            it.setTargetDataSources(mapOf(Pair(DSKey.DSKEY_SYS, dataSourceSys), Pair(DSKey.DSKEY_BUSINESS, dataSourceRec)))
+            it.setTargetDataSources(mapOf(
+                    Pair(DSKey.DSKEY_SYS, dataSourceSys),
+                    Pair(DSKey.DSKEY_BUSINESS, dataSourceBus)))
             it.setDefaultTargetDataSource(dataSourceSys)
         }
     }
 
     @Bean
-    fun transactionManager(dynamicMultipleDataSource: DynamicMultipleDataSource): DataSourceTransactionManager {
-        return DataSourceTransactionManager(dynamicMultipleDataSource)
+    fun transactionManager(): PlatformTransactionManager {
+        return DataSourceTransactionManager(multipleDataSource())
     }
 
     @Bean
@@ -65,6 +70,10 @@ class MultipleDataSourceConfig {
         }
     }
 
+    override fun annotationDrivenTransactionManager(): PlatformTransactionManager {
+        return transactionManager()
+    }
+
 //    @Bean
 //    fun sqlSessionFactory(dynamicMultipleDataSource: DynamicMultipleDataSource): SqlSessionFactory {
 //        return SqlSessionFactoryBean().let {

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

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

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

@@ -35,9 +35,9 @@ spring:
 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
+    url: jdbc:mysql://192.168.1.124:3307/archives_sys?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
+    username: archives
+    password: archives
     testWhileIdle: true
     testOnBorrow: false
     testOnReturn: false
@@ -53,10 +53,10 @@ datasource:
     timeBetweenEvictionRunsMillis: 60000
     minEvictableIdleTimeMillis: 30000
   bus:
-    name: archives_receive
-    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
+    name: archives_mgr
+    url: jdbc:mysql://192.168.1.124:3307/archives_mgr?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
+    username: archives
+    password: archives
     testWhileIdle: true
     testOnBorrow: false
     testOnReturn: false

zen-web/src/main/kotlin/com/gxzc/zen/MainApplication.kt

@@ -6,7 +6,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder
 import org.springframework.boot.web.support.SpringBootServletInitializer
 
 
-@SpringBootApplication//(exclude = [DataSourceAutoConfiguration::class])
+@SpringBootApplication(exclude = [])
 class MainApplication : SpringBootServletInitializer() {
     override fun configure(builder: SpringApplicationBuilder?): SpringApplicationBuilder? {
         return builder?.sources(MainApplication::class.java)

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

@@ -1,10 +1,18 @@
 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
@@ -34,6 +42,28 @@ 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"
+        })
+    }
+
     @GetMapping("testMq")
     fun testMq() {
         for (i in 1..10) {
@@ -41,4 +71,9 @@ class ExampleController {
 //            Thread.sleep(1000)
         }
     }
+
+    @GetMapping("testDto")
+    fun testDto(): ResponseEntity<*> {
+        return ResponseEntity.ok(ResultDto(1, "haha", null))
+    }
 }

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

@@ -21,7 +21,7 @@ class TestLogicDelete : BaseTestKt() {
         sysDicService.insert(SysDic().also {
             it.key = "test"
             it.value = "testValue"
-            it.sort = Integer(1)
+            it.sort = 1
         })
     }