修改dic缓存策略,添加dic工具类

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

@@ -2,7 +2,6 @@ package com.gxzc.zen.api.sys.mapper
 
 import com.gxzc.zen.api.sys.model.SysDic
 import com.gxzc.zen.common.base.BaseMapper
-import org.apache.ibatis.annotations.Param
 import org.springframework.stereotype.Repository
 
 /**
@@ -15,7 +14,5 @@ import org.springframework.stereotype.Repository
  */
 @Repository
 interface SysDicMapper : BaseMapper<SysDic> {
-    fun selectList(
-            @Param("key") key: String?,
-            @Param("enable") enable: Boolean?): MutableList<SysDic>
+    fun selectByParams(params: MutableMap<String, Any>?): MutableList<SysDic>
 }

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

@@ -13,19 +13,24 @@ import com.gxzc.zen.common.base.BaseService
  */
 interface ISysDicService : BaseService<SysDic> {
     /**
-     * 查询所有列表(where enable=1)
+     * 查询所有列表并存入缓存中(忽略enable)
      */
-    fun selectList(): MutableList<SysDic>
+    fun getListCacheable(): MutableList<SysDic>
 
     /**
-     * 根据key获取对应的SysDic列表
+     * 查询所有列表(忽略enable,不缓存)
+     */
+    fun getList(enable: Boolean?): MutableList<SysDic>
+
+    /**
+     * 根据key获取对应的SysDic列表(缓存获取)
      */
     fun getListByKey(key: String): MutableList<SysDic>
 
     /**
-     * 获取一个SysDic,若查询结果大于1个则取sort所指代的
+     * 获取一个SysDic,若查询结果大于1个则取第一个(缓存获取)
      */
-    fun getOneByKey(key: String, sort: Int): SysDic?
+    fun getOneByKey(key: String, value: String?, sort: Int?): SysDic?
 
     /**
      * 修改SysDic项

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

@@ -20,38 +20,62 @@ import org.springframework.stereotype.Service
  */
 @Service
 class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService {
+
+
+    companion object {
+        const val CACHE_KEY_ALL = "'dic_all'"
+    }
+
     @Autowired
     private lateinit var cacheManager: CacheManager
 
-    override fun selectList(): MutableList<SysDic> {
-        return baseMapper.selectList(null, true)
+    @Cacheable(CACHEKEYS.SYS, key = CACHE_KEY_ALL)
+//    @PostConstruct
+    override fun getListCacheable(): MutableList<SysDic> {
+        return baseMapper.selectByParams(null)
+    }
+
+    override fun getList(enable: Boolean?): MutableList<SysDic> {
+        return baseMapper.selectByParams(mutableMapOf(
+                "enable" to enable!!
+        ))
     }
 
-    @Cacheable(CACHEKEYS.SYS_DIC, key = "'key_' + #key")
+    //    @Cacheable(CACHEKEYS.SYS, key = "'dic_key_' + #key")
     override fun getListByKey(key: String): MutableList<SysDic> {
-        return baseMapper.selectList(key, true)
+        val allData = getListCacheable()
+        return allData.filter {
+            it.enable != null && it.enable!! && it.key == key
+        }.toMutableList()
     }
 
-    //    @CacheEvict(CACHEKEYS.SYS_DIC, key = "'key_' + #sysDic.key")
+    //    @CacheEvict(CACHEKEYS.SYS, key = "'dic_key_' + #sysDic.key")
     @Suppress("UNCHECKED_CAST")
     override fun modifySysDic(sysDic: SysDic): SysDic {
         baseMapper.updateById(sysDic)
         // 更新缓存
-        val cache = cacheManager.getCache(CACHEKEYS.SYS_DIC)
-        val cachedList: MutableList<SysDic>? = cache["key_${sysDic.key}"].get() as MutableList<SysDic>
+        val cache = cacheManager.getCache(CACHEKEYS.SYS)
+        val cachedList: MutableList<SysDic>? = cache[CACHE_KEY_ALL].get() as MutableList<SysDic>
         cachedList?.let {
             it.removeIf { it.id == sysDic.id }
             it.add(sysDic)
-            cache.put("key_${sysDic.key}", cachedList)
+            cache.put(CACHE_KEY_ALL, cachedList)
         }
 
         return sysDic
     }
 
-    override fun getOneByKey(key: String, sort: Int): SysDic? {
-        val result = baseMapper.selectList(key, true)
+    override fun getOneByKey(key: String, value: String?, sort: Int?): SysDic? {
+        val result = baseMapper.selectByParams(mutableMapOf(
+                "key" to key,
+                "value" to value!!,
+                "sort" to sort!!,
+                "enable" to true
+        ))
         return if (result.size > 0) {
-            result.filter { it.sort == sort }[0]
+            result.filter {
+                it.sort == sort && it.value == value
+            }[0]
         } else {
             null
         }

zen-api/src/main/kotlin/com/gxzc/zen/api/util/SysDicUtil.kt

@@ -0,0 +1,28 @@
+package com.gxzc.zen.api.util
+
+import com.gxzc.zen.api.sys.model.SysDic
+import com.gxzc.zen.api.sys.service.ISysDicService
+import com.gxzc.zen.common.util.SpringContextHolder
+
+/**
+ * 系统字典工具类
+ * 获取字典均是从缓存中获取的
+ * @author NorthLan
+ * @date 2018/3/17
+ * @url https://noahlan.com
+ */
+object SysDicUtil {
+    private val sysDicService: ISysDicService = SpringContextHolder.getBean(ISysDicService::class.java)
+
+    fun getAllList(): MutableList<SysDic> {
+        return sysDicService.getListCacheable()
+    }
+
+    fun getListByKey(key: String): MutableList<SysDic> {
+        return sysDicService.getListByKey(key)
+    }
+
+    fun getOne(key: String, value: String?, sort: Int?): SysDic? {
+        return sysDicService.getOneByKey(key, value, sort)
+    }
+}

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

@@ -18,23 +18,30 @@
     </resultMap>
 
     <sql id="dynamicSqlWhere">
-        WHERE 1=1
-        <!--<if test="enable != null">-->
-            <!--<choose>-->
-                <!--<when test="enable == true">-->
-                    <!--AND enable = 1-->
-                <!--</when>-->
-                <!--<otherwise>-->
-                    <!--AND enable = 0-->
-                <!--</otherwise>-->
-            <!--</choose>-->
-        <!--</if>-->
-        <!--<if test="key != null and key != ''">-->
-            <!--AND `key` = #{key}-->
-        <!--</if>-->
+        <where>
+            <if test="enable != null">
+                <choose>
+                    <when test="enable == true">
+                        AND enable = 1
+                    </when>
+                    <otherwise>
+                        AND enable = 0
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="key != null and key != ''">
+                AND `key` = #{key}
+            </if>
+            <if test="value != null and value != ''">
+                AND `value` = #{value}
+            </if>
+            <if test="sort != null and sort != ''">
+                AND sort = #{sort}
+            </if>
+        </where>
     </sql>
 
-    <select id="selectList" resultType="com.gxzc.zen.api.sys.model.SysDic">
+    <select id="selectByParams" resultType="com.gxzc.zen.api.sys.model.SysDic">
         SELECT *
         FROM sys_dic
         <include refid="dynamicSqlWhere"/>

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

@@ -11,6 +11,5 @@ object CACHEKEYS {
     const val ROLE = "role"
     const val USER_ROLE = "user_role"
     const val USER_PERM = "user_perm"
-    const val SYS_DIC = "sys_dic"
-    const val SYS_PARAM = "sys_param"
+    const val SYS = "sys"
 }

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

@@ -1,5 +1,7 @@
 package com.gxzc.zen.web.sys.controller
 
+import com.baomidou.kisso.annotation.Action
+import com.baomidou.kisso.annotation.Login
 import com.gxzc.zen.api.sys.model.SysDic
 import com.gxzc.zen.api.sys.service.ISysDicService
 import com.gxzc.zen.common.base.BaseController
@@ -27,10 +29,11 @@ class SysDicController : BaseController() {
     private lateinit var sysDicService: ISysDicService
 
     @GetMapping("/list")
+    @Login(action = Action.Skip)
     @ZenResponseFilter(type = SysDic::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
     fun getList(): ResponseEntity<*> {
         return ResponseEntity.ok(ResponseDto().apply {
-            data = sysDicService.selectList()
+            data = sysDicService.getListCacheable()
         })
     }
 

zen-web/src/main/resources/application-cache.yml

@@ -30,9 +30,6 @@ cache:
     user_role: # cache name
       initialCapacity: -1 # 初始化容量 默认-1
       maximumSize: 100 # 最大容量
-    sys_dic: # cache name
+    sys: # cache name
       initialCapacity: -1 # 初始化容量 默认-1
-      maximumSize: 1000 # 最大容量
-    sys_param: # cache name
-      initialCapacity: -1 # 初始化容量 默认-1
-      maximumSize: 1000 # 最大容量
+      maximumSize: 128 # 最大容量