优化系统sql

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

@@ -3,6 +3,7 @@ package com.gxzc.zen.api.sys.mapper
 import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.common.base.BaseMapper
 import org.springframework.stereotype.Repository
+
 /**
  * <p>
  * 角色表 Mapper 接口
@@ -12,4 +13,6 @@ import org.springframework.stereotype.Repository
  * @since 2018-02-06
  */
 @Repository
-interface SysRoleMapper : BaseMapper<SysRole>
+interface SysRoleMapper : BaseMapper<SysRole> {
+
+}

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

@@ -1,7 +1,9 @@
 package com.gxzc.zen.api.sys.service
 
+import com.baomidou.mybatisplus.plugins.Page
 import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.common.base.BaseService
+
 /**
  * <p>
  * 角色表 服务类
@@ -10,4 +12,15 @@ import com.gxzc.zen.common.base.BaseService
  * @author NorthLan123
  * @since 2018-02-06
  */
-interface ISysRoleService : BaseService<SysRole>
+interface ISysRoleService : BaseService<SysRole> {
+    /**
+     * 查询所有角色列表(无过滤)
+     * @param enable @code{null} 为忽略enable
+     */
+    fun getListByParam(name: String?, code: String?, enable: Boolean?): MutableList<SysRole>
+
+    /**
+     * 查询角色列表 分页 过滤 忽略enable 等
+     */
+    fun getListByParamPage(name: String?, code: String?, enable: Boolean?, current: Int, size: Int): Page<SysRole>
+}

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

@@ -8,12 +8,11 @@ import com.gxzc.zen.api.sys.service.ISysDicService
 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.CacheUtil
 import com.gxzc.zen.orm.annotation.ZenTransactional
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.cache.CacheManager
-import org.springframework.cache.annotation.Cacheable
+import org.slf4j.LoggerFactory
+import org.springframework.boot.CommandLineRunner
 import org.springframework.stereotype.Service
-import javax.annotation.PostConstruct
 
 /**
  * <p>
@@ -23,30 +22,35 @@ import javax.annotation.PostConstruct
  * @author NorthLan123
  * @since 2018-02-06
  */
+@Suppress("UNCHECKED_CAST")
 @Service
