代码优化
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
package com.njcn.csharmonic.service.impl;
|
package com.njcn.csharmonic.service.impl;
|
||||||
|
|
||||||
|
import cn.hutool.core.collection.CollUtil;
|
||||||
import cn.hutool.core.collection.CollectionUtil;
|
import cn.hutool.core.collection.CollectionUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.alibaba.nacos.shaded.com.google.gson.Gson;
|
import com.alibaba.nacos.shaded.com.google.gson.Gson;
|
||||||
@@ -51,6 +52,7 @@ import java.time.LocalDateTime;
|
|||||||
import java.time.ZoneId;
|
import java.time.ZoneId;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Comparator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -154,7 +156,7 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService {
|
|||||||
// 创建 DateTimeFormatter 对象并指定格式
|
// 创建 DateTimeFormatter 对象并指定格式
|
||||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
||||||
List<RspDataDto.ProjectInfo> projectInfoList = channelObjectUtil.objectToList(redisUtil.getObjectByKey(key),RspDataDto.ProjectInfo.class);
|
List<RspDataDto.ProjectInfo> projectInfoList = channelObjectUtil.objectToList(redisUtil.getObjectByKey(key),RspDataDto.ProjectInfo.class);
|
||||||
projectInfoList.forEach(item->{
|
for (RspDataDto.ProjectInfo item : projectInfoList) {
|
||||||
MakeUpVo vo = new MakeUpVo();
|
MakeUpVo vo = new MakeUpVo();
|
||||||
vo.setType("dir");
|
vo.setType("dir");
|
||||||
BeanUtils.copyProperties(item,vo);
|
BeanUtils.copyProperties(item,vo);
|
||||||
@@ -171,11 +173,14 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService {
|
|||||||
vo.setEndTime(formattedDate);
|
vo.setEndTime(formattedDate);
|
||||||
}
|
}
|
||||||
result.add(vo);
|
result.add(vo);
|
||||||
});
|
}
|
||||||
}
|
}
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
|
if (CollUtil.isNotEmpty(result)) {
|
||||||
|
result = result.stream().sorted(Comparator.comparing(MakeUpVo::getStartTime).reversed()).collect(Collectors.toList());
|
||||||
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user