重构sys

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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