From 9c1d979bd80ab3323c1a014378d4c1bdc0b7fa02 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Mon, 13 Jan 2025 10:26:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=97=B6=E8=AE=B0=E5=BE=97?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=98=AF=E5=80=92?= =?UTF-8?q?=E5=8F=99=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operator/WvpActiveStorageOperator.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/ycwl/basic/device/operator/WvpActiveStorageOperator.java b/src/main/java/com/ycwl/basic/device/operator/WvpActiveStorageOperator.java index 05e5ab4..1d86205 100644 --- a/src/main/java/com/ycwl/basic/device/operator/WvpActiveStorageOperator.java +++ b/src/main/java/com/ycwl/basic/device/operator/WvpActiveStorageOperator.java @@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils; import java.net.URI; import java.text.SimpleDateFormat; import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -78,16 +79,19 @@ public class WvpActiveStorageOperator extends ADeviceStorageOperator { if (result.getInteger("code") == 0) { JSONObject data = result.getJSONObject("data"); List recordList = data.getJSONArray("list").toJavaList(JSONObject.class); - return recordList.stream().map(record -> { - FileObject object = new FileObject(); - object.setName(record.getString("id")); - object.setPath(record.getString("folder")); - object.setUrl(getUrlForDownload(record.getInteger("id"))); - object.setNeedDownload(true); - object.setCreateTime(new Date(record.getLongValue("startTime"))); - object.setEndTime(new Date(record.getLongValue("endTime"))); - return object; - }).collect(Collectors.toList()); + return recordList.stream() + .map(record -> { + FileObject object = new FileObject(); + object.setName(record.getString("id")); + object.setPath(record.getString("folder")); + object.setUrl(getUrlForDownload(record.getInteger("id"))); + object.setNeedDownload(true); + object.setCreateTime(new Date(record.getLongValue("startTime"))); + object.setEndTime(new Date(record.getLongValue("endTime"))); + return object; + }) + .sorted(Comparator.comparing(FileObject::getCreateTime)) + .collect(Collectors.toList()); } return Collections.emptyList(); }