简柏林 / thingskit · Commits

Commit 8200d4fea2bdf67ff08863a1ccbef90bd99791a4

Authored by 云中非
1 parent 69f29bb5

fix(DEFECT-906): 告警记录排序问题

Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
... ... @@ -43,7 +43,9 @@ public class TkAlarmInfoServiceImpl implements TkAlarmInfoService {
43 43
44 44 @Override
45 45 public YtPageData<TkAlarmEntity> 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   - IPage<TkAlarmEntity> page = getPage(pageMap, ModelConstants.STATUS_PROPERTY+","+ModelConstants.CREATED_TIME_PROPERTY+" DESC, "+ModelConstants.STATUS_PROPERTY, OrderTypeEnum.ASC);
  46 + StringBuilder defaultOrderFields = new StringBuilder("ack_ts asc,clear_ts asc,");
  47 + defaultOrderFields.append(ModelConstants.CREATED_TIME_PROPERTY);
  48 + IPage<TkAlarmEntity> page = getPage(pageMap, defaultOrderFields.toString(), OrderTypeEnum.DESC);
47 49 List<String> ids = new ArrayList<>();
48 50 if (StringUtils.isNotBlank(organizationId)) {
49 51 List<String> filter = new ArrayList<>();
... ...