提交 ed04835c 编写于 作者: Q qiaozhanwei 提交者: lgcareer

running through the big process error modify (#962)

* add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml

* .escheduler_env.sh to dolphinscheduler_env.sh

* dao yml assembly to conf directory

* table name modify

* entity title table  name modify

* logback log name modify

* running through the big process

* running through the big process error modify
上级 31f9fbf3
......@@ -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<String> exclusionSet = new HashSet<String>(){{
......@@ -205,7 +209,7 @@ public class ProcessInstanceService extends BaseDAGService {
}};
PageInfo pageInfo = new PageInfo<ProcessInstance>(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);
......
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册