|
@@ -24,6 +24,7 @@ import com.persagy.apm.energyalarmstarter.alarmdata.feign.DmpResult;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord.BatchUpdateAlarmRecordDTO;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord.BatchUpdateAlarmRecordDTO;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord.QueryAlarmRecordDTO;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord.QueryAlarmRecordDTO;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord.UpdateAlarmRecordDTO;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord.UpdateAlarmRecordDTO;
|
|
|
|
+import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.OrderDTO;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.QueryDTO;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.QueryDTO;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmRecordItem;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmRecordItem;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmItemServiceImpl;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmItemServiceImpl;
|
|
@@ -116,8 +117,10 @@ public class AlarmRecordController {
|
|
sort.setColumn("triggerTime");
|
|
sort.setColumn("triggerTime");
|
|
sort.setAsc(false);
|
|
sort.setAsc(false);
|
|
orders = Lists.newArrayList(sort);
|
|
orders = Lists.newArrayList(sort);
|
|
- pageQueryAlarmRecordDTO.setOrders(orders);
|
|
|
|
}
|
|
}
|
|
|
|
+ // pageQueryAlarmRecordDTO中的排序转换为queryDTO中的排序
|
|
|
|
+ List<OrderDTO> orderDTOList = ConvertAlarmRecordTool.INSTANCE.convert2OrderDTOList(orders);
|
|
|
|
+ queryDTO.setOrders(orderDTOList);
|
|
DmpResult<List<AlarmRecordItem>> query = alarmRecordService.query(queryDTO);
|
|
DmpResult<List<AlarmRecordItem>> query = alarmRecordService.query(queryDTO);
|
|
// 报警数据中台查询结果转换为报警业务中台报警记录
|
|
// 报警数据中台查询结果转换为报警业务中台报警记录
|
|
List<AlarmRecordListItem> resultList = alarmRecordWrapper.getAlarmRecordListItems(query);
|
|
List<AlarmRecordListItem> resultList = alarmRecordWrapper.getAlarmRecordListItems(query);
|