vipshop#452 增加空集合的判空；修复第一次获取作业状态后导致后面的作业都不会更新

leewcc · leewcc · commit 802c68498498 · 2018-07-19T17:33:49.000+08:00
状态
diff --git a/saturn-console-api/src/main/java/com/vip/saturn/job/console/controller/gui/JobOverviewController.java b/saturn-console-api/src/main/java/com/vip/saturn/job/console/controller/gui/JobOverviewController.java
@@ -16,6 +16,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Pageable;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -91,18 +92,20 @@ public SuccessResponseEntity getJobNames(@PathVariable String namespace) throws
 	@ApiResponses(value = { @ApiResponse(code = 200, message = "Success/Fail", response = RequestResult.class) })
 	@GetMapping(value = "/sharding/status")
 	public SuccessResponseEntity getJobsShardingStatus(@PathVariable String namespace,
-			@RequestParam List<String> jobNames) throws SaturnJobConsoleException {
+			@RequestParam(required = false) List<String> jobNames) throws SaturnJobConsoleException {
 		Map<String, String> jobShardingMap = new HashMap<>();
-		for (String jobName : jobNames) {
-			JobStatus jobStatus = jobService.getJobStatus(namespace, jobName);
-			boolean isAllocated = !JobStatus.STOPPED.equals(jobStatus)
-					&& jobService.isJobShardingAllocatedExecutor(namespace, jobName);
-			if (isAllocated) {
-				jobShardingMap.put(jobName, "已分配");
-			} else {
-				jobShardingMap.put(jobName, "未分配");
-			}
-		}
+		if (!CollectionUtils.isEmpty(jobNames)) {
+            for (String jobName : jobNames) {
+                JobStatus jobStatus = jobService.getJobStatus(namespace, jobName);
+                boolean isAllocated = !JobStatus.STOPPED.equals(jobStatus)
+                        && jobService.isJobShardingAllocatedExecutor(namespace, jobName);
+                if (isAllocated) {
+                    jobShardingMap.put(jobName, "已分配");
+                } else {
+                    jobShardingMap.put(jobName, "未分配");
+                }
+            }
+        }
 		return new SuccessResponseEntity(jobShardingMap);
 	}
 
@@ -192,9 +195,10 @@ private List<JobOverviewJobVo> updateJobOverviewDetail(String namespace, List<Jo
                 }
 
                 if (jobStatus == null) {
-					jobStatus = jobService.getJobStatus(namespace, jobConfig);
+                    jobOverviewJobVo.setStatus(jobService.getJobStatus(namespace, jobConfig));
+                } else {
+                    jobOverviewJobVo.setStatus(jobStatus);
                 }
-                jobOverviewJobVo.setStatus(jobStatus);
 				result.add(jobOverviewJobVo);
             } catch (Exception e) {
                 log.error("list job " + jobConfig.getJobName() + " error", e);
@@ -216,14 +220,6 @@ private void updateJobTypesInOverview(JobConfig jobConfig, JobOverviewJobVo jobO
         }
     }
 
-    private void updateShardingListInOverview(String namespace, JobConfig jobConfig, JobOverviewJobVo jobOverviewJobVo)
-            throws SaturnJobConsoleException {
-		boolean isAllocated = jobService.isJobShardingAllocatedExecutor(namespace, jobConfig.getJobName());
-        if (isAllocated) {
-            jobOverviewJobVo.setShardingList("已分配分片");
-        }
-    }
-
     public JobOverviewVo countJobOverviewVo(String namespace) throws SaturnJobConsoleException{
         JobOverviewVo jobOverviewVo = new JobOverviewVo();
         jobOverviewVo.setTotalNumber(jobService.countUnSystemJobsWithCondition(namespace,
