From 42877bc480e8ead3432dcba2673768323d4b32b1 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 17 Jul 2020 16:34:03 +0800 Subject: [PATCH] =?UTF-8?q?0.5.0=20=E5=A2=9E=E5=8A=A0=E5=AD=90=E5=85=83?= =?UTF-8?q?=E7=B4=A0=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=A4=A7=E5=B0=8F=E5=86=99?= =?UTF-8?q?=E6=95=8F=E6=84=9F=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- .../com/synebula/gaea/mongo/MongoExt.kt | 54 +++++++++++-------- .../synebula/gaea/query/annotation/Where.kt | 9 +++- 3 files changed, 42 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index 26e1825..3499c2d 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ allprojects { subprojects { ext { - version '0.4.0' + version '0.5.0' spring_version = "2.3.0.RELEASE" } diff --git a/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/MongoExt.kt b/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/MongoExt.kt index f125f15..de22466 100644 --- a/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/MongoExt.kt +++ b/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/MongoExt.kt @@ -30,28 +30,40 @@ fun Query.select(fields: Array): Query { * @param onWhere 获取字段查询方式的方法 */ fun Query.where( - params: Map?, - onWhere: ((v: String) -> Operator) = { Operator.default }, - onFieldType: ((v: String) -> Class<*>?) = { null } + params: Map?, + onWhere: ((v: String) -> Where?) = { null }, + onFieldType: ((v: String) -> Class<*>?) = { null } ): Query { val list = arrayListOf() if (params != null) { for (param in params) { val key = param.key var value = param.value + + //日期类型特殊处理为String类型 val fieldType = onFieldType(key) if (fieldType != null && value.javaClass != fieldType && fieldType == Date::class.java) { value = DateTime(value.toString(), "yyyy-MM-dd HH:mm:ss").date } - when (onWhere(key)) { - Operator.eq -> list.add(Criteria.where(key).`is`(value)) - Operator.ne -> list.add(Criteria.where(key).ne(value)) - Operator.lt -> list.add(Criteria.where(key).lt(value)) - Operator.gt -> list.add(Criteria.where(key).gt(value)) - Operator.lte -> list.add(Criteria.where(key).lte(value)) - Operator.gte -> list.add(Criteria.where(key).gte(value)) - Operator.like -> list.add(Criteria.where(key).regex(value.toString())) - Operator.default -> rangeWhere(param.key, value, list, onFieldType) + + val where = onWhere(key) + if (where == null) { + list.add(tryRangeWhere(param.key, value, fieldType)) + } else { + //判断执行查询子元素还是本字段 + val field = if (where.children.isEmpty()) key else where.children + var criteria = Criteria.where(field) + criteria = when (where.operator) { + Operator.eq -> criteria.`is`(value) + Operator.ne -> criteria.ne(value) + Operator.lt -> criteria.lt(value) + Operator.gt -> criteria.gt(value) + Operator.lte -> criteria.lte(value) + Operator.gte -> criteria.gte(value) + Operator.like -> criteria.regex(value.toString(), if (where.sensitiveCase) "" else "i") + Operator.default -> tryRangeWhere(param.key, value, fieldType) + } + list.add(if (where.children.isEmpty()) criteria else Criteria.where(key).elemMatch(criteria)) } } } @@ -60,22 +72,24 @@ fun Query.where( return this.addCriteria(criteria) } -private fun rangeWhere(key: String, value: Any, list: MutableList, onFieldType: ((v: String) -> Class<*>?) = { null }) { +/** + * 尝试范围查询，失败则返回正常查询条件。 + */ +private fun tryRangeWhere(key: String, value: Any, fieldType: Class<*>?): Criteria { val rangeStartSuffix = "[0]" //范围查询开始后缀 val rangeEndSuffix = "[1]" //范围查询结束后缀 var condition = value val realKey = key.removeSuffix(rangeStartSuffix).removeSuffix(rangeEndSuffix) - val fieldType = onFieldType(realKey) if (fieldType != null && value.javaClass != fieldType && fieldType == Date::class.java) { condition = DateTime(value.toString(), "yyyy-MM-dd HH:mm:ss").date } - when { + return when { //以范围查询开始后缀结尾表示要用大于或等于查询方式 - key.endsWith(rangeStartSuffix) -> list.add(Criteria.where(realKey).gte(condition)) + key.endsWith(rangeStartSuffix) -> Criteria.where(realKey).gte(condition) //以范围查询结束后缀结尾表示要用小于或等于查询方式 - key.endsWith(rangeEndSuffix) -> list.add(Criteria.where(realKey).lte(condition)) - else -> list.add(Criteria.where(key).`is`(value)) + key.endsWith(rangeEndSuffix) -> Criteria.where(realKey).lte(condition) + else -> Criteria.where(key).`is`(value) } } @@ -86,11 +100,9 @@ private fun rangeWhere(key: String, value: Any, list: MutableList, onF */ fun Query.where(params: Map?, clazz: Class<*>): Query { var field: Field? - var where: Where? return this.where(params, { name -> field = clazz.declaredFields.find { it.name == name } - where = field?.getDeclaredAnnotation(Where::class.java) - if (where == null) Operator.default else where!!.operator + field?.getDeclaredAnnotation(Where::class.java) }, { name -> clazz.declaredFields.find { it.name == name }?.type }) } diff --git a/src/gaea/src/main/kotlin/com/synebula/gaea/query/annotation/Where.kt b/src/gaea/src/main/kotlin/com/synebula/gaea/query/annotation/Where.kt index dfeb52c..1a7338b 100644 --- a/src/gaea/src/main/kotlin/com/synebula/gaea/query/annotation/Where.kt +++ b/src/gaea/src/main/kotlin/com/synebula/gaea/query/annotation/Where.kt @@ -2,5 +2,12 @@ package com.synebula.gaea.query.annotation import com.synebula.gaea.query.type.Operator +/** + * 字段注解，规定字段的查询方式 + * + * @param operator 查询方式 + * @param sensitiveCase 是否大小写敏感，默认为true敏感 + * @param children 是否查询子元素。如果为空("")查询本字段，否则查询本字段下的子元素。 + */ @Target(AnnotationTarget.FIELD) -annotation class Where(val operator: Operator) \ No newline at end of file +annotation class Where(val operator: Operator, val sensitiveCase: Boolean = true, val children: String = "") \ No newline at end of file