修改字典结构,修复序列化bug

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/common/DictTree.kt

@@ -1,45 +0,0 @@
-package com.gxzc.zen.api.sys.common
-
-import com.gxzc.zen.common.util.common.TreeNode
-
-/**
- * 字典树
- * @author NorthLan
- * @date 2018/4/28
- * @url https://noahlan.com
- */
-open class DictTree : TreeNode() {
-    /**
-     * 字典码
-     */
-    var code: String? = null
-    /**
-     * 字典值
-     */
-    var value: String? = null
-    /**
-     * 标签（中文名）
-     */
-    var label: String? = null
-    /**
-     * 类型（1.目录 2.字典)
-     */
-    var type: Int? = null
-
-    override fun equals(other: Any?): Boolean {
-        return if (other is DictTree) {
-            other.code == this.code && other.type == this.type
-        } else {
-            super.equals(other)
-        }
-    }
-
-    override fun hashCode(): Int {
-        var result = super.hashCode()
-        result = 31 * result + (code?.hashCode() ?: 0)
-        result = 31 * result + (value?.hashCode() ?: 0)
-        result = 31 * result + (label?.hashCode() ?: 0)
-        result = 31 * result + (type ?: 0)
-        return result
-    }
-}

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/common/DictTypeTree.kt

@@ -0,0 +1,21 @@
+package com.gxzc.zen.api.sys.common
+
+import com.gxzc.zen.common.util.common.TreeNode
+
+/**
+ * 字典结构树
+ * @author NorthLan
+ * @date 2018/4/28
+ * @url https://noahlan.com
+ */
+//@JsonInclude(JsonInclude.Include.NON_EMPTY) // jackson 忽略空值
+open class DictTypeTree : TreeNode() {
+    /**
+     * 目录码
+     */
+    var code: String? = null
+    /**
+     * 标签
+     */
+    var label: String? = null
+}

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/common/MenuTree.kt

