dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sort exported resources

Browse Source
This commit is contained in:
ViacheslavKlimov 2024-11-20 15:57:19 +02:00
parent 90bfd76611
commit 4ca4e94ce5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
View File

@ -60,6 +60,7 @@ import java.nio.charset.StandardCharsets;
import java.util.Base64; import java.util.Base64;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -206,6 +207,7 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
@Override @Override
public List<ResourceExportData> exportResources(TenantId tenantId, Collection<TbResourceInfo> resources) { public List<ResourceExportData> exportResources(TenantId tenantId, Collection<TbResourceInfo> resources) {
return resources.stream() return resources.stream()
.sorted(Comparator.comparing(TbResourceInfo::getResourceType).thenComparing(TbResourceInfo::getResourceKey))
.map(resourceInfo -> { .map(resourceInfo -> {
if (resourceInfo.getResourceType() == ResourceType.IMAGE) { if (resourceInfo.getResourceType() == ResourceType.IMAGE) {
ResourceExportData imageExportData = imageService.exportImage(resourceInfo); ResourceExportData imageExportData = imageService.exportImage(resourceInfo);