q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

地址问题，时间判断问题

Browse Source
This commit is contained in:
Jerry Yan 2024-12-30 20:47:24 +08:00
parent aa7d1fab52
commit 2031b77f12
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/ycwl/basic/device/operator/AliOssStorageOperator.java
View File

@ -89,8 +89,8 @@ public class AliOssStorageOperator extends ADeviceStorageOperator {
calendar.clear(); calendar.clear();
return fileList.stream() return fileList.stream()
.sorted(Comparator.comparing(FileObject::getCreateTime)) .sorted(Comparator.comparing(FileObject::getCreateTime))
.filter(item -> item.getCreateTime().after(startDate) || item.getCreateTime().equals(startDate)) .filter(item -> item.getEndTime().after(startDate))
.filter(item -> item.getCreateTime().equals(endDate) || item.getCreateTime().before(endDate)) .filter(item -> item.getCreateTime().before(endDate))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }

2
src/main/java/com/ycwl/basic/storage/utils/StorageUtil.java
View File

@ -40,7 +40,7 @@ public class StorageUtil {
} }
public static String getRelativePath(String fullPath, String relativeOn) { public static String getRelativePath(String fullPath, String relativeOn) {
if (StringUtils.isBlank(relativeOn)) { if (StringUtils.isNotBlank(relativeOn)) {
fullPath = fullPath.replace(relativeOn, ""); fullPath = fullPath.replace(relativeOn, "");
} }
if (fullPath.startsWith("/")) { if (fullPath.startsWith("/")) {