|
@@ -207,15 +207,19 @@ public class GisSurveySystemCheckBizService {
|
|
|
* @return 进行中详情
|
|
|
*/
|
|
|
private Map<String, GisSurveySystemCheckResultDetail> getProgressData(GisSurveySystemCheckId systemCheckId) {
|
|
|
- return SUBTASK_CACHE.get(systemCheckId).entrySet().stream()
|
|
|
+ //获取子任务
|
|
|
+ Map<String, ListenableFuture<GisSurveySystemCheckResultDetail>> subtask = SUBTASK_CACHE.get(systemCheckId);
|
|
|
+ //任务转结果
|
|
|
+ if (subtask != null) return subtask.entrySet().stream()
|
|
|
.collect(Collectors.toMap(
|
|
|
Map.Entry::getKey,
|
|
|
entry -> {
|
|
|
GisSurveySystemCheckResultDetail resultDetail = new GisSurveySystemCheckResultDetail();
|
|
|
- resultDetail.setDone(entry.getValue().isDone());
|
|
|
+ if (entry.getValue() != null) resultDetail.setDone(entry.getValue().isDone());
|
|
|
return resultDetail;
|
|
|
}
|
|
|
));
|
|
|
+ return null;
|
|
|
}
|
|
|
|
|
|
/**
|