#527 添加zk集群是否为空判断

vipshop · Jan 3, 2019 · 2397f92 · 2397f92
1 parent 9c46edf
commit 2397f92
Showing 1 changed file with 28 additions and 0 deletions.
diff --git a/...nsole-api/src/main/java/com/vip/saturn/job/console/service/impl/DashboardServiceImpl.java b/...nsole-api/src/main/java/com/vip/saturn/job/console/service/impl/DashboardServiceImpl.java
@@ -595,6 +595,13 @@ public Map<String, List> getDomainOperationHistory(String type, String topic, Da
 
 		List<String> zkClusters = getAvailableZkClusterKey();
 
+		if (zkClusters.isEmpty()) {
+			Map<String, List> result = new HashMap<>(2);
+			result.put("xAxis", null);
+			result.put("yAxis", null);
+			return result;
+		}
+
 		List<DashboardHistory> dashboardHistories = dashboardHistoryRepository
 				.selectByZkClustersAndTypeAndTopicAndFromStartDateToEndDate(zkClusters, type, topic, fromDate, toDate);
 
@@ -650,6 +657,13 @@ public Map<String, List> getDomainCountHistory(String zkCluster, String type, St
 			zkClusters.add(zkCluster);
 		}
 
+		if (zkClusters.isEmpty()) {
+			Map<String, List> result = new HashMap<>(2);
+			result.put("xAxis", null);
+			result.put("yAxis", null);
+			return result;
+		}
+
 		List<DashboardHistory> dashboardHistories = dashboardHistoryRepository
 				.selectByZkClustersAndTypeAndTopicAndFromStartDateToEndDate(zkClusters, type, topic, fromDate, toDate);
 
@@ -705,6 +719,13 @@ public Map<String, List> getExecutorHistory(String zkCluster, String type, Strin
 			zkClusters.add(zkCluster);
 		}
 
+		if (zkClusters.isEmpty()) {
+			Map<String, List> result = new HashMap<>(2);
+			result.put("xAxis", null);
+			result.put("yAxis", null);
+			return result;
+		}
+
 		List<DashboardHistory> dashboardHistories = dashboardHistoryRepository
 				.selectByZkClustersAndTypeAndTopicAndFromStartDateToEndDate(zkClusters, type, topic, fromDate, toDate);
 
@@ -774,6 +795,13 @@ public Map<String, List> getJobCountHistory(String zkCluster, String type, Strin
 			zkClusters.add(zkCluster);
 		}
 
+		if (zkClusters.isEmpty()) {
+			Map<String, List> result = new HashMap<>(2);
+			result.put("xAxis", null);
+			result.put("yAxis", null);
+			return result;
+		}
+
 		List<DashboardHistory> dashboardHistories = dashboardHistoryRepository
 				.selectByZkClustersAndTypeAndTopicAndFromStartDateToEndDate(zkClusters, type, topic, fromDate, toDate);