lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 07:46:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

完善数据查询表达式

Browse Source
This commit is contained in:
lihongjie0209
2023-10-14 22:03:56 +08:00
parent 3e9ba70bb4
commit 1a7a5f3b16
2 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/cn/lihongjie/coal/base/dto/CommonQuery.java
View File

@@ -19,6 +19,7 @@ import lombok.With;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.core.convert.ConversionFailedException;
import org.springframework.core.convert.ConversionService;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
@@ -175,8 +176,20 @@ public class CommonQuery {
map.put(
Tuple.of("eq", LocalDateTime.class),
(Root root, CriteriaBuilder criteriaBuilder, QueryItem x, ConversionService c) -> {
return criteriaBuilder.equal(
parseKey(root, x.key), c.convert(x.value, LocalDateTime.class));
try {
return criteriaBuilder.equal(
parseKey(root, x.key), c.convert(x.value, LocalDateTime.class));
} catch (ConversionFailedException e) {
return criteriaBuilder.and(
criteriaBuilder.greaterThanOrEqualTo(
parseKey(root, x.key),
c.convert(x.value + " 00:00:00", LocalDateTime.class)),
criteriaBuilder.lessThanOrEqualTo(
parseKey(root, x.key),
c.convert(x.value + " 23:59:59", LocalDateTime.class)));
}
});
map.put(

25
src/main/java/cn/lihongjie/coal/common/LocalDateTImeConverter.java Normal file
View File

@@ -0,0 +1,25 @@
package cn.lihongjie.coal.common;
import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@Component
public class LocalDateTImeConverter implements Converter<String, LocalDateTime> {
@Override
public LocalDateTime convert(String source) {
if (source == null || source.isEmpty()) {
return null;
}
try {
return LocalDateTime.parse(source);
} catch (Exception e) {
return LocalDateTime.parse(source, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
}
}
}