gfwleak/nms-nmsserver
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复升级任务--dc升级成功但是会显示失败的问题

Browse Source
This commit is contained in:
chenjinsong
2018-11-18 16:10:03 +08:00
parent ba43f4203d
commit d94384184b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/nms/server/service/CommonService.java
View File

@@ -1450,7 +1450,7 @@ public class CommonService {
" on para.mission_id=t.mission_id" +
" where t.mission_type = 6" +
// " and greatest(t.create_time,ifnull(para.start_time,t.create_time))>date_add(now() ,interval -"+timeStandard+ "*24*3600 second)";
" and greatest(t.create_time,ifnull(para.start_time,t.create_time))>date_add(now() ,interval -"+timeStandard+ " second)";
" and greatest(t.create_time,ifnull(para.start_time,t.create_time))<date_add(now() ,interval -"+timeStandard+ " second)";
task6SucSql = "select info.ip,info.mission_id as taskIds" +
" from (" +
" select distinct node.node_ip as ip,rlt.mission_id as mission_id" +
@@ -1467,7 +1467,7 @@ public class CommonService {
/* " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))*24*3600>" + timeStandard +
" )" +*/
// " and greatest(t.create_time,ifnull(para.start_time,t.create_time))>date_add(now() ,interval -"+timeStandard+ "*24*3600 second))"+
" and greatest(t.create_time,ifnull(para.start_time,t.create_time))>date_add(now() ,interval -"+timeStandard+ " second))"+
" and greatest(t.create_time,ifnull(para.start_time,t.create_time))<date_add(now() ,interval -"+timeStandard+ " second))"+
" )info " ;
}else{
task6AllSql = "select distinct t.mission_id,para.node_groups_id,para.node_ips_id, " +
@@ -1478,7 +1478,7 @@ public class CommonService {
" on para.mission_id=t.mission_id" +
" where t.mission_type = 6" +
// " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))*24*3600>"+timeStandard;
" and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))>"+timeStandard;
" and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))<"+timeStandard;
task6SucSql = "select info.ip,info.mission_id as taskIds" +
" from (" +
" select distinct node.node_ip as ip,rlt.mission_id as mission_id" +
@@ -1493,7 +1493,7 @@ public class CommonService {
" on para.mission_id=t.mission_id" +
" where t.mission_type = 6" +
// " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))*24*3600>" + timeStandard +
" and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))>" + timeStandard +
" and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))<" + timeStandard +
" )" +
" )info " ;
}