为ZenRequestTypes添加新特性,支持List<*>的泛型转换

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

@@ -21,7 +21,7 @@ class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleServic
     override fun getListByParam(name: String?, code: String?, enable: Boolean?): MutableList<SysRole> {
         val params: LinkedHashMap<String, Any?> = linkedMapOf(
                 "name" to name,
-                "code" to code
+                "code" to code?.toUpperCase()
         )
         if (enable != null) {
             params["enable"] = enable
@@ -33,7 +33,7 @@ class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleServic
         val page = Page<SysRole>(current, size)
         val params: LinkedHashMap<String, Any?> = linkedMapOf(
                 "name" to name,
-                "code" to code
+                "code" to code?.toUpperCase()
         )
         if (enable != null) {
             params["enable"] = enable

zen-api/src/main/kotlin/com/gxzc/zen/sso/aop/CurrentUserHandler.kt

@@ -29,7 +29,7 @@ class CurrentUserHandler : HandlerInterceptorAdapter() {
             } else {
                 SysUserUtil.getById(id)
             }
-            logger.debug("Caching Current User... ${user?.account}")
+            logger.trace("Caching Current User... ${user?.account}")
             SSOUtil.TL.set(user)
         }
         return super.preHandle(request, response, handler)
@@ -37,7 +37,7 @@ class CurrentUserHandler : HandlerInterceptorAdapter() {
 
     override fun postHandle(request: HttpServletRequest?, response: HttpServletResponse?, handler: Any?, modelAndView: ModelAndView?) {
         if (handler is HandlerMethod) {
-            logger.debug("Clear Current User...")
+            logger.trace("Clear Current User...")
             SSOUtil.TL.clear()
         }
         super.postHandle(request, response, handler, modelAndView)

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

@@ -30,10 +30,10 @@
                     </choose>
                 </if>
                 <if test="p.name != null">
-                    AND `name` = #{p.name}
+                    AND `name` LIKE CONCAT('%', #{p.name}, '%')
                 </if>
                 <if test="p.code != null">
-                    AND `code` = #{p.code}
+                    AND code LIKE CONCAT('%', #{p.code}, '%')
                 </if>
                 <if test="p.id != null">
                     AND id = #{p.id}

zen-core/src/main/kotlin/com/gxzc/zen/common/config/request/ZenRequestBodyAdvice.kt

@@ -2,16 +2,16 @@ package com.gxzc.zen.common.config.request
 
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
+import com.gxzc.zen.common.config.request.annotation.KVTypeEnum
 import com.gxzc.zen.common.config.request.annotation.ZenRequestTypes
 import com.gxzc.zen.common.dto.RequestDto
-import com.gxzc.zen.common.exception.ZenException
-import com.gxzc.zen.common.exception.ZenExceptionEnum
 import org.springframework.core.MethodParameter
 import org.springframework.http.HttpInputMessage
 import org.springframework.http.converter.HttpMessageConverter
 import org.springframework.web.bind.annotation.ControllerAdvice
 import org.springframework.web.servlet.mvc.method.annotation.RequestBodyAdviceAdapter
 import java.lang.reflect.Type
+import java.util.*
 
 /**
  *
@@ -35,8 +35,20 @@ class ZenRequestBodyAdvice : RequestBodyAdviceAdapter() {
         }
         val typedBody = body as RequestDto
         annotation.value.forEach {
-            val data = typedBody[it.key] ?: throw ZenException(ZenExceptionEnum.REQUEST_NULL)
-            typedBody[it.key] = mapper.convertValue(data, it.value.java)
+            if (typedBody.containsKey(it.key)) {
+                val data = typedBody[it.key]
+                when (it.type) {
+                    KVTypeEnum.OBJECT -> {
+                        typedBody[it.key] = mapper.convertValue(data, it.value.java)
+                    }
+                    KVTypeEnum.ARRAY -> {
+                        typedBody[it.key] = mapper.convertValue(data, mapper.typeFactory.constructArrayType(it.value.java))
+                    }
+                    KVTypeEnum.LIST -> {
+                        typedBody[it.key] = mapper.convertValue(data, mapper.typeFactory.constructCollectionType(LinkedList::class.java, it.value.java))
+                    }
+                }
+            }
         }
         return super.afterBodyRead(body, inputMessage, parameter, targetType, converterType)
     }

zen-core/src/main/kotlin/com/gxzc/zen/common/config/request/annotation/KVType.kt

@@ -3,13 +3,23 @@ package com.gxzc.zen.common.config.request.annotation
 import kotlin.reflect.KClass
 
 /**
- *
+ * key value 对应类型
  * @author NorthLan
  * @date 2018/3/16
  * @url https://noahlan.com
  */
 @Target(AnnotationTarget.ANNOTATION_CLASS)
 annotation class KVType(
-        public val key: String,
-        public val value: KClass<out Any>) {
+        public val key: String = "",
+        public val value: KClass<out Any>,
+        public val type: KVTypeEnum = KVTypeEnum.OBJECT) {
+}
+
+/**
+ * 转换类型
+ */
+enum class KVTypeEnum {
+    OBJECT, // 对象
+    ARRAY, // 数组 (需要value作为转换泛型)
+    LIST, // List (需要value作为转换泛型)
 }

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

@@ -1,7 +1,9 @@
 package com.gxzc.zen.web.sys.controller
 
+import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.api.sys.service.ISysRoleService
 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
@@ -29,6 +31,7 @@ class RoleController : BaseController() {
     private lateinit var roleService: ISysRoleService
 
     @GetMapping("list")
+    @ZenResponseFilter(type = SysRole::class, filter = ["createBy", "createTime", "updateBy", "updateTime"])
     fun list(@RequestParam(required = false) keyword: String?,
              @RequestParam(required = false) searchOption: Int?): ResponseEntity<*> {
         var result: Any? = null

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

@@ -3,11 +3,13 @@ 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.model.SysRole
 import com.gxzc.zen.api.sys.model.SysUser
 import com.gxzc.zen.api.sys.service.ISysDicService
 import com.gxzc.zen.api.sys.service.ISysParamService
 import com.gxzc.zen.common.base.BaseController
 import com.gxzc.zen.common.config.request.annotation.KVType
+import com.gxzc.zen.common.config.request.annotation.KVTypeEnum
 import com.gxzc.zen.common.config.request.annotation.ZenRequestTypes
 import com.gxzc.zen.common.dto.RequestDto
 import org.springframework.beans.factory.annotation.Autowired
@@ -64,6 +66,9 @@ class TestController : BaseController() {
             KVType("dataA", SysDic::class),
             KVType("dataB", SysUser::class))
     fun testInput(@RequestBody data: RequestDto) {
+        var a = 0
+        a = 2
+        return
     }
 
     @PostMapping("")
@@ -93,4 +98,12 @@ class TestController : BaseController() {
                 .contentType(MediaType.parseMediaType("application/octet-stream"))
                 .body(resource)
     }
+
+    @PostMapping("request")
+    @Login(action = Action.Skip)
+    @ZenRequestTypes(KVType("data", SysRole::class, KVTypeEnum.LIST))
+    fun request(@RequestBody data: RequestDto): ResponseEntity<*> {
+        val b = data["data"] as List<SysRole>
+        return ResponseEntity.ok(null)
+    }
 }