summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorchenjinsong <[email protected]>2018-11-18 16:10:03 +0800
committerchenjinsong <[email protected]>2018-11-18 16:10:03 +0800
commitd94384184b45bcdccee59c3b84ea20da9daad831 (patch)
tree4a0633026a3eff7a52e683557b199c8ade950c47 /src
parentba43f4203d134edc387365c33ac6ba738112e8ad (diff)
修复升级任务--dc升级成功但是会显示失败的问题
Diffstat (limited to 'src')
-rw-r--r--src/com/nms/server/service/CommonService.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/nms/server/service/CommonService.java b/src/com/nms/server/service/CommonService.java
index 3cbd47e..d915b3a 100644
--- a/src/com/nms/server/service/CommonService.java
+++ b/src/com/nms/server/service/CommonService.java
@@ -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 " ;
}