diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java index 05cb9d5830458f70162cd57985dd6b072016c7e5..2239646787d3f7614c5c150890527d1037faadbc 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java @@ -194,7 +194,11 @@ public class ProcessInstanceService extends BaseDAGService { project.getId(), processDefineId, searchVal, statusArray, host, start, end); for(ProcessInstance processInstance:processInstanceList.getRecords()){ - processInstance.setDuration(DateUtils.differSec(processInstance.getStartTime(),processInstance.getEndTime())); + if (StringUtils.isNotEmpty(startDate) + && StringUtils.isNotEmpty(endDate)){ + processInstance.setDuration(DateUtils.differSec(processInstance.getStartTime(),processInstance.getEndTime())); + } + } Set exclusionSet = new HashSet(){{ @@ -205,7 +209,7 @@ public class ProcessInstanceService extends BaseDAGService { }}; PageInfo pageInfo = new PageInfo(pageNo, pageSize); - pageInfo.setTotalCount((int)processInstanceList.getTotal()); + pageInfo.setTotalCount((int) processInstanceList.getTotal()); pageInfo.setLists(CollectionUtils.getListByExclusion(processInstanceList.getRecords(), exclusionSet)); result.put(Constants.DATA_LIST, pageInfo); putMsg(result, Status.SUCCESS); diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/zk/ZKMasterClient.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/zk/ZKMasterClient.java index af2f25b9aa00cacfef4a6604ae4876bf40760cf5..758e29bd5ce0be9dc691d5a1cc9f075ec058a8e2 100644 --- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/zk/ZKMasterClient.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/zk/ZKMasterClient.java @@ -141,7 +141,7 @@ public class ZKMasterClient extends AbstractZKClient { */ public void initDao(){ this.alertDao = DaoFactory.getDaoInstance(AlertDao.class); - this.processDao = DaoFactory.getDaoInstance(ProcessDao.class); +// this.processDao = DaoFactory.getDaoInstance(ProcessDao.class); } /** * get alert dao