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

Added comparator for loaded mobile dashboard and sort by ID if created time equals

Browse Source
This commit is contained in:
Volodymyr Babak 2021-07-23 11:48:13 +03:00
parent fa6d9b90ba
commit 72f7aa3bb2
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java
View File

@ -241,11 +241,15 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest {
} }
} while (pageData.hasNext()); } while (pageData.hasNext());
Collections.sort(mobileDashboards, (o1, o2) -> { Comparator<DashboardInfo> dashboardInfoComparator = (o1, o2) -> {
Integer order1 = o1.getMobileOrder(); Integer order1 = o1.getMobileOrder();
Integer order2 = o2.getMobileOrder(); Integer order2 = o2.getMobileOrder();
if (order1 == null && order2 == null) { if (order1 == null && order2 == null) {
return (int)(o1.getCreatedTime() - o2.getCreatedTime()); if (o1.getCreatedTime() == o2.getCreatedTime()) {
return o1.getUuidId().compareTo(o2.getUuidId());
} else {
return (int) (o1.getCreatedTime() - o2.getCreatedTime());
}
} else if (order1 == null && order2 != null) { } else if (order1 == null && order2 != null) {
return 1; return 1;
} else if (order2 == null) { } else if (order2 == null) {
@ -253,7 +257,10 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest {
} else { } else {
return order1 - order2; return order1 - order2;
} }
}); };
Collections.sort(mobileDashboards, dashboardInfoComparator);
Collections.sort(loadedMobileDashboards, dashboardInfoComparator);
Assert.assertEquals(mobileDashboards, loadedMobileDashboards); Assert.assertEquals(mobileDashboards, loadedMobileDashboards);