|
@@ -640,7 +640,11 @@ public abstract class AutomaticReportTableValidate implements ReportTableValidat
|
|
|
.collect(Collectors.toList());
|
|
|
List<JSONObject> jsonList = jsonObjectList.stream()
|
|
|
.filter(j->j.getJSONObject("data").getInteger("itemType")==0).collect(Collectors.toList());
|
|
|
- //得到单个分组的配置信息
|
|
|
+ List<Item> items = new ArrayList<>();
|
|
|
+ if(jsonList.size()==0){
|
|
|
+ return items;
|
|
|
+ }
|
|
|
+ //得到单个分组的配置信息
|
|
|
JSONObject jsonObject = jsonList.get(0);
|
|
|
JSONObject data = jsonObject.getJSONObject("data");
|
|
|
String policyId = data.getString("policyId");
|
|
@@ -652,7 +656,7 @@ public abstract class AutomaticReportTableValidate implements ReportTableValidat
|
|
|
LocalDateTime sTime = getSheetStartTime(setting, referTime);
|
|
|
LocalDateTime eTime = getSheetEndTime(setting, referTime);
|
|
|
//根据配置信息查询过滤数据库的所有数据
|
|
|
- List<Item> items = new ArrayList<>();
|
|
|
+
|
|
|
try {
|
|
|
items = inFluxDBService.queryHistory(bucket, policyId, sTime, eTime, policyItemIdList, valueType);
|
|
|
} catch (Exception e) {
|