Browse Source

优化报警记录查询接口

lixing 3 years ago
parent
commit
bf58649119

+ 16 - 4
AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/service/AlarmRecordServiceImpl.java

@@ -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);
+        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);
-//        DmpResult<JSONArray> result = alarmClient.queryAlarmRecord(queryDTO.fetchParams(), Obj2JSONObject.convert2Str(queryDTO));
 		return DmpResultUtil.multiConvert(result, AlarmRecordItem.class);
 	}