diff options
| author | wangwenrui <[email protected]> | 2018-10-19 09:24:24 +0800 |
|---|---|---|
| committer | wangwenrui <[email protected]> | 2018-10-19 09:24:24 +0800 |
| commit | f7aaec06f69f21f5bd0bdcc19ae1d0d18ef937b5 (patch) | |
| tree | 577993e9a56fa3cb4ac5c485c77b7c38b37b3338 | |
| parent | aee6676d0d292c38b8eac8fd85078bb64ec136a1 (diff) | |
dc升级任务失败bug修正
| -rw-r--r-- | src/com/nms/server/service/CommonService.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/com/nms/server/service/CommonService.java b/src/com/nms/server/service/CommonService.java index ace94c3..769e104 100644 --- a/src/com/nms/server/service/CommonService.java +++ b/src/com/nms/server/service/CommonService.java @@ -1449,7 +1449,8 @@ public class CommonService { " left join mission_parameter_table6 para" + " 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+ "*24*3600 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" + @@ -1465,7 +1466,8 @@ public class CommonService { " where t.mission_type = 6" + /* " 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+ "*24*3600 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, " + @@ -1475,7 +1477,8 @@ public class CommonService { " left join mission_parameter_table6 para" + " 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)))*24*3600>"+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" + @@ -1489,11 +1492,13 @@ public class CommonService { " left join mission_parameter_table6 para" + " 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)))*24*3600>" + timeStandard + + " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))>" + timeStandard + " )" + " )info " ; } - + logger.debug("重新手机任务结果sql(task6AllSql)-->"+task6AllSql); + logger.debug("重新手机任务结果sql(task6SucSql)-->"+task6SucSql); return getNonRltIpTaskMap(task6AllSql,task6SucSql); } |