From b22bd79750e85b7da857d62c80cf5fd1ca37f617 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Mon, 23 Dec 2024 11:35:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OfflineDataUploadServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java index b338804..ef1a87f 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java @@ -1,5 +1,6 @@ package com.njcn.csharmonic.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.nacos.shaded.com.google.gson.Gson; @@ -51,6 +52,7 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -154,7 +156,7 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService { // 创建 DateTimeFormatter 对象并指定格式 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); List projectInfoList = channelObjectUtil.objectToList(redisUtil.getObjectByKey(key),RspDataDto.ProjectInfo.class); - projectInfoList.forEach(item->{ + for (RspDataDto.ProjectInfo item : projectInfoList) { MakeUpVo vo = new MakeUpVo(); vo.setType("dir"); BeanUtils.copyProperties(item,vo); @@ -171,11 +173,14 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService { vo.setEndTime(formattedDate); } result.add(vo); - }); + } } } catch (InterruptedException e) { throw new RuntimeException(e); } + if (CollUtil.isNotEmpty(result)) { + result = result.stream().sorted(Comparator.comparing(MakeUpVo::getStartTime).reversed()).collect(Collectors.toList()); + } return result; }