alex/Gaea
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改查询文件，保证datetime类型的正确查询

Browse Source
This commit is contained in:
alex
2020-05-25 20:37:33 +08:00
parent 1178359bcd
commit 6524ae97b5
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/MongoExt.kt
View File

@@ -41,7 +41,7 @@ fun Query.where(
var value = param.value var value = param.value
val fieldType = onFieldType(key) val fieldType = onFieldType(key)
if (fieldType != null && value.javaClass != fieldType && fieldType == Date::class.java) { if (fieldType != null && value.javaClass != fieldType && fieldType == Date::class.java) {
value = DateTime(value.toString(), "yyyy-MM-dd").date value = DateTime(value.toString(), "yyyy-MM-dd HH:mm:ss").date
} }
when (onWhere(key)) { when (onWhere(key)) {
Operator.eq -> list.add(Criteria.where(key).`is`(value)) Operator.eq -> list.add(Criteria.where(key).`is`(value))
@@ -51,31 +51,30 @@ fun Query.where(
Operator.lte -> list.add(Criteria.where(key).lte(value)) Operator.lte -> list.add(Criteria.where(key).lte(value))
Operator.gte -> list.add(Criteria.where(key).gte(value)) Operator.gte -> list.add(Criteria.where(key).gte(value))
Operator.like -> list.add(Criteria.where(key).regex(value.toString())) Operator.like -> list.add(Criteria.where(key).regex(value.toString()))
Operator.default -> rangeWhere(param.key, value, onFieldType(param.key), list) Operator.default -> rangeWhere(param.key, value, list, onFieldType)
} }
} }
} }
return this.addCriteria(Criteria().andOperator(*list.toTypedArray())) val criteria = Criteria()
if (list.isNotEmpty()) criteria.andOperator(*list.toTypedArray())
return this.addCriteria(criteria)
} }
private fun rangeWhere(key: String, value: Any, fieldType: Class<*>?, list: MutableList<Criteria>) { private fun rangeWhere(key: String, value: Any, list: MutableList<Criteria>, onFieldType: ((v: String) -> Class<*>?) = { null }) {
val rangeStartSuffix = "[0]" //范围查询开始后缀 val rangeStartSuffix = "[0]" //范围查询开始后缀
val rangeEndSuffix = "[1]" //范围查询结束后缀 val rangeEndSuffix = "[1]" //范围查询结束后缀
var condition = value var condition = value
if (value.javaClass != fieldType && fieldType == Date::class.java) { val realKey = key.removeSuffix(rangeStartSuffix).removeSuffix(rangeEndSuffix)
condition = DateTime(value.toString(), "yyyy-MM-dd").date 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 { when {
//以范围查询开始后缀结尾表示要用大于或等于查询方式 //以范围查询开始后缀结尾表示要用大于或等于查询方式
key.endsWith(rangeStartSuffix) -> key.endsWith(rangeStartSuffix) -> list.add(Criteria.where(realKey).gte(condition))
list.add(
Criteria.where(key.removeSuffix(rangeStartSuffix)).gte(condition)
)
//以范围查询结束后缀结尾表示要用小于或等于查询方式 //以范围查询结束后缀结尾表示要用小于或等于查询方式
key.endsWith(rangeEndSuffix) -> key.endsWith(rangeEndSuffix) -> list.add(Criteria.where(realKey).lte(condition))
list.add(
Criteria.where(key.removeSuffix(rangeEndSuffix)).lte(condition)
)
else -> list.add(Criteria.where(key).`is`(value)) else -> list.add(Criteria.where(key).`is`(value))
} }
} }
@@ -92,7 +91,7 @@ fun Query.where(params: Map<String, Any>?, clazz: Class<*>): Query {
field = clazz.declaredFields.find { it.name == name } field = clazz.declaredFields.find { it.name == name }
where = field?.getDeclaredAnnotation(Where::class.java) where = field?.getDeclaredAnnotation(Where::class.java)
if (where == null) Operator.default else where!!.operator if (where == null) Operator.default else where!!.operator
}) }, { name -> clazz.declaredFields.find { it.name == name }?.type })
} }
/** /**