权限+字典 搞定

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

@@ -41,8 +41,19 @@ interface ISysDictValueService : BaseService<SysDictValue> {
      * 更新一条数据,不包含移动位置
      */
     fun updateDictValue(entity: SysDictValue): SysDictValue
+
     /**
      * 删除一条记录
      */
     fun deleteDictValue(id: Long)
+
+    /**
+     * 根据type_code(code前缀)获取字典值列表
+     */
+    fun getDictValueListByTypeCode(typeCode: String): MutableList<SysDictValue>
+
+    /**
+     * 根据code值与value获取指定字典值
+     */
+    fun getDictValueByCodeAndValue(code: String, value: String): SysDictValue?
 }

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

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service
 @Suppress("UNCHECKED_CAST")
 @Service
 class SysDictValueServiceImpl : ServiceImpl<SysDictValueMapper, SysDictValue>(), ISysDictValueService {
+
     override fun init() {
         getListCacheable()
     }
@@ -30,7 +31,7 @@ class SysDictValueServiceImpl : ServiceImpl<SysDictValueMapper, SysDictValue>(),
     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)
+            data = baseMapper.selectWOLogic(EntityWrapper<SysDictValue>().orderBy("sort"))
             RedisCacheUtil.put(ZenConstants.CACHE_KEY_SYS, CacheKeyConstants.DICT_VALUE_KEY, data)
         }
         return data
@@ -80,6 +81,20 @@ class SysDictValueServiceImpl : ServiceImpl<SysDictValueMapper, SysDictValue>(),
         evictCache()
     }
 
+    override fun getDictValueListByTypeCode(typeCode: String): MutableList<SysDictValue> {
+        val cachedList = getListCacheable()
+        return cachedList.filter {
+            it.code!!.startsWith("${typeCode}_")
+        }.toMutableList()
+    }
+
+    override fun getDictValueByCodeAndValue(code: String, value: String): SysDictValue? {
+        val cachedList = getListCacheable()
+        return cachedList.find {
+            it.code == code && it.value == value
+        }
+    }
+
     private fun evictCache() {
         RedisCacheUtil.evict(ZenConstants.CACHE_KEY_SYS, CacheKeyConstants.DICT_VALUE_KEY)
     }

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

@@ -56,11 +56,16 @@ class DictController : BaseController() {
         })
     }
 
-    @ApiOperation("获取某节点下的字典值列表")
+    @ApiOperation("获取字典值列表,若传参typeId 则取某typeid下的所有字典值")
     @GetMapping("value/list")
-    fun getDictValueByTypeId(@RequestParam("typeId") typeId: Long): ResponseEntity<*> {
+    fun getDictValueByTypeId(@RequestParam("typeId", required = false) typeId: Long?): ResponseEntity<*> {
+        val result = if (typeId == null) {
+            dictValueService.getListCacheable()
+        } else {
+            dictValueService.getListByTypeId(typeId)
+        }
         return ResponseEntity.ok(ResponseDto().apply {
-            this.data = dictValueService.getListByTypeId(typeId)
+            this.data = result
         })
     }
 
@@ -86,4 +91,20 @@ class DictController : BaseController() {
             this.data = dictValueService.updateDictValue(entity)
         })
     }
+
+    @ApiOperation("根据type_code(code前缀)获取字典值列表")
+    @GetMapping("value/typeCode")
+    fun getDictValueListByTypeCode(@RequestParam("typeCode") typeCode: String): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            this.data = dictValueService.getDictValueListByTypeCode(typeCode)
+        })
+    }
+
+    @ApiOperation("根据code值与value获取指定字典值")
+    @GetMapping("value/codeValue")
+    fun getDictValueByCodeAndValue(@RequestParam("code") code: String, @RequestParam("value") value: String): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            this.data = dictValueService.getDictValueByCodeAndValue(code, value)
+        })
+    }
 }

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

@@ -4,6 +4,7 @@ import com.gxzc.zen.api.sys.model.SysResource
 import com.gxzc.zen.api.sys.service.ISysResourceService
 import com.gxzc.zen.common.base.BaseController
 import com.gxzc.zen.common.dto.ResponseDto
+import com.gxzc.zen.umps.util.SSOUtil
 import io.swagger.annotations.ApiOperation
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.ResponseEntity
@@ -59,4 +60,12 @@ class ResourceController : BaseController() {
             data = resourceService.updateResource(sysResource)
         })
     }
+
+    @ApiOperation("获取当前登陆用户权限列表")
+    @GetMapping("/user/list")
+    fun getUserResourceList(): ResponseEntity<*> {
+        return ResponseEntity.ok(ResponseDto().apply {
+            this.data = SSOUtil.getCurUserPerms()
+        })
+    }
 }

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

@@ -134,7 +134,8 @@ class UserController : BaseController() {
             data = mutableMapOf(
                     "info" to SSOUtil.getCurUserInfo(),
                     "menu" to menuService.getUserMenuTree(platformId),
-                    "roles" to SSOUtil.getCurUserRoles()
+                    "roles" to SSOUtil.getCurUserRoles(),
+                    "perms" to SSOUtil.getCurUserPerms()
             )
         })
     }