-class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService {
+class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService, CommandLineRunner {
     companion object {
+        private val logger = LoggerFactory.getLogger(SysDicServiceImpl::class.java)
         const val CACHE_KEY_ALL = "dic_all"
     }
 
-    @Autowired
-    private lateinit var cacheManager: CacheManager
-
-    @PostConstruct
-    fun initCache() {
-        val cache = cacheManager.getCache(CACHEKEYS.SYS)
-        cache.put(CACHE_KEY_ALL, getListCacheable())
+    override fun run(vararg args: String?) {
+        logger.debug("${this::class.simpleName} init.")
+        getListCacheable()
     }
 
-    @Cacheable(CACHEKEYS.SYS, key = "'$CACHE_KEY_ALL'")
     override fun getListCacheable(): MutableList<SysDic> {
+        val cached = CacheUtil.get(CACHEKEYS.SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysDic>
+        if (cached != null) {
+            return cached
+        }
         return baseMapper.selectByParams(null)
     }
 
     override fun getList(enable: Boolean?): MutableList<SysDic> {
-        return baseMapper.selectByParams(mutableMapOf(
-                "enable" to enable!!
-        ))
+        return if (enable != null) {
+            baseMapper.selectByParams(mutableMapOf(
+                    "enable" to enable
+            ))
+        } else {
+            baseMapper.selectByParams(null)
+        }
     }
 
     override fun getListByKey(key: String): MutableList<SysDic> {
@@ -56,14 +60,12 @@ class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService {
         }.toMutableList()
     }
 
-    @Suppress("UNCHECKED_CAST")
     @ZenTransactional
     override fun modify(data: SysDic): SysDic {
         baseMapper.updateNoLogic(data, EntityWrapper<SysDic>().eq("id", data.id))
         // 更新缓存
-        val cache = cacheManager.getCache(CACHEKEYS.SYS)
-        val cachedList: MutableList<SysDic>? = cache[CACHE_KEY_ALL].get() as MutableList<SysDic>?
-        cachedList?.let {
+        val cached = CacheUtil.get(CACHEKEYS.SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysDic>
+        cached?.let {
             val idx = it.indexOfFirst { it.id == data.id }
             if (idx != -1) {
                 it[idx] = data
@@ -88,27 +90,23 @@ class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService {
         }
     }
 
-    @Suppress("UNCHECKED_CAST")
     @ZenTransactional
     override fun insertCacheable(data: SysDic) {
         if (baseMapper.insert(data) == 0) {
             throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
         }
-        val cache = cacheManager.getCache(CACHEKEYS.SYS)
-        val cachedList: MutableList<SysDic>? = cache[CACHE_KEY_ALL].get() as MutableList<SysDic>?
-        cachedList?.add(data)
+        val cached = CacheUtil.get(CACHEKEYS.SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysDic>
+        cached?.add(data)
     }
 
-    @Suppress("UNCHECKED_CAST")
     @ZenTransactional
     override fun physicalDeleteCacheable(id: Long) {
         if (baseMapper.physicalDelete(EntityWrapper<SysDic>().eq("id", id)) <= 0) {
             throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
         }
         //
-        val cache = cacheManager.getCache(CACHEKEYS.SYS)
-        val cachedList: MutableList<SysDic>? = cache[CACHE_KEY_ALL].get() as MutableList<SysDic>?
-        cachedList?.let {
+        val cached = CacheUtil.get(CACHEKEYS.SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysDic>
+        cached?.let {
             it.removeIf {
                 it.id == id
             }

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

@@ -8,12 +8,11 @@ import com.gxzc.zen.api.sys.service.ISysParamService
 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.CacheUtil
 import com.gxzc.zen.orm.annotation.ZenTransactional
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.cache.CacheManager
-import org.springframework.cache.annotation.Cacheable
+import org.slf4j.LoggerFactory
+import org.springframework.boot.CommandLineRunner
 import org.springframework.stereotype.Service
-import javax.annotation.PostConstruct
 
 /**
  * <p>
@@ -23,30 +22,35 @@ import javax.annotation.PostConstruct
  * @author NorthLan123
  * @since 2018-02-06
  */
+@Suppress("UNCHECKED_CAST")
 @Service
-class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamService {
+class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamService, CommandLineRunner {
     companion object {
+        private val logger = LoggerFactory.getLogger(SysParamServiceImpl::class.java)
         const val CACHE_KEY_ALL = "param_all"
     }
 
-    @Autowired
-    private lateinit var cacheManager: CacheManager
-
-    @PostConstruct
-    fun initCache() {
-        val cache = cacheManager.getCache(CACHEKEYS.SYS)
-        cache.put(CACHE_KEY_ALL, getListCacheable())
+    override fun run(vararg args: String?) {
+        logger.debug("${this::class.simpleName} init.")
+        getListCacheable()
     }
 
-    @Cacheable(CACHEKEYS.SYS, key = "'$CACHE_KEY_ALL'")
     override fun getListCacheable(): MutableList<SysParam> {
+        val cached = CacheUtil.get(CACHEKEYS.SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysParam>
+        if (cached != null) {
+            return cached
+        }
         return baseMapper.selectByParams(null)
     }
 
     override fun getList(enable: Boolean?): MutableList<SysParam> {
-        return baseMapper.selectByParams(mutableMapOf(
-                "enable" to enable!!
-        ))
+        return if (enable != null) {
+            baseMapper.selectByParams(mutableMapOf(
+                    "enable" to enable
+            ))
+        } else {
+            baseMapper.selectByParams(null)
+        }
     }
 
     override fun getListByKey(key: String): MutableList<SysParam> {
@@ -56,14 +60,12 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
         }.toMutableList()
     }
 
-    @Suppress("UNCHECKED_CAST")
     @ZenTransactional
     override fun modify(data: SysParam): SysParam {
         baseMapper.updateNoLogic(data, EntityWrapper<SysParam>().eq("id", data.id))
         // 更新缓存
-        val cache = cacheManager.getCache(CACHEKEYS.SYS)
-        val cachedList: MutableList<SysParam>? = cache[CACHE_KEY_ALL].get() as MutableList<SysParam>?
-        cachedList?.let {
+        val cached = CacheUtil.get(CACHEKEYS.SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysParam>
+        cached?.let {
             val idx = it.indexOfFirst { it.id == data.id }
             if (idx != -1) {
                 it[idx] = data
@@ -88,27 +90,23 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
         }
     }
 
-    @Suppress("UNCHECKED_CAST")
     @ZenTransactional
     override fun insertCacheable(data: SysParam) {
         if (baseMapper.insert(data) == 0) {
             throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
         }
-        val cache = cacheManager.getCache(CACHEKEYS.SYS)
-        val cachedList: MutableList<SysParam>? = cache[CACHE_KEY_ALL].get() as MutableList<SysParam>?
-        cachedList?.add(data)
+        val cached = CacheUtil.get(CACHEKEYS.SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysParam>
+        cached?.add(data)
     }
 
-    @Suppress("UNCHECKED_CAST")
     @ZenTransactional
     override fun physicalDeleteCacheable(id: Long) {
         if (baseMapper.physicalDelete(EntityWrapper<SysParam>().eq("id", id)) <= 0) {
             throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
         }
         //
-        val cache = cacheManager.getCache(CACHEKEYS.SYS)
-        val cachedList: MutableList<SysParam>? = cache[CACHE_KEY_ALL].get() as MutableList<SysParam>?
-        cachedList?.let {
+        val cached = CacheUtil.get(CACHEKEYS.SYS, CACHE_KEY_ALL)?.get() as? MutableList<SysParam>
+        cached?.let {
             it.removeIf {
                 it.id == id
             }

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

@@ -1,9 +1,10 @@
 package com.gxzc.zen.api.sys.service.impl
 
-import com.gxzc.zen.api.sys.model.SysRole
+import com.baomidou.mybatisplus.plugins.Page
+import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import com.gxzc.zen.api.sys.mapper.SysRoleMapper
+import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.api.sys.service.ISysRoleService
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import org.springframework.stereotype.Service
 
 /**
@@ -17,4 +18,27 @@ import org.springframework.stereotype.Service
 @Service
 class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleService {
 
+    override fun getListByParam(name: String?, code: String?, enable: Boolean?): MutableList<SysRole> {
+        val params: LinkedHashMap<String, Any?> = linkedMapOf(
+                "name" to name,
+                "code" to code
+        )
+        if (enable != null) {
+            params["enable"] = enable
+        }
+        return baseMapper.selectByParams(params)
+    }
+
+    override fun getListByParamPage(name: String?, code: String?, enable: Boolean?, current: Int, size: Int): Page<SysRole> {
+        val page = Page<SysRole>(current, size)
+        val params: LinkedHashMap<String, Any?> = linkedMapOf(
+                "name" to name,
+                "code" to code
+        )
+        if (enable != null) {
+            params["enable"] = enable
+        }
+        page.records = baseMapper.selectByParamsPage(page, params)
+        return page
+    }
 }

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

@@ -8,10 +8,10 @@ import com.gxzc.zen.api.sys.service.ISysUserService
 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.CacheUtil
 import com.gxzc.zen.orm.annotation.ZenTransactional
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.cache.CacheManager
-import org.springframework.cache.annotation.Cacheable
+import org.slf4j.LoggerFactory
+import org.springframework.boot.CommandLineRunner
 import org.springframework.stereotype.Service
 
 /**
@@ -22,24 +22,27 @@ import org.springframework.stereotype.Service
  * @author NorthLan123
  * @since 2018-02-06
  */
+@Suppress("UNCHECKED_CAST")
 @Service
-class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserService {
+class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserService, CommandLineRunner {
     companion object {
+        private val logger = LoggerFactory.getLogger(SysUserServiceImpl::class.java)
         const val CACHE_KEY_ALL = "all"
     }
 
-    @Autowired
-    private lateinit var cacheManager: CacheManager
-
-    //    @PostConstruct
-    fun initCache() {
+    override fun run(vararg args: String?) {
+        logger.debug("${this::class.simpleName} init.")
         getListCacheable()
     }
 
-
-    @Cacheable(CACHEKEYS.USER, key = "'$CACHE_KEY_ALL'")
     override fun getListCacheable(): MutableList<SysUser> {
-        return baseMapper.selectByParams(null)
+        val cached = CacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
+        if (cached != null) {
+            return cached
+        }
+        val ret = baseMapper.selectByParams(null)
+        CacheUtil.put(CACHEKEYS.USER, CACHE_KEY_ALL, ret)
+        return ret
     }
 
     override fun getUserByAccountCacheable(account: String): SysUser? {
@@ -54,25 +57,21 @@ class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserServic
         }
     }
 
-    @Suppress("UNCHECKED_CAST")
     @ZenTransactional
     override fun insertCacheable(entity: SysUser) {
         if (baseMapper.insert(entity) == 0) {
             throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
         }
-        val cache = cacheManager.getCache(CACHEKEYS.USER)
-        val cachedList: MutableList<SysUser>? = cache[CACHE_KEY_ALL].get() as MutableList<SysUser>?
-        cachedList?.add(entity)
+        val cached = CacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
+        cached?.add(entity)
     }
 
-    @Suppress("UNCHECKED_CAST")
     @ZenTransactional
     override fun modify(entity: SysUser): SysUser {
         baseMapper.updateNoLogic(entity, EntityWrapper<SysUser>().eq("id", entity.id))
         // 更新缓存
-        val cache = cacheManager.getCache(CACHEKEYS.USER)
-        val cachedList: MutableList<SysUser>? = cache[CACHE_KEY_ALL].get() as MutableList<SysUser>?
-        cachedList?.let {
+        val cached = CacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
+        cached?.let {
             val idx = it.indexOfFirst { it.id == entity.id }
             if (idx != -1) {
                 it[idx] = entity
@@ -81,16 +80,14 @@ class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserServic
         return entity
     }
 
-    @Suppress("UNCHECKED_CAST")
     @ZenTransactional
     override fun physicalDeleteCacheable(id: Long) {
         if (baseMapper.physicalDelete(EntityWrapper<SysUser>().eq("id", id)) <= 0) {
             throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
         }
         //
-        val cache = cacheManager.getCache(CACHEKEYS.USER)
-        val cachedList: MutableList<SysUser>? = cache[CACHE_KEY_ALL].get() as MutableList<SysUser>?
-        cachedList?.let {
+        val cached = CacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
+        cached?.let {
             it.removeIf {
                 it.id == id
             }

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

@@ -19,27 +19,29 @@
 
     <sql id="dynamicSqlWhere">
         <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` = #{key}
-            </if>
-            <if test="value != null">
-                AND `value` = #{value}
-            </if>
-            <if test="sort != null">
-                AND sort = #{sort}
-            </if>
-            <if test="id != null">
-                AND id = #{id}
+            <if test="p != null">
+                <if test="p.enable != null">
+                    <choose>
+                        <when test="p.enable == true">
+                            AND enable = 1
+                        </when>
+                        <otherwise>
+                            AND enable = 0
+                        </otherwise>
+                    </choose>
+                </if>
+                <if test="p.key != null">
+                    AND `key` = #{p.key}
+                </if>
+                <if test="p.value != null">
+                    AND `value` = #{p.value}
+                </if>
+                <if test="p.sort != null">
+                    AND sort = #{p.sort}
+                </if>
+                <if test="p.id != null">
+                    AND id = #{p.id}
+                </if>
             </if>
         </where>
     </sql>

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

@@ -19,27 +19,29 @@
 
     <sql id="dynamicSqlWhere">
         <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` = #{key}
-            </if>
-            <if test="value != null">
-                AND `value` = #{value}
-            </if>
-            <if test="sort != null">
-                AND sort = #{sort}
-            </if>
-            <if test="id != null">
-                AND id = #{id}
+            <if test="p != null">
+                <if test="p.enable != null">
+                    <choose>
+                        <when test="p.enable == true">
+                            AND enable = 1
+                        </when>
+                        <otherwise>
+                            AND enable = 0
+                        </otherwise>
+                    </choose>
+                </if>
+                <if test="p.key != null">
+                    AND `key` = #{p.key}
+                </if>
+                <if test="p.value != null">
+                    AND `value` = #{p.value}
+                </if>
+                <if test="p.sort != null">
+                    AND sort = #{p.sort}
+                </if>
+                <if test="p.id != null">
+                    AND id = #{p.id}
+                </if>
             </if>
         </where>
     </sql>
@@ -93,6 +95,13 @@
         ORDER BY id,sort
     </select>
 
+    <select id="selectByParamsPage" resultType="com.gxzc.zen.api.sys.model.SysParam">
+        SELECT *
+        FROM sys_param
+        <include refid="dynamicSqlWhere"/>
+        ORDER BY id,sort
+    </select>
+
     <update id="updateNoLogic" parameterType="com.gxzc.zen.api.sys.model.SysParam">
         UPDATE sys_param
         <include refid="dynamicSqlSet"/>

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

@@ -16,4 +16,44 @@
         <result column="perms" property="perms"/>
     </resultMap>
 
+    <sql id="dynamicSqlWhere">
+        <where>
+            <if test="p != null">
+                <if test="p.enable != null">
+                    <choose>
+                        <when test="p.enable == true">
+                            AND enable = 1
+                        </when>
+                        <otherwise>
+                            AND enable = 0
+                        </otherwise>
+                    </choose>
+                </if>
+                <if test="p.name != null">
+                    AND `name` = #{p.name}
+                </if>
+                <if test="p.code != null">
+                    AND `code` = #{p.code}
+                </if>
+                <if test="p.id != null">
+                    AND id = #{p.id}
+                </if>
+            </if>
+        </where>
+    </sql>
+
+    <select id="selectByParams" resultType="com.gxzc.zen.api.sys.model.SysRole">
+        SELECT *
+        FROM sys_role
+        <include refid="dynamicSqlWhere"/>
+        ORDER BY id
+    </select>
+
+    <select id="selectByParamsPage" resultType="com.gxzc.zen.api.sys.model.SysRole">
+        SELECT *
+        FROM sys_role
+        <include refid="dynamicSqlWhere"/>
+        ORDER BY id
+    </select>
+
 </mapper>

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

@@ -29,21 +29,23 @@
 
     <sql id="dynamicSqlWhere">
         <where>
-            <if test="enable != null">
-                <choose>
-                    <when test="enable == true">
-                        AND enable = 1
-                    </when>
-                    <otherwise>
-                        AND enable = 0
-                    </otherwise>
-                </choose>
-            </if>
-            <if test="account != null">
-                AND account = #{account}
-            </if>
-            <if test="id != null">
-                AND id = #{id}
+            <if test="p != null">
+                <if test="p.enable != null">
+                    <choose>
+                        <when test="p.enable == true">
+                            AND enable = 1
+                        </when>
+                        <otherwise>
+                            AND enable = 0
+                        </otherwise>
+                    </choose>
+                </if>
+                <if test="p.account != null">
+                    AND account = #{p.account}
+                </if>
+                <if test="p.id != null">
+                    AND id = #{p.id}
+                </if>
             </if>
         </where>
     </sql>
@@ -136,6 +138,13 @@
         ORDER BY id
     </select>
 
+    <select id="selectByParamsPage" resultType="com.gxzc.zen.api.sys.model.SysUser">
+        SELECT *
+        FROM sys_user
+        <include refid="dynamicSqlWhere"/>
+        ORDER BY id
+    </select>
+
     <update id="updateNoLogic" parameterType="com.gxzc.zen.api.sys.model.SysUser">
         UPDATE sys_dic
         <include refid="dynamicSqlSet"/>

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

@@ -1,10 +1,15 @@
 package com.gxzc.zen.web.sys.controller
 
+import com.gxzc.zen.api.sys.service.ISysRoleService
 import com.gxzc.zen.common.base.BaseController
+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.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 
 /**
@@ -20,8 +25,42 @@ class RoleController : BaseController() {
         private val logger = LoggerFactory.getLogger(RoleController::class.java)
     }
 
+    @Autowired
+    private lateinit var roleService: ISysRoleService
+
     @GetMapping("list")
-    fun list(): ResponseEntity<*> {
-        return ResponseEntity.ok(null)
+    fun list(@RequestParam(required = false) keyword: String?,
+             @RequestParam(required = false) searchOption: Int?): ResponseEntity<*> {
+        var result: Any? = null
+        if (!keyword.isNullOrEmpty() && searchOption != null) {
+            when (searchOption) {
+                1 -> {
+                    result = if (PaginationUtil.paginable(getRequest())) {
+                        roleService.getListByParamPage(keyword, null, null, PaginationUtil.getCurrent(getRequest())!!, PaginationUtil.getPageSize(getRequest())!!)
+                    } else {
+                        roleService.getListByParam(keyword, null, null)
+                    }
+                }
+                2 -> {
+                    result = if (PaginationUtil.paginable(getRequest())) {
+                        roleService.getListByParamPage(null, keyword, null, PaginationUtil.getCurrent(getRequest())!!, PaginationUtil.getPageSize(getRequest())!!)
+                    } else {
+                        roleService.getListByParam(null, keyword, null)
+                    }
+                }
+                else -> {
+                    // 未知的查询关键字类型
+                    logger.warn("Unknown searchOption: [$searchOption]")
+                }
+            }
+        } else {
+            result = if (PaginationUtil.paginable(getRequest())) {
+                roleService.getListByParamPage(null, null, null, PaginationUtil.getCurrent(getRequest())!!, PaginationUtil.getPageSize(getRequest())!!)
+            } else {
+                roleService.getListByParam(null, null, null)
+            }
+
+        }
+        return ResponseEntity.ok(ResponseDto().apply { data = result })
     }
 }

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

@@ -36,7 +36,7 @@ class SysDicController : BaseController() {
     fun getList(@RequestParam(required = false) keyword: String?,
                 @RequestParam(required = false) searchOption: Int?): ResponseEntity<*> {
         var data: MutableList<SysDic> = sysDicService.getListCacheable()
-        if (!keyword.isNullOrEmpty()) {
+        if (!keyword.isNullOrEmpty() && searchOption != null) {
             data = data.filter {
                 when (searchOption) {
                     1 -> run {

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

@@ -38,7 +38,7 @@ class SysParamController : BaseController() {
                 @RequestParam(required = false) current: Int?,
                 @RequestParam(required = false) pageSize: Int?): ResponseEntity<*> {
         var data: MutableList<SysParam> = sysParamService.getListCacheable()
-        if (!keyword.isNullOrEmpty()) {
+        if (!keyword.isNullOrEmpty() && searchOption != null) {
             data = data.filter {
                 when (searchOption) {
                     1 -> run {