@@ -9,6 +9,9 @@ import com.gxzc.zen.common.util.common.TreeNode
  * @url https://noahlan.com
  */
 class MenuTree : TreeNode() {
+    companion object {
+        private const val serialVersionUID = 5640224091610000005L
+    }
     /**
      * 菜单编码
      */

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/constants/CacheKeyConstants.kt

@@ -0,0 +1,11 @@
+package com.gxzc.zen.api.sys.constants
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/5/5
+ * @url https://noahlan.com
+ */
+object CacheKeyConstants {
+    const val DICT_VALUE_KEY = "dict_value"
+}

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysDictMapper.kt → zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysDictTypeMapper.kt

@@ -1,19 +1,20 @@
 package com.gxzc.zen.api.sys.mapper
 
-import com.gxzc.zen.api.sys.model.SysDict
+import com.gxzc.zen.api.sys.model.SysDictType
 import com.gxzc.zen.common.base.BaseMapper
 import org.apache.ibatis.annotations.Param
 import org.springframework.stereotype.Repository
 
 /**
  * <p>
- * 字典表 Mapper 接口
+ * 字典结构树 Mapper 接口
  * </p>
  *
  * @author NorthLan
- * @since 2018-04-28
+ * @date 2018/5/5
+ * @url https://noahlan.com
  */
 @Repository
-interface SysDictMapper : BaseMapper<SysDict> {
+interface SysDictTypeMapper : BaseMapper<SysDictType>{
     fun updatePath(@Param("parentId") parentId: Long, @Param("id") id: Long): Int
-}
+}

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

@@ -0,0 +1,17 @@
+package com.gxzc.zen.api.sys.mapper
+
+import com.gxzc.zen.api.sys.model.SysDictValue
+import com.gxzc.zen.common.base.BaseMapper
+import org.springframework.stereotype.Repository
+
+/**
+ * <p>
+ * 字典值 Mapper 接口
+ * </p>
+ *
+ * @author NorthLan
+ * @date 2018/5/5
+ * @url https://noahlan.com
+ */
+@Repository
+interface SysDictValueMapper : BaseMapper<SysDictValue>

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

@@ -0,0 +1,32 @@
+package com.gxzc.zen.api.sys.model
+
+import com.baomidou.mybatisplus.annotations.TableName
+import com.gxzc.zen.common.base.BaseModel
+
+/**
+ * <p>
+ * 字典结构树
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-04-28
+ */
+@TableName("sys_dict_type")
+open class SysDictType : BaseModel() {
+    /**
+     * 目录码
+     */
+    var code: String? = null
+    /**
+     * 标签
+     */
+    var label: String? = null
+    /**
+     * 父节点id
+     */
+    var parentId: Long? = null
+    /**
+     * 路径枚举
+     */
+    var path: String? = null
+}

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysDict.kt → zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysDictValue.kt

@@ -5,14 +5,18 @@ import com.gxzc.zen.common.base.BaseModel
 
 /**
  * <p>
- * 字典表
+ * 字典值
  * </p>
  *
  * @author NorthLan
  * @since 2018-04-28
  */
-@TableName("sys_dict")
-open class SysDict : BaseModel() {
+@TableName("sys_dict_value")
+open class SysDictValue : BaseModel() {
+    /**
+     * 关联字典树ID
+     */
+    var typeId: Long? = null
     /**
      * 字典码
      */
@@ -25,18 +29,6 @@ open class SysDict : BaseModel() {
      * 标签（中文名）
      */
     var label: String? = null
-    /**
-     * 类型（1.目录 2.字典)
-     */
-    var type: Int? = null
-    /**
-     * 父节点id
-     */
-    var parentId: Long? = null
-    /**
-     * 路径枚举
-     */
-    var path: String? = null
     /**
      * 排序号
      */

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

@@ -13,6 +13,9 @@ import com.gxzc.zen.common.base.BaseModel
  */
 @TableName("sys_role")
 open class SysRole : BaseModel() {
+    companion object {
+        private const val serialVersionUID = 1000000000000000003L
+    }
     /**
      * 父级节点
      */

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

@@ -13,6 +13,9 @@ import com.gxzc.zen.common.base.BaseModel
  */
 @TableName("sys_user")
 open class SysUser : BaseModel() {
+    companion object {
+        private const val serialVersionUID = 1000000000000000002L
+    }
     /**
      * 登陆帐户
      */

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

@@ -13,6 +13,9 @@ import com.gxzc.zen.common.base.BaseModel
  */
 @TableName("sys_user_role")
 open class SysUserRole : BaseModel() {
+    companion object {
+        private const val serialVersionUID = 1000000000000000005L
+    }
     /**
      * 角色ID
      */

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

@@ -1,22 +0,0 @@
-package com.gxzc.zen.api.sys.service
-
-import com.gxzc.zen.api.sys.model.SysDict
-import com.gxzc.zen.common.base.BaseService
-import com.gxzc.zen.common.util.common.TreeNode
-
-/**
- * <p>
- * 字典表 服务类
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-interface ISysDictService : BaseService<SysDict> {
-    fun getRootTree(): TreeNode?
-
-    /**
-     * 插入树节点数据
-     */
-    fun insertTree(entity: SysDict)
-}

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

@@ -0,0 +1,35 @@
+package com.gxzc.zen.api.sys.service
+
+import com.gxzc.zen.api.sys.common.DictTypeTree
+import com.gxzc.zen.api.sys.model.SysDictType
+import com.gxzc.zen.common.base.BaseService
+
+/**
+ * <p>
+ * 字典结构树 服务类
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-04-28
+ */
+interface ISysDictTypeService : BaseService<SysDictType> {
+    /**
+     * 获取结构树
+     */
+    fun getDictTypeTree(): MutableList<DictTypeTree>
+
+    /**
+     * 创建
+     */
+    fun createDictType(entity: SysDictType): SysDictType
+
+    /**
+     * 更新条目(移动节点除外)
+     */
+    fun updateDictType(entity: SysDictType): SysDictType
+
+    /**
+     * 删除条目(包括所有子节点)
+     */
+    fun deleteDictType(id: Long?)
+}

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

@@ -0,0 +1,48 @@
+package com.gxzc.zen.api.sys.service
+
+import com.gxzc.zen.api.sys.model.SysDictValue
+import com.gxzc.zen.common.base.BaseService
+
+/**
+ * <p>
+ * 字典值 服务类
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-04-28
+ */
+interface ISysDictValueService : BaseService<SysDictValue> {
+    /**
+     * 初始化 dict value
+     */
+    fun init()
+
+    /**
+     * 获取缓存中所有的 字典值
+     */
+    fun getListCacheable(): MutableList<SysDictValue>
+
+    /**
+     * 删除所有 typeid 指定的字典值
+     */
+    fun deleteByTypeId(typeId: Long)
+
+    /**
+     * 获取所有typeid下的dict-value
+     */
+    fun getListByTypeId(typeId: Long?): MutableList<SysDictValue>
+
+    /**
+     * 插入一条dict-value
+     */
+    fun insertDictValue(entity: SysDictValue): SysDictValue
+
+    /**
+     * 更新一条数据,不包含移动位置
+     */
+    fun updateDictValue(entity: SysDictValue): SysDictValue
+    /**
+     * 删除一条记录
+     */
+    fun deleteDictValue(id: Long)
+}

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

@@ -1,59 +0,0 @@
-package com.gxzc.zen.api.sys.service.impl
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
-import com.gxzc.zen.api.sys.common.DictTree
-import com.gxzc.zen.api.sys.mapper.SysDictMapper
-import com.gxzc.zen.api.sys.model.SysDict
-import com.gxzc.zen.api.sys.service.ISysDictService
-import com.gxzc.zen.common.contants.ZenConstants
-import com.gxzc.zen.common.exception.ZenException
-import com.gxzc.zen.common.exception.ZenExceptionEnum
-import com.gxzc.zen.common.util.TreeUtil
-import com.gxzc.zen.common.util.common.TreeNode
-import com.gxzc.zen.orm.annotation.ZenTransactional
-import org.springframework.beans.BeanUtils
-import org.springframework.stereotype.Service
-
-/**
- * <p>
- * 字典表 服务实现类
- * </p>
- *
- * @author NorthLan
- * @since 2018-04-28
- */
-@Service
-class SysDictServiceImpl : ServiceImpl<SysDictMapper, SysDict>(), ISysDictService {
-
-    override fun getRootTree(): TreeNode? {
-        val ret = getTree()
-        return if (ret.isEmpty()) null else ret[0]
-    }
-
-    private fun getTree(): MutableList<DictTree> {
-        val nodes = mutableListOf<DictTree>()
-        baseMapper.selectList(null)?.forEach {
-            val node = DictTree()
-            BeanUtils.copyProperties(it, node)
-            nodes.add(node)
-        }
-        return TreeUtil.build(nodes, ZenConstants.TREE_ROOT_PID)
-    }
-
-
-    @ZenTransactional
-    override fun insertTree(entity: SysDict) {
-        // 没有父节点id 不存在的
-        if (entity.parentId == null) {
-            entity.parentId = 0L
-        }
-        // 插入一条,然后修改path
-        if (baseMapper.insert(entity) <= 0) {
-            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
-        }
-
-        if (baseMapper.updatePath(entity.parentId!!, entity.id!!) <= 0) {
-            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
-        }
-    }
-}

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

@@ -0,0 +1,77 @@
+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.common.DictTypeTree
+import com.gxzc.zen.api.sys.mapper.SysDictTypeMapper
+import com.gxzc.zen.api.sys.model.SysDictType
+import com.gxzc.zen.api.sys.service.ISysDictTypeService
+import com.gxzc.zen.api.sys.service.ISysDictValueService
+import com.gxzc.zen.common.contants.ZenConstants
+import com.gxzc.zen.common.exception.ZenException
+import com.gxzc.zen.common.exception.ZenExceptionEnum
+import com.gxzc.zen.common.util.TreeUtil
+import com.gxzc.zen.orm.annotation.ZenTransactional
+import org.springframework.beans.BeanUtils
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.stereotype.Service
+
+/**
+ * <p>
+ * 字典结构树 服务实现类
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-04-28
+ */
+@Service
+class SysDictTypeServiceImpl : ServiceImpl<SysDictTypeMapper, SysDictType>(), ISysDictTypeService {
+    @Autowired
+    private lateinit var dictValueService: ISysDictValueService
+
+    private fun getTree(list: List<SysDictType>): MutableList<DictTypeTree> {
+        val result = mutableListOf<DictTypeTree>()
+        list.forEach {
+            val node = DictTypeTree()
+            BeanUtils.copyProperties(it, node)
+            result.add(node)
+        }
+        return TreeUtil.build(result, ZenConstants.TREE_ROOT_PID)
+    }
+
+    override fun getDictTypeTree(): MutableList<DictTypeTree> {
+        return getTree(baseMapper.selectList(null))
+    }
+
+    @ZenTransactional
+    override fun createDictType(entity: SysDictType): SysDictType {
+        // 先新增一条数据 再根据此数据更新对应的path
+        if (baseMapper.insert(entity) <= 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
+        }
+        if (baseMapper.updatePath(entity.parentId!!, entity.id!!) <= 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
+        }
+        return entity
+    }
+
+    override fun updateDictType(entity: SysDictType): SysDictType {
+        if (baseMapper.updateById(entity) <= 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_UPDATE_ERROR)
+        }
+        return entity
+    }
+
+    @ZenTransactional
+    override fun deleteDictType(id: Long?) {
+        if (id == null) {
+            throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
+        }
+        // 先查询现有的数据 (path)
+        val stored = baseMapper.selectById(id) ?: throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
+        if (baseMapper.physicalDelete(EntityWrapper<SysDictType>().like("path", "${stored.path!!}%")) <= 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
+        }
+        dictValueService.deleteByTypeId(id)
+    }
+}

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

@@ -0,0 +1,86 @@
+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.constants.CacheKeyConstants
+import com.gxzc.zen.api.sys.mapper.SysDictValueMapper
+import com.gxzc.zen.api.sys.model.SysDictValue
+import com.gxzc.zen.api.sys.service.ISysDictValueService
+import com.gxzc.zen.common.contants.ZenConstants
+import com.gxzc.zen.common.exception.ZenException
+import com.gxzc.zen.common.exception.ZenExceptionEnum
+import com.gxzc.zen.common.util.RedisCacheUtil
+import org.springframework.stereotype.Service
+
+/**
+ * <p>
+ * 字典值 服务实现类
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-04-28
+ */
+@Suppress("UNCHECKED_CAST")
+@Service
+class SysDictValueServiceImpl : ServiceImpl<SysDictValueMapper, SysDictValue>(), ISysDictValueService {
+    override fun init() {
+        getListCacheable()
+    }
+
+    override fun getListCacheable(): MutableList<SysDictValue> {
+        var data = RedisCacheUtil.get(ZenConstants.CACHE_KEY_SYS, CacheKeyConstants.DICT_VALUE_KEY) as? MutableList<SysDictValue>
+        if (data == null || data.isEmpty()) {
+            data = baseMapper.selectWOLogic(null)
+            RedisCacheUtil.put(ZenConstants.CACHE_KEY_SYS, CacheKeyConstants.DICT_VALUE_KEY, data)
+        }
+        return data
+    }
+
+    override fun deleteByTypeId(typeId: Long) {
+        val condition = SysDictValue().apply {
+            this.typeId = typeId
+        }
+        baseMapper.physicalDelete(EntityWrapper(condition))
+        // 刷新缓存
+        evictCache()
+    }
+
+    override fun insertDictValue(entity: SysDictValue): SysDictValue {
+        if (baseMapper.insert(entity) <= 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
+        }
+        // 刷新缓存
+        evictCache()
+        return entity
+    }
+
+    override fun getListByTypeId(typeId: Long?): MutableList<SysDictValue> {
+        if (typeId == null) {
+            return mutableListOf()
+        }
+        val cachedList = getListCacheable()
+        return cachedList.filter {
+            it.typeId == typeId
+        }.toMutableList()
+    }
+
+    override fun updateDictValue(entity: SysDictValue): SysDictValue {
+        if (entity.id == null) {
+            throw ZenException(ZenExceptionEnum.BIZ_UPDATE_ERROR)
+        }
+        baseMapper.updateWOLogic(entity, EntityWrapper<SysDictValue>().eq("id", entity.id))
+        // 刷新缓存
+        evictCache()
+        return entity
+    }
+
+    override fun deleteDictValue(id: Long) {
+        baseMapper.physicalDeleteById(id)
+        // 刷新缓存
+        evictCache()
+    }
+
+    private fun evictCache() {
+        RedisCacheUtil.evict(ZenConstants.CACHE_KEY_SYS, CacheKeyConstants.DICT_VALUE_KEY)
+    }
+}

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

@@ -79,7 +79,6 @@ class SysMenuServiceImpl : ServiceImpl<SysMenuMapper, SysMenu>(), ISysMenuServic
             menu = getUserMenuTree(res, roleIds)
             if (menu.isNotEmpty()) {
                 // 所有需要修改
-                // TIP 所有修改了 用户角色 用户资源 菜单信息 均需要刷新此缓存
                 SSOUtil.setAttribute(ZenHttpSession.SESSION_KEY_USER_MENU, menu)
             } else {
                 return mutableListOf()

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

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import com.gxzc.zen.api.sys.mapper.SysParamMapper
 import com.gxzc.zen.api.sys.model.SysParam
 import com.gxzc.zen.api.sys.service.ISysParamService
-import com.gxzc.zen.common.contants.CACHEKEYS
 import com.gxzc.zen.common.contants.PLATFORM
+import com.gxzc.zen.common.contants.ZenConstants
 import com.gxzc.zen.common.exception.ZenException
 import com.gxzc.zen.common.exception.ZenExceptionEnum
 import com.gxzc.zen.common.properties.PlatformProperties
@@ -43,13 +43,13 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
     }
 
     override fun getListCacheable(): MutableList<SysParam> {
-        val cached = RedisCacheUtil.get(CACHEKEYS.SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysParam>
+        val cached = RedisCacheUtil.get(ZenConstants.CACHE_KEY_SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysParam>
         if (cached != null) {
             return cached
         }
         val ret = baseMapper.selectWOLogic(null)
         if (PlatformUtil.getPlatform(platformProperties) == PLATFORM.SYSTEM) {
-            RedisCacheUtil.put(CACHEKEYS.SYS, CACHE_KEY_ALL, ret)
+            RedisCacheUtil.put(ZenConstants.CACHE_KEY_SYS, CACHE_KEY_ALL, ret)
         }
         return ret
     }
@@ -74,13 +74,13 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
         if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
             baseMapper.updateWOLogic(data, EntityWrapper<SysParam>().eq("id", data.id))
             // 更新缓存
-            val cached = RedisCacheUtil.get(CACHEKEYS.SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysParam>
+            val cached = RedisCacheUtil.get(ZenConstants.CACHE_KEY_SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysParam>
             cached?.let {
                 val idx = it.indexOfFirst { it.id == data.id }
                 if (idx != -1) {
                     it[idx] = data
                 }
-                RedisCacheUtil.put(CACHEKEYS.SYS, CACHE_KEY_ALL, it)
+                RedisCacheUtil.put(ZenConstants.CACHE_KEY_SYS, CACHE_KEY_ALL, it)
             }
         }
         return data
@@ -112,10 +112,10 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
             if (baseMapper.insert(data) == 0) {
                 throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
             }
-            val cached = RedisCacheUtil.get(CACHEKEYS.SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysParam>
+            val cached = RedisCacheUtil.get(ZenConstants.CACHE_KEY_SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysParam>
             cached?.let {
                 it.add(data)
-                RedisCacheUtil.put(CACHEKEYS.SYS, CACHE_KEY_ALL, it)
+                RedisCacheUtil.put(ZenConstants.CACHE_KEY_SYS, CACHE_KEY_ALL, it)
             }
         }
     }
@@ -127,12 +127,12 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
                 throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
             }
             //
-            val cached = RedisCacheUtil.get(CACHEKEYS.SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysParam>
+            val cached = RedisCacheUtil.get(ZenConstants.CACHE_KEY_SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysParam>
             cached?.let {
                 it.removeIf {
                     it.id == id
                 }
-                RedisCacheUtil.put(CACHEKEYS.SYS, CACHE_KEY_ALL, it)
+                RedisCacheUtil.put(ZenConstants.CACHE_KEY_SYS, CACHE_KEY_ALL, it)
             }
         }
     }

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

@@ -5,7 +5,7 @@ import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.api.sys.service.ISysPermissionService
 import com.gxzc.zen.api.sys.service.ISysResourceService
 import com.gxzc.zen.api.sys.service.ISysRoleService
-import com.gxzc.zen.common.contants.CACHEKEYS
+import com.gxzc.zen.common.contants.ZenConstants
 import com.gxzc.zen.common.util.RedisCacheUtil
 import com.gxzc.zen.umps.common.ZenPermission
 import com.gxzc.zen.umps.constant.ZenHttpSession
@@ -34,7 +34,7 @@ class SysPermissionServiceImpl : ISysPermissionService {
     private lateinit var roleService: ISysRoleService
 
     override fun getAllSysPermission(): MutableList<ZenPermission> {
-        var result = RedisCacheUtil.get(CACHEKEYS.SYS, "allPerms")?.get() as? MutableList<ZenPermission>
+        var result = RedisCacheUtil.get(ZenConstants.CACHE_KEY_SYS, "allPerms")?.get() as? MutableList<ZenPermission>
         if (result == null || result.isEmpty()) {
             result = mutableListOf()
             val res = sysResourceService.selectList(null)
@@ -45,7 +45,7 @@ class SysPermissionServiceImpl : ISysPermissionService {
 
 //        if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
         if (result.isNotEmpty()) {
-            RedisCacheUtil.put(CACHEKEYS.SYS, "allPerms", result)
+            RedisCacheUtil.put(ZenConstants.CACHE_KEY_SYS, "allPerms", result)
 //            }
         }
 
@@ -91,7 +91,7 @@ class SysPermissionServiceImpl : ISysPermissionService {
     }
 
     override fun updateAllSysPermission() {
-        RedisCacheUtil.evict(CACHEKEYS.SYS, "allPerms")
+        RedisCacheUtil.evict(ZenConstants.CACHE_KEY_SYS, "allPerms")
     }
 
     override fun updateAllSessionPermission() {

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

@@ -7,15 +7,12 @@ import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.api.sys.model.SysUserRole
 import com.gxzc.zen.api.sys.service.ISysPermissionService
 import com.gxzc.zen.api.sys.service.ISysUserRoleService
-import com.gxzc.zen.common.contants.CACHEKEYS
 import com.gxzc.zen.common.exception.ZenException
 import com.gxzc.zen.common.exception.ZenExceptionEnum
-import com.gxzc.zen.common.util.RedisCacheUtil
 import com.gxzc.zen.orm.annotation.DynamicDataSource
 import com.gxzc.zen.orm.annotation.ZenTransactional
 import com.gxzc.zen.orm.contants.DSKey
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Service
 
 /**
@@ -90,13 +87,13 @@ class SysUserRoleServiceImpl : ServiceImpl<SysUserRoleMapper, SysUserRole>(), IS
     }
 
     override fun evictCache(id: Long) {
-        RedisCacheUtil.evict(CACHEKEYS.USER_ROLE, "${CACHEKEYS.USER_ROLE}:uid_$id")
+//        RedisCacheUtil.evict(CACHEKEYS.USER_ROLE, "${CACHEKEYS.USER_ROLE}:uid_$id")
 //        sysPermissionService.evictCache(id)
     }
 
     override fun evictCache(ids: Set<Long>) {
         ids.forEach {
-            RedisCacheUtil.evict(CACHEKEYS.USER_ROLE, "${CACHEKEYS.USER_ROLE}:uid_$it")
+//            RedisCacheUtil.evict(CACHEKEYS.USER_ROLE, "${CACHEKEYS.USER_ROLE}:uid_$it")
 //            sysPermissionService.evictCache(it)
         }
 

zen-api/src/main/resources/mapping/sys/SysDictMapper.xml → zen-api/src/main/resources/mapping/sys/SysDictTypeMapper.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.SysDictMapper">
+<mapper namespace="com.gxzc.zen.api.sys.mapper.SysDictTypeMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysDict">
+    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysDictType">
         <result column="id" property="id"/>
         <result column="enable" property="enable"/>
         <result column="remark" property="remark"/>
@@ -12,17 +12,14 @@
         <result column="update_time" property="updateTime"/>
         <result column="update_by" property="updateBy"/>
         <result column="code" property="code"/>
-        <result column="value" property="value"/>
         <result column="label" property="label"/>
-        <result column="type" property="type"/>
         <result column="parent_id" property="parentId"/>
         <result column="path" property="path"/>
-        <result column="sort" property="sort"/>
     </resultMap>
 
     <update id="updatePath">
-        UPDATE `sys_dict`
-        SET path = CONCAT((SELECT path FROM (SELECT * FROM `sys_dict` WHERE id = #{parentId}) AS temp), '-', #{id})
+        UPDATE `sys_dict_type`
+        SET path = CONCAT((SELECT path FROM (SELECT * FROM `sys_dict_type` WHERE id = #{parentId}) AS temp), '-', #{id})
         WHERE id = #{id}
     </update>
 

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gxzc.zen.api.sys.mapper.SysDictValueMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysDictValue">
+        <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_id" property="typeId"/>
+        <result column="code" property="code"/>
+        <result column="value" property="code"/>
+        <result column="label" property="label"/>
+        <result column="sort" property="sort"/>
+    </resultMap>
+
+</mapper>

zen-api/src/test/kotlin/com/gxzc/zen/api/TestDictTreeRedis.kt → zen-api/src/test/kotlin/com/gxzc/zen/api/TestDictTypeTreeRedis.kt

@@ -1,7 +1,7 @@
 package com.gxzc.zen.api
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.gxzc.zen.api.sys.common.DictTree
+import com.gxzc.zen.api.sys.common.DictTypeTree
 import com.gxzc.zen.common.util.TreeUtil
 import org.junit.Test
 
@@ -11,67 +11,67 @@ import org.junit.Test
  * @date 2018/4/28
  * @url https://noahlan.com
  */
-class TestDictTreeRedis {
+class TestDictTypeTreeRedis {
 
-    fun buildData(): MutableList<DictTree> {
-        return mutableListOf<DictTree>().apply {
-            add(DictTree().apply {
+    fun buildData(): MutableList<DictTypeTree> {
+        return mutableListOf<DictTypeTree>().apply {
+            add(DictTypeTree().apply {
                 id = 1
                 parentId = 0
                 type = 1
             })
-            add(DictTree().apply {
+            add(DictTypeTree().apply {
                 id = 2
                 parentId = 1
                 type = 1
             })
-            add(DictTree().apply {
+            add(DictTypeTree().apply {
                 id = 3
                 parentId = 1
                 type = 1
             })
-            add(DictTree().apply {
+            add(DictTypeTree().apply {
                 id = 4
                 parentId = 2
                 type = 1
                 code = "test"
             })
-            add(DictTree().apply {
+            add(DictTypeTree().apply {
                 id = 5
                 parentId = 4
                 type = 2
                 value = "1"
                 code = "test"
             })
-            add(DictTree().apply {
+            add(DictTypeTree().apply {
                 id = 6
                 parentId = 4
                 type = 2
                 value = "2"
                 code = "test"
             })
-            add(DictTree().apply {
+            add(DictTypeTree().apply {
                 id = 7
                 parentId = 4
                 type = 2
                 value = "3"
                 code = "test"
             })
-            add(DictTree().apply {
+            add(DictTypeTree().apply {
                 id = 8
                 parentId = 4
                 type = 2
                 value = "4"
                 code = "test"
             })
-            add(DictTree().apply {
+            add(DictTypeTree().apply {
                 id = 9
                 parentId = 4
                 type = 2
                 value = "5"
                 code = "test"
             })
-            add(DictTree().apply {
+            add(DictTypeTree().apply {
                 id = 10
                 parentId = 4
                 type = 2

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

@@ -1,15 +0,0 @@
-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 ROLE = "role"
-    const val USER_ROLE = "user_role"
-    const val USER_PERM = "user_perm"
-    const val SYS = "sys"
-}

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

@@ -8,11 +8,7 @@ package com.gxzc.zen.common.contants
  */
 enum class PLATFORM(val id: Int) {
     COMMON(0),
-    SYSTEM(1),
-    RECEIVE(2),
-    SAVE(3),
-    MANAGER(4),
-    UTILIZATION(5);
+    SYSTEM(1);
 
     companion object {
         fun intValueOf(id: Int): PLATFORM {

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

@@ -9,4 +9,6 @@ package com.gxzc.zen.common.contants
 object ZenConstants {
     const val TREE_ROOT_PID = 0L
     const val TREE_PATH_SEPARATOR = "-"
+    //
+    const val CACHE_KEY_SYS = "sys"
 }

zen-core/src/main/kotlin/com/gxzc/zen/common/util/common/TreeNode.kt

@@ -30,7 +30,6 @@ open class TreeNode : Serializable {
         if (children != null) {
             children!!.let { c ->
                 c.sortWith(comparator ?: Comparator { o1, o2 -> o1.sort!! - o2.sort!! })
-
                 // 所有子节点排个序
                 c.forEach {
                     it.sortChildren(comparator)

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

@@ -0,0 +1,31 @@
+package com.gxzc.zen
+
+import com.gxzc.zen.api.sys.service.ISysDictValueService
+import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.ApplicationArguments
+import org.springframework.boot.ApplicationRunner
+import org.springframework.stereotype.Component
+
+/**
+ * 启动加载
+ * @author NorthLan
+ * @date 2018/5/5
+ * @url https://noahlan.com
+ */
+@Component
+class ApplicationRunner : ApplicationRunner {
+    companion object {
+        private val logger = LoggerFactory.getLogger(ApplicationRunner::class.java)
+    }
+
+    @Autowired
+    private lateinit var dictValueService: ISysDictValueService
+
+    override fun run(args: ApplicationArguments?) {
+        logger.info("Started successful. Initializing...")
+
+        logger.info("Initializing DictValue...")
+        dictValueService.init()
+    }
+}

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

@@ -0,0 +1,89 @@
+package com.gxzc.zen.web.sys.controller
+
+import com.gxzc.zen.api.sys.model.SysDictType
+import com.gxzc.zen.api.sys.model.SysDictValue
+import com.gxzc.zen.api.sys.service.ISysDictTypeService
+import com.gxzc.zen.api.sys.service.ISysDictValueService
+import com.gxzc.zen.common.base.BaseController
+import com.gxzc.zen.common.dto.ResponseDto
+import io.swagger.annotations.ApiOperation
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.*
+
+/**
+ * 字典 控制器
+ * @author NorthLan
+ * @date 2018/5/5
+ * @url https://noahlan.com
+ */
+@RestController
+@RequestMapping("dict")
+class DictController : BaseController() {
+    @Autowired
+    private lateinit var dictTypeService: ISysDictTypeService
+    @Autowired
+    private lateinit var dictValueService: ISysDictValueService
+
+    @ApiOperation("获取字典树")
+    @GetMapping("type/tree")
+    fun getDictTypeTree(): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            this.data = dictTypeService.getDictTypeTree()
+        })
+    }
+
+    @ApiOperation("新增字典类别")
+    @PostMapping("type")
+    fun addDictType(@RequestBody entity: SysDictType): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            this.data = dictTypeService.createDictType(entity)
+        })
+    }
+
+    @ApiOperation("删除字典类别树及其所有子孙")
+    @DeleteMapping("type/{id}")
+    fun deleteDictType(@PathVariable id: Long?): ResponseEntity<*> {
+        dictTypeService.deleteDictType(id)
+        return ResponseEntity.ok(ResponseDto())
+    }
+
+    @ApiOperation("更新字典类别树节点信息,不包含移动树节点")
+    @PutMapping("type/{id}")
+    fun updateDictType(@PathVariable id: Long, @RequestBody entity: SysDictType): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            this.data = dictTypeService.updateDictType(entity)
+        })
+    }
+
+    @ApiOperation("获取某节点下的字典值列表")
+    @GetMapping("value/list")
+    fun getDictValueByTypeId(@RequestParam("typeId") typeId: Long): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            this.data = dictValueService.getListByTypeId(typeId)
+        })
+    }
+
+    @ApiOperation("在某节点下插入字典值")
+    @PostMapping("value")
+    fun addDictValue(@RequestBody entity: SysDictValue): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            this.data = dictValueService.insertDictValue(entity)
+        })
+    }
+
+    @ApiOperation("删除字典值")
+    @DeleteMapping("value/{id}")
+    fun deleteDictValueById(@PathVariable id: Long): ResponseEntity<*> {
+        dictValueService.deleteDictValue(id)
+        return ResponseEntity.ok(ResponseDto())
+    }
+
+    @ApiOperation("更新字典值")
+    @PutMapping("value/{id}")
+    fun updateDictValue(@PathVariable id: Long, @RequestBody entity: SysDictValue): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            this.data = dictValueService.updateDictValue(entity)
+        })
+    }
+}

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

@@ -1,106 +0,0 @@
-//package com.gxzc.zen.web.sys.controller
-//
-//import com.gxzc.zen.api.sys.model.SysDic
-//import com.gxzc.zen.common.base.BaseController
-//import com.gxzc.zen.common.config.response.annotation.ZenResponseFilter
-//import com.gxzc.zen.common.dto.ResponseDto
-//import com.gxzc.zen.common.util.PaginationUtil
-//import org.slf4j.LoggerFactory
-//import org.springframework.beans.factory.annotation.Autowired
-//import org.springframework.http.ResponseEntity
-//import org.springframework.web.bind.annotation.*
-//import java.net.URI
-//
-///**
-// * 系统字典 控制器
-// * @author NorthLan
-// * @date 2018/3/9
-// * @url https://noahlan.com
-// */
-//@RestController
-//@RequestMapping("/sys/dic")
-//class SysDicController : BaseController() {
-//    companion object {
-//        private val logger = LoggerFactory.getLogger(SysDicController::class.java)
-//    }
-//
-//    @Autowired
-//    private lateinit var sysDicService: ISysDicService
-//
-//    @GetMapping("/list")
-//    @ZenResponseFilter(type = SysDic::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
-//    fun getList(@RequestParam(required = false) keyword: String?,
-//                @RequestParam(required = false) searchOption: Int?): ResponseEntity<*> {
-//        var data: MutableList<SysDic> = sysDicService.getListCacheable()
-//        if (!keyword.isNullOrEmpty() && searchOption != null) {
-//            data = data.filter {
-//                when (searchOption) {
-//                    1 -> run {
-//                        if (it.key != null) {
-//                            keyword!! in it.key!!
-//                        } else {
-//                            false
-//                        }
-//                    }
-//                    2 -> run {
-//                        if (it.label != null) {
-//                            keyword!! in it.label!!
-//                        } else {
-//                            false
-//                        }
-//                    }
-//                    else -> false
-//                }
-//            }.toMutableList()
-//        }
-//
-//        return if (PaginationUtil.paginable(getRequest())) {
-//            // 分页
-//            ResponseEntity.ok(ResponseDto().apply {
-//                this.data = PaginationUtil.logicPaging(data, getRequest())
-//            })
-//        } else {
-//            ResponseEntity.ok(ResponseDto().apply {
-//                this.data = data
-//            })
-//        }
-//    }
-//
-//    @GetMapping("{id}")
-//    @ZenResponseFilter(type = SysDic::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
-//    fun getById(@PathVariable id: Long): ResponseEntity<*> {
-//        return ResponseEntity.ok(ResponseDto().apply {
-//            data = sysDicService.selectById(id)
-//        })
-//    }
-//
-//    @GetMapping("keys/{key}")
-//    @ZenResponseFilter(type = SysDic::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
-//    fun getByKey(@PathVariable key: String): ResponseEntity<*> {
-//        return ResponseEntity.ok(ResponseDto().apply {
-//            data = sysDicService.getListByKey(key)
-//        })
-//    }
-//
-//    @PutMapping
-//    @ZenResponseFilter(type = SysDic::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
-//    fun putDic(@RequestBody data: SysDic): ResponseEntity<*> {
-//        return if (data.id == null) {
-//            // insert
-//            sysDicService.insertCacheable(data)
-//            ResponseEntity.created(URI.create("/sys/dic/${data.id}")).body(ResponseDto()) // 201
-//        } else {
-//            // update
-//            ResponseEntity.ok(ResponseDto().apply {
-//                this.data = sysDicService.modify(data) // 200
-//            })
-//        }
-//    }
-//
-//    @DeleteMapping("{id}")
-//    fun deleteDic(@PathVariable id: Long): ResponseEntity<*> {
-//        // 物理删除数据
-//        sysDicService.physicalDeleteCacheable(id)
-//        return ResponseEntity.ok(ResponseDto())
-//    }
-//}