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

dc升级任务失败bug修正

Browse Source
This commit is contained in:
wangwenrui
2018-10-19 09:24:24 +08:00
parent aee6676d0d
commit f7aaec06f6
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1449,7 +1449,8 @@ public class CommonService {
" left join mission_parameter_table6 para" + " left join mission_parameter_table6 para" +
" on para.mission_id=t.mission_id" + " on para.mission_id=t.mission_id" +
" where t.mission_type = 6" + " 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" + task6SucSql = "select info.ip,info.mission_id as taskIds" +
" from (" + " from (" +
" select distinct node.node_ip as ip,rlt.mission_id as mission_id" + " 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" + " 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 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 " ; " )info " ;
}else{ }else{
task6AllSql = "select distinct t.mission_id,para.node_groups_id,para.node_ips_id, " + 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" + " left join mission_parameter_table6 para" +
" on para.mission_id=t.mission_id" + " on para.mission_id=t.mission_id" +
" where t.mission_type = 6" + " 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" + task6SucSql = "select info.ip,info.mission_id as taskIds" +
" from (" + " from (" +
" select distinct node.node_ip as ip,rlt.mission_id as mission_id" + " 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" + " left join mission_parameter_table6 para" +
" on para.mission_id=t.mission_id" + " on para.mission_id=t.mission_id" +
" where t.mission_type = 6" + " 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 " ; " )info " ;
} }
logger.debug("重新手机任务结果sql(task6AllSql)-->"+task6AllSql);
logger.debug("重新手机任务结果sql(task6SucSql)-->"+task6SucSql);
return getNonRltIpTaskMap(task6AllSql,task6SucSql); return getNonRltIpTaskMap(task6AllSql,task6SucSql);
} }