From 2031b77f12417f6c3a12e9278c036e4236dcdc38 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Mon, 30 Dec 2024 20:47:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ycwl/basic/device/operator/AliOssStorageOperator.java | 4 ++-- src/main/java/com/ycwl/basic/storage/utils/StorageUtil.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ycwl/basic/device/operator/AliOssStorageOperator.java b/src/main/java/com/ycwl/basic/device/operator/AliOssStorageOperator.java index 23e37c2..a8d2427 100644 --- a/src/main/java/com/ycwl/basic/device/operator/AliOssStorageOperator.java +++ b/src/main/java/com/ycwl/basic/device/operator/AliOssStorageOperator.java @@ -89,8 +89,8 @@ public class AliOssStorageOperator extends ADeviceStorageOperator { calendar.clear(); return fileList.stream() .sorted(Comparator.comparing(FileObject::getCreateTime)) - .filter(item -> item.getCreateTime().after(startDate) || item.getCreateTime().equals(startDate)) - .filter(item -> item.getCreateTime().equals(endDate) || item.getCreateTime().before(endDate)) + .filter(item -> item.getEndTime().after(startDate)) + .filter(item -> item.getCreateTime().before(endDate)) .collect(Collectors.toList()); } diff --git a/src/main/java/com/ycwl/basic/storage/utils/StorageUtil.java b/src/main/java/com/ycwl/basic/storage/utils/StorageUtil.java index b384def..46d5429 100644 --- a/src/main/java/com/ycwl/basic/storage/utils/StorageUtil.java +++ b/src/main/java/com/ycwl/basic/storage/utils/StorageUtil.java @@ -40,7 +40,7 @@ public class StorageUtil { } public static String getRelativePath(String fullPath, String relativeOn) { - if (StringUtils.isBlank(relativeOn)) { + if (StringUtils.isNotBlank(relativeOn)) { fullPath = fullPath.replace(relativeOn, ""); } if (fullPath.startsWith("/")) {