summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwangwenrui <[email protected]>2018-10-12 18:59:03 +0800
committerwangwenrui <[email protected]>2018-10-12 18:59:03 +0800
commite10049894b8ea129b3f547a7c4143de24e792608 (patch)
treeeae08d576f8df13462e55b469f41247cfa9c6f99
parentf37c137903d14ded77adfd380e1fa25a6e1c2bce (diff)
nc restart 任务循环执行bug 修正
-rw-r--r--src/com/nms/server/service/UpgradeService.java21
1 files changed, 18 insertions, 3 deletions
diff --git a/src/com/nms/server/service/UpgradeService.java b/src/com/nms/server/service/UpgradeService.java
index dc47870..695981b 100644
--- a/src/com/nms/server/service/UpgradeService.java
+++ b/src/com/nms/server/service/UpgradeService.java
@@ -237,7 +237,12 @@ public class UpgradeService extends CommonService{
searchSql.append("and t.is_loop =0 "); //非周期任务
// searchSql.append("and mpt4.node_group_id in( "+groupsIdsSQL+") ");
searchSql.append("and mpt4.mission_id in( "+missionSql4+") ");
- searchSql.append("and mrt4.result >= 40 ");
+ /*
+ * 2018年10月12日18:10:49
+ * nc 重启获取 未下发的任务
+ */
+// searchSql.append("and mrt4.result >=40 ");
+ searchSql.append("and mrt4.result = 3 ");//3:任务下发中
searchSql.append("and mrt4.seq_id ="+uuid+" ");
searchSql.append("order by t.create_time asc ");
mapsList = dao.dbSelect(searchSql.toString(), fields);
@@ -303,7 +308,12 @@ public class UpgradeService extends CommonService{
// searchSql.append("and mpt4.node_group_id in( "+groupsIdsSQL+") ");
searchSql.append("and mpt4.mission_id in( "+missionSql4+") ");
// searchSql.append("and nt.seq_id = "+uuid.longValue()+" ");
- searchSql.append("and mrt4.result >= 40 ");
+ /*
+ * 2018年10月12日18:10:49
+ * nc 重启获取 未下发的任务
+ */
+// searchSql.append("and mrt4.result >=40 ");
+ searchSql.append("and mrt4.result = 3 ");//3:任务下发中
searchSql.append("and mrt4.seq_id ="+uuid+" ");
searchSql.append("order by t.create_time asc ");
mapsList = dao.dbSelect(searchSql.toString(), fields);
@@ -370,7 +380,12 @@ public class UpgradeService extends CommonService{
// searchSql.append("and mpt6.node_group_id in( "+groupsIdsSQL+") ");
searchSql.append("and mpt6.mission_id in( "+missionSql6+") ");
// searchSql.append("and nt.seq_id = "+uuid.longValue()+" ");
- searchSql.append("and mrt6.result >= 40 ");
+ /*
+ * 2018年10月12日18:10:49
+ * nc 重启获取 未下发的任务
+ */
+// searchSql.append("and mrt6.result >=40 ");
+ searchSql.append("and mrt6.result = 3 ");//3:任务下发中
searchSql.append("and mrt6.seq_id ="+uuid+" ");
searchSql.append("order by t.create_time asc ");
mapsList = dao.dbSelect(searchSql.toString(), fields);