feat: 优化历史记录(收藏)条件查询接口，支持根据日期查询 (#772)

Author: chivehao

CHANGELOG.MD

@@ -2,6 +2,10 @@
 
 更新日志文档，版本顺序从新到旧，最新版本在最前(上)面。
 
+# 0.20.11
+
+- 优化历史记录(收藏)条件查询接口，支持根据日期查询
+
 # 0.20.10
 
 - 新增历史记录(收藏)条件查询接口

gradle.properties

@@ -1 +1 @@
-version=0.20.10
+version=0.20.11

server/src/main/java/run/ikaros/server/core/collection/CollectionEndpoint.java

@@ -64,7 +64,7 @@ public RouterFunction<ServerResponse> endpoint() {
                     .parameter(parameterBuilder()
                         .name("time")
                         .implementation(String.class)
-                        .description("时间范围，格式范围类型: 2000.9-2010.8 或者 单个类型2020.8"))
+                        .description("时间范围，格式: 开始时间戳-结束时间戳"))
                     .parameter(parameterBuilder()
                         .name("updateTimeDesc")
                         .implementation(Boolean.class)

server/src/main/java/run/ikaros/server/core/collection/DefaultCollectionService.java

@@ -2,8 +2,9 @@
 
 import static run.ikaros.api.infra.utils.ReactiveBeanUtils.copyProperties;
 
+import java.time.Instant;
 import java.time.LocalDateTime;
-import java.time.Year;
+import java.time.ZoneId;
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.PageRequest;
@@ -78,45 +79,16 @@ public Mono<PagingWrap> listCollectionsByCondition(FindCollectionCondition condi
         if (CollectionCategory.EPISODE == condition.getCategory()
             && StringUtils.isNotBlank(time)
         ) {
-            if (time.indexOf('-') > 0) {
-                // 日期范围，例如；2000.9-2010.8
-                String[] split = time.split("-");
-                String first = split[0];
-                String second = split[1];
-                LocalDateTime startTime;
-                if (first.indexOf(".") > 0) {
-                    String[] split1 = first.split("\\.");
-                    startTime =
-                        Year.parse(split1[0]).atMonth(Integer.parseInt(split1[1])).atDay(1)
-                            .atStartOfDay();
-                } else {
-                    startTime = Year.parse(first).atMonth(1).atDay(1).atStartOfDay();
-                }
-                LocalDateTime endTime;
-                if (second.indexOf(".") > 0) {
-                    String[] split2 = second.split("\\.");
-                    endTime =
-                        Year.parse(split2[0]).atMonth(Integer.parseInt(split2[1])).atDay(1)
-                            .atStartOfDay().plusMonths(1);
-                } else {
-                    endTime = Year.parse(second).atDay(1).atStartOfDay().plusMonths(1);
-                }
-                criteria = criteria.and(Criteria.where("update_time").between(startTime, endTime));
-            } else {
-                // 单个类型，例如：2020.8
-                if (time.indexOf('.') > 0) {
-                    String[] split = time.split("\\.");
-                    LocalDateTime startTime =
-                        Year.parse(split[0]).atMonth(Integer.parseInt(split[1])).atDay(1)
-                            .atStartOfDay();
-                    criteria = criteria.and(
-                        Criteria.where("update_time").between(startTime, startTime.plusMonths(1)));
-                } else {
-                    LocalDateTime startTime = Year.parse(time).atMonth(1).atDay(1).atStartOfDay();
-                    criteria = criteria.and(
-                        Criteria.where("update_time").between(startTime, startTime.plusYears(1)));
-                }
-            }
+            String[] split = time.split("-");
+            String first = split[0];
+            String second = split[1];
+            LocalDateTime startTime = Instant.ofEpochMilli(Long.parseLong(first))
+                .atZone(ZoneId.systemDefault())
+                .toLocalDateTime();
+            LocalDateTime endTime = Instant.ofEpochMilli(Long.parseLong(second))
+                .atZone(ZoneId.systemDefault())
+                .toLocalDateTime();
+            criteria = criteria.and(Criteria.where("update_time").between(startTime, endTime));
         }
 
         Query query = Query.query(criteria);