diff --git a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java index 871daddf11..22aa2ae748 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java @@ -60,6 +60,7 @@ import java.nio.charset.StandardCharsets; import java.util.Base64; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -206,6 +207,7 @@ public class BaseResourceService extends AbstractCachedEntityService exportResources(TenantId tenantId, Collection resources) { return resources.stream() + .sorted(Comparator.comparing(TbResourceInfo::getResourceType).thenComparing(TbResourceInfo::getResourceKey)) .map(resourceInfo -> { if (resourceInfo.getResourceType() == ResourceType.IMAGE) { ResourceExportData imageExportData = imageService.exportImage(resourceInfo);