|
@@ -48,7 +48,7 @@ public class AlarmRecordServiceImpl {
|
|
|
queryDTO.setOnlyCount(true);
|
|
|
queryDTO.setCriteria(queryAlarmRecordDTO);
|
|
|
|
|
|
- DmpResult<List<AlarmRecordItem>> dmpResult = query(queryDTO);
|
|
|
+ DmpResult<List<AlarmRecordItem>> dmpResult = queryWithoutLog(queryDTO);
|
|
|
return dmpResult.getCount();
|
|
|
}
|
|
|
|
|
@@ -75,11 +75,23 @@ public class AlarmRecordServiceImpl {
|
|
|
*/
|
|
|
public DmpResult<List<AlarmRecordItem>> query(QueryDTO<QueryAlarmRecordDTO> queryDTO) throws Exception {
|
|
|
|
|
|
-
|
|
|
-
|
|
|
+ Set<String> withColumns = Sets.newHashSet("ignoreTime", "treatEndTime");
|
|
|
+ queryDTO.setWithColumns(withColumns);
|
|
|
+ JSONObject jsonObject = Obj2JSONObject.convert(queryDTO);
|
|
|
+ DmpResult<JSONArray> result = alarmClient.queryAlarmRecord(queryDTO.fetchParams(), jsonObject);
|
|
|
+ return DmpResultUtil.multiConvert(result, AlarmRecordItem.class);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ * 查询报警记录, 不需要日志信息
|
|
|
+ *
|
|
|
+ * @param queryDTO 入参
|
|
|
+ * @return 报警记录列表
|
|
|
+ * @throws Exception
|
|
|
+ */
|
|
|
+ public DmpResult<List<AlarmRecordItem>> queryWithoutLog(QueryDTO<QueryAlarmRecordDTO> queryDTO) throws Exception {
|
|
|
JSONObject jsonObject = Obj2JSONObject.convert(queryDTO);
|
|
|
DmpResult<JSONArray> result = alarmClient.queryAlarmRecord(queryDTO.fetchParams(), jsonObject);
|
|
|
-
|
|
|
return DmpResultUtil.multiConvert(result, AlarmRecordItem.class);
|
|
|
}
|
|
|
|