重新生成sys部分 重新编写权限验证模块

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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-05
- */
-@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,222 +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-05
- */
-@TableName("mgr_archives_document")
-data class MgrArchivesDocument(
-        /**
-         * 案卷id
-         */
-        var fileId: Long? = null,
-        /**
-         * 归档人
-         */
-        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-05
- */
-@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-05
- */
-@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-05
- */
-@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-05
- */
-@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-05
- */
-@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-05
- */
-@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

@@ -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-05
- */
-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-05
- */
-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-05
- */
-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-05
- */
-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-05
- */
-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-05
- */
-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-05
- */
-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-05
- */
-interface IMgrFondsService : BaseService<MgrFonds>

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-05
- */
-@Service
-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-05
- */
-@Service
-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-05
- */
-@Service
-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-05
- */
-@Service
-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-05
- */
-@Service
-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-05
- */
-@Service
-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-05
- */
-@Service
-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-05
- */
-@Service
-class MgrFondsServiceImpl : ServiceImpl<MgrFondsMapper, MgrFonds>(), IMgrFondsService {
-
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,15 +1,15 @@
 package com.gxzc.zen.api.sys.mapper
 
-import com.gxzc.zen.api.sys.model.SysRolePermission
+import com.gxzc.zen.api.sys.model.SysMenuRole
 import com.gxzc.zen.common.base.BaseMapper
 import org.springframework.stereotype.Repository
 /**
  * <p>
- * 角色授权表 Mapper 接口
+ * 用户菜单表 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-05
+ * @since 2018-02-06
  */
 @Repository
-interface SysRolePermissionMapper : BaseMapper<SysRolePermission>
+interface SysMenuRoleMapper : BaseMapper<SysMenuRole>

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -9,14 +9,18 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-05
+ * @since 2018-02-06
  */
 @TableName("sys_dept")
 data class SysDept(
+        /**
+         * 父节点ID
+         */
+        var parentId: Long? = null,
         /**
          * 部门名称
          */
-        var deptName: String? = null,
+        var name: String? = null,
         /**
          * 负责人
          */

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

@@ -9,17 +9,17 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-05
+ * @since 2018-02-06
  */
 @TableName("sys_dept_user")
 data class SysDeptUser(
         /**
          * 部门ID
          */
-        var deptId: String? = null,
+        var deptId: Long? = null,
         /**
          * 用户ID
          */
-        var userId: String? = null
+        var userId: Long? = null
 ) : BaseModel() {
 }

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

@@ -9,10 +9,14 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-05
+ * @since 2018-02-06
  */
 @TableName("sys_dic")
 data class SysDic(
+        /**
+         * 平台ID(0:通用,1:系统,2:接收,3:保存,4:管理,5:利用)
+         */
+        var platformId: Int? = null,
         /**
          * 字典代码
          */

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

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

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

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

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

@@ -9,26 +9,34 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-05
+ * @since 2018-02-06
  */
 @TableName("sys_menu")
 data class SysMenu(
+        /**
+         * 平台ID(0:通用,1:系统,2:接收,3:保存,4:管理,5:利用)
+         */
+        var platformId: Int? = null,
+        /**
+         * 上级菜单ID(root:0)
+         */
+        var parentId: Long? = null,
         /**
          * 菜单名称
          */
-        var menuName: String? = null,
+        var name: String? = null,
         /**
-         * 菜单类型（0:CURD；1:系统菜单；2:业务菜单）
+         * 授权，如(user:list,user:create)
          */
-        var menuType: Int? = null,
+        var permission: String? = null,
         /**
-         * 上级菜单ID
+         * 菜单类型（0:目录；1:菜单；2:按钮）
          */
-        var parentId: Long? = null,
+        var type: Int? = null,
         /**
          * 请求地址
          */
-        var request: String? = null,
+        var url: String? = null,
         /**
          * 展开状态(1:展开;0:收缩)
          */
@@ -40,6 +48,6 @@ data class SysMenu(
         /**
          * 叶子节点(0:树枝节点;1:叶子节点)
          */
-        var isShow: Int? = null
+        var isLeaf: Int? = null
 ) : BaseModel() {
 }

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

@@ -5,21 +5,21 @@ import com.gxzc.zen.common.base.BaseModel
 
 /**
  * <p>
- * 角色授权表
+ * 用户菜单表
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-05
+ * @since 2018-02-06
  */
-@TableName("sys_role_permission")
-data class SysRolePermission(
+@TableName("sys_menu_role")
+data class SysMenuRole(
         /**
-         * 角色ID
+         * 菜单ID
          */
-        var roleId: Long? = null,
+        var menuId: Long? = null,
         /**
-         * 权限ID
+         * 角色ID
          */
-        var permissionId: Long? = null
+        var roleId: Long? = null
 ) : BaseModel() {
 }

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

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

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

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

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

@@ -9,10 +9,14 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-05
+ * @since 2018-02-06
  */
 @TableName("sys_permission")
 data class SysPermission(
+        /**
+         * 平台ID(0:通用,1:系统,2:接收,3:保存,4:管理,5:利用)
+         */
+        var platformId: Int? = null,
         /**
          * 权限名称
          */
@@ -20,18 +24,10 @@ data class SysPermission(
         /**
          * 权限代码
          */
-        var code: Int? = null,
-        /**
-         * 上级菜单ID
-         */
-        var parentId: Long? = null,
+        var perm: String? = null,
         /**
          * 权限描述
          */
-        var description: String? = null,
-        /**
-         * 所属菜单ID
-         */
-        var menuId: String? = null
+        var description: String? = null
 ) : BaseModel() {
 }

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

@@ -9,13 +9,17 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-05
+ * @since 2018-02-06
  */
 @TableName("sys_role")
 data class SysRole(
         /**
          * 角色名称
          */
-        var roleName: String? = null
+        var name: String? = null,
+        /**
+         * 权限列表
+         */
+        var permIds: String? = null
 ) : BaseModel() {
 }

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

@@ -9,7 +9,7 @@ import com.gxzc.zen.common.base.BaseModel
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-05
+ * @since 2018-02-06
  */
 @TableName("sys_user")
 data class SysUser(
@@ -18,17 +18,13 @@ data class SysUser(
          */
         var account: String? = null,
         /**
-         * 密码
-         */
-        var password: String? = null,
-        /**
-         * 用户类型(1普通用户2管理员3系统用户)
+         * 姓名
          */
-        var userType: String? = null,
+        var username: String? = null,
         /**
-         * 姓名
+         * 密码
          */
-        var userName: String? = null,
+        var password: String? = null,
         /**
          * 电话
          */
@@ -37,10 +33,6 @@ data class SysUser(
          * 邮箱
          */
         var email: String? = null,
-        /**
-         * 部门编号
-         */
-        var deptId: Long? = null,
         /**
          * 职位
          */

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,13 @@
+package com.gxzc.zen.api.sys.service
+
+import com.gxzc.zen.api.sys.model.SysMenuRole
+import com.gxzc.zen.common.base.BaseService
+/**
+ * <p>
+ * 用户菜单表 服务类
+ * </p>
+ *
+ * @author NorthLan123
+ * @since 2018-02-06
+ */
+interface ISysMenuRoleService : BaseService<SysMenuRole>

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

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

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

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

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

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

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

@@ -2,15 +2,15 @@ package com.gxzc.zen.api.sys.service
 
 import com.gxzc.zen.api.sys.model.SysPermission
 import com.gxzc.zen.common.base.BaseService
+
 /**
  * <p>
  * 权限表 服务类
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-05
+ * @since 2018-02-06
  */
-interface ISysPermissionService : BaseService<SysPermission>{
-
-    fun findUserPermissions(userId:Long):HashSet<String>
+interface ISysPermissionService : BaseService<SysPermission> {
+    fun getPermissionByUserId(id: Long): Set<String>
 }

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

@@ -1,13 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.gxzc.zen.api.sys.model.SysRolePermission
-import com.gxzc.zen.common.base.BaseService
-/**
- * <p>
- * 角色授权表 服务类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-05
- */
-interface ISysRolePermissionService : BaseService<SysRolePermission>

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

@@ -8,8 +8,6 @@ import com.gxzc.zen.common.base.BaseService
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-05
+ * @since 2018-02-06
  */
-interface ISysRoleService : BaseService<SysRole>{
-    fun findRoles(ids:List<Long>):MutableList<SysRole>?
-}
+interface ISysRoleService : BaseService<SysRole>

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

@@ -1,15 +1,17 @@
 package com.gxzc.zen.api.sys.service
 
+import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.api.sys.model.SysUserRole
 import com.gxzc.zen.common.base.BaseService
+
 /**
  * <p>
  * 用户角色表 服务类
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-05
+ * @since 2018-02-06
  */
-interface ISysUserRoleService : BaseService<SysUserRole>{
-    fun findUserRoles(userId:Long): MutableList<SysUserRole>?
+interface ISysUserRoleService : BaseService<SysUserRole> {
+    fun getRoleByUserId(id: Long): SysRole
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,20 @@
+package com.gxzc.zen.api.sys.service.impl
+
+import com.gxzc.zen.api.sys.model.SysMenuRole
+import com.gxzc.zen.api.sys.mapper.SysMenuRoleMapper
+import com.gxzc.zen.api.sys.service.ISysMenuRoleService
+import com.baomidou.mybatisplus.service.impl.ServiceImpl
+import org.springframework.stereotype.Service
+
+/**
+ * <p>
+ * 用户菜单表 服务实现类
+ * </p>
+ *
+ * @author NorthLan123
+ * @since 2018-02-06
+ */
+@Service
+class SysMenuRoleServiceImpl : ServiceImpl<SysMenuRoleMapper, SysMenuRole>(), ISysMenuRoleService {
+
+}

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

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

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

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

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

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

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

@@ -1,18 +1,14 @@
 package com.gxzc.zen.api.sys.service.impl
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper
 import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import com.gxzc.zen.api.sys.mapper.SysPermissionMapper
 import com.gxzc.zen.api.sys.model.SysPermission
-import com.gxzc.zen.api.sys.model.SysRolePermission
 import com.gxzc.zen.api.sys.service.ISysPermissionService
-import com.gxzc.zen.api.sys.service.ISysRolePermissionService
 import com.gxzc.zen.api.sys.service.ISysUserRoleService
+import com.gxzc.zen.common.contants.CACHEKEYS
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Service
-import java.util.*
-import kotlin.collections.HashSet
 
 /**
  * <p>
@@ -20,34 +16,23 @@ import kotlin.collections.HashSet
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-05
+ * @since 2018-02-06
  */
 @Service
 class SysPermissionServiceImpl : ServiceImpl<SysPermissionMapper, SysPermission>(), ISysPermissionService {
 
     @Autowired
-    private val userRoleService: ISysUserRoleService? = null
-    @Autowired
-    private val rolePermissionService: ISysRolePermissionService? = null
-
-    private fun findRolePermissions(roleId: Long?): MutableList<SysRolePermission>? {
-        val entity = SysRolePermission(roleId, null)
-        return rolePermissionService?.selectList(EntityWrapper(entity))
-    }
+    private lateinit var sysUserRoleService: ISysUserRoleService
 
-    //任何修改用户角色、角色、权限表都清此缓存
-    @Cacheable(value = ["setPermissions"], key = "#userId")
-    override fun findUserPermissions(userId: Long): HashSet<String> {
-//        val user=userService?.selectById(userId)
-        val uroles = userRoleService?.findUserRoles(userId)
-        val perms = LinkedList<SysPermission>()
-        val permissions = HashSet<String>()
-        for (ro in uroles!!)
-            for (per in findRolePermissions(ro.roleId)!!)
-                perms.add(selectById(per.permissionId))
-        for (per in perms)
-            permissions.add(per.name!!)
-        return permissions
+    /**
+     * 获取指定用户的所有权限并缓存
+     * 任何对 用户id
+     */
+    @Cacheable(value = [CACHEKEYS.USER_PERM], key = "#id")
+    override fun getPermissionByUserId(id: Long): Set<String> {
+        val role = sysUserRoleService.getRoleByUserId(id)
+        return baseMapper.selectBatchIds(role.permIds?.split(','))
+                .mapNotNull { it.perm }.toSet()
     }
 
 }

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

@@ -1,20 +0,0 @@
-package com.gxzc.zen.api.sys.service.impl
-
-import com.gxzc.zen.api.sys.model.SysRolePermission
-import com.gxzc.zen.api.sys.mapper.SysRolePermissionMapper
-import com.gxzc.zen.api.sys.service.ISysRolePermissionService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import org.springframework.stereotype.Service
-
-/**
- * <p>
- * 角色授权表 服务实现类
- * </p>
- *
- * @author NorthLan123
- * @since 2018-02-05
- */
-@Service
-class SysRolePermissionServiceImpl : ServiceImpl<SysRolePermissionMapper, SysRolePermission>(), ISysRolePermissionService {
-
-}

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

@@ -1,11 +1,9 @@
 package com.gxzc.zen.api.sys.service.impl
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper
 import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.api.sys.mapper.SysRoleMapper
 import com.gxzc.zen.api.sys.service.ISysRoleService
 import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import com.gxzc.zen.api.sys.model.SysUserRole
 import org.springframework.stereotype.Service
 
 /**
@@ -14,12 +12,9 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-05
+ * @since 2018-02-06
  */
 @Service
 class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleService {
-    override fun findRoles(ids: List<Long>): MutableList<SysRole>? {
-        return baseMapper?.selectList(EntityWrapper<SysRole>().`in`("id",ids))
-    }
 
 }

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

@@ -1,12 +1,15 @@
 package com.gxzc.zen.api.sys.service.impl
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper
-import com.gxzc.zen.api.sys.model.SysUserRole
+import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import com.gxzc.zen.api.sys.mapper.SysUserRoleMapper
+import com.gxzc.zen.api.sys.model.SysRole
+import com.gxzc.zen.api.sys.model.SysUserRole
+import com.gxzc.zen.api.sys.service.ISysRoleService
 import com.gxzc.zen.api.sys.service.ISysUserRoleService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
+import com.gxzc.zen.common.contants.CACHEKEYS
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Service
-import springfox.documentation.annotations.Cacheable
 
 /**
  * <p>
@@ -14,15 +17,21 @@ import springfox.documentation.annotations.Cacheable
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-05
+ * @since 2018-02-06
  */
 @Service
 class SysUserRoleServiceImpl : ServiceImpl<SysUserRoleMapper, SysUserRole>(), ISysUserRoleService {
 
-    @Cacheable("123")
-    override fun findUserRoles(userId: Long): MutableList<SysUserRole>?{
-        val entity=SysUserRole().also { it.userId=userId }
-        return baseMapper?.selectList(EntityWrapper<SysUserRole>(entity))
-    }
+    @Autowired
+    private lateinit var sysRoleService: ISysRoleService
 
+    /**
+     * 获取指定用户的角色
+     * 缓存在
+     */
+    @Cacheable(value = [CACHEKEYS.USER_ROLE], key = "'uid_'.concat(#result.id)")
+    override fun getRoleByUserId(id: Long): SysRole {
+        val userRole = baseMapper.selectOne(SysUserRole().also { it.userId = id })
+        return sysRoleService.selectById(userRole.roleId)
+    }
 }

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

@@ -1,10 +1,9 @@
 package com.gxzc.zen.api.sys.service.impl
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import com.gxzc.zen.api.sys.mapper.SysUserMapper
 import com.gxzc.zen.api.sys.model.SysUser
+import com.gxzc.zen.api.sys.mapper.SysUserMapper
 import com.gxzc.zen.api.sys.service.ISysUserService
+import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import com.gxzc.zen.common.contants.CACHEKEYS
 import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Service
@@ -15,13 +14,14 @@ import org.springframework.stereotype.Service
  * </p>
  *
  * @author NorthLan123
- * @since 2018-02-05
+ * @since 2018-02-06
  */
 @Service
 class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserService {
 
     @Cacheable(CACHEKEYS.USER)
-    override fun getUserListCacheable(): MutableList<SysUser> {
-        return baseMapper.selectList(EntityWrapper<SysUser>())
+    override fun getUserByIdCacheable(id: Long): SysUser {
+        return baseMapper.selectById(id)
     }
+
 }

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,67 +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="file_id" property="fileId" />
-        <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/SysDeptMapper.xml

@@ -11,7 +11,8 @@
     <result column="create_by" property="createBy" />
     <result column="update_time" property="updateTime" />
     <result column="update_by" property="updateBy" />
-        <result column="dept_name" property="deptName" />
+        <result column="parent_id" property="parentId" />
+        <result column="name" property="name" />
         <result column="principal" property="principal" />
         <result column="sort" property="sort" />
     </resultMap>

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

@@ -11,6 +11,7 @@
     <result column="create_by" property="createBy" />
     <result column="update_time" property="updateTime" />
     <result column="update_by" property="updateBy" />
+        <result column="platform_id" property="platformId" />
         <result column="key" property="key" />
         <result column="value" property="value" />
         <result column="sort" property="sort" />

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

@@ -11,13 +11,15 @@
     <result column="create_by" property="createBy" />
     <result column="update_time" property="updateTime" />
     <result column="update_by" property="updateBy" />
-        <result column="menu_name" property="menuName" />
-        <result column="menu_type" property="menuType" />
+        <result column="platform_id" property="platformId" />
         <result column="parent_id" property="parentId" />
-        <result column="request" property="request" />
+        <result column="name" property="name" />
+        <result column="permission" property="permission" />
+        <result column="type" property="type" />
+        <result column="url" property="url" />
         <result column="expand" property="expand" />
         <result column="sort" property="sort" />
-        <result column="is_show" property="isShow" />
+        <result column="is_leaf" property="isLeaf" />
     </resultMap>
 
 </mapper>

zen-api/src/main/resources/mapping/sys/SysRolePermissionMapper.xml → zen-api/src/main/resources/mapping/sys/SysMenuRoleMapper.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.SysRolePermissionMapper">
+<mapper namespace="com.gxzc.zen.api.sys.mapper.SysMenuRoleMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysRolePermission">
+    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysMenuRole">
     <result column="id" property="id" />
     <result column="enable" property="enable" />
     <result column="remark" property="remark" />
@@ -11,8 +11,8 @@
     <result column="create_by" property="createBy" />
     <result column="update_time" property="updateTime" />
     <result column="update_by" property="updateBy" />
+        <result column="menu_id" property="menuId" />
         <result column="role_id" property="roleId" />
-        <result column="permission_id" property="permissionId" />
     </resultMap>
 
 </mapper>

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

@@ -11,11 +11,10 @@
     <result column="create_by" property="createBy" />
     <result column="update_time" property="updateTime" />
     <result column="update_by" property="updateBy" />
+        <result column="platform_id" property="platformId" />
         <result column="name" property="name" />
-        <result column="code" property="code" />
-        <result column="parent_id" property="parentId" />
+        <result column="perm" property="perm" />
         <result column="description" property="description" />
-        <result column="menu_id" property="menuId" />
     </resultMap>
 
 </mapper>

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

@@ -11,7 +11,8 @@
     <result column="create_by" property="createBy" />
     <result column="update_time" property="updateTime" />
     <result column="update_by" property="updateBy" />
-        <result column="role_name" property="roleName" />
+        <result column="name" property="name" />
+        <result column="perm_ids" property="permIds" />
     </resultMap>
 
 </mapper>