Commit 7953e6ab88f3b332e3ee6ce749c8b6ccd4616c03
Merge branch '20220609' into 'master'
fix(DEFECT-422): 告警记录排序 See merge request huang/thingsboard3.3.2!106
Showing
1 changed file
with
1 additions
and
1 deletions
| @@ -44,7 +44,7 @@ public class YtAlarmInfoServiceImpl implements YtAlarmInfoService { | @@ -44,7 +44,7 @@ public class YtAlarmInfoServiceImpl implements YtAlarmInfoService { | ||
| 44 | 44 | ||
| 45 | @Override | 45 | @Override |
| 46 | public YtPageData<YtAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, UUID customerId, AlarmSeverity severity, String alarmType, Long startTime, Long endTime, List<AlarmStatus> status, String deviceId, DeviceTypeEnum deviceType, EntityType originatorType, String organizationId) { | 46 | public YtPageData<YtAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, UUID customerId, AlarmSeverity severity, String alarmType, Long startTime, Long endTime, List<AlarmStatus> status, String deviceId, DeviceTypeEnum deviceType, EntityType originatorType, String organizationId) { |
| 47 | - IPage<YtAlarmEntity> page = getPage(pageMap, ModelConstants.STATUS_PROPERTY, OrderTypeEnum.ASC); | 47 | + IPage<YtAlarmEntity> page = getPage(pageMap, ModelConstants.STATUS_PROPERTY+","+ModelConstants.CREATED_TIME_PROPERTY, OrderTypeEnum.ASC); |
| 48 | List<String> ids = new ArrayList<>(); | 48 | List<String> ids = new ArrayList<>(); |
| 49 | if (StringUtils.isNotBlank(organizationId)) { | 49 | if (StringUtils.isNotBlank(organizationId)) { |
| 50 | List<String> filter = new ArrayList<>(); | 50 | List<String> filter = new ArrayList<>(); |