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

1、新增dc下载任务附件web ip 获取方式 开关

Browse Source 
2、监测数据解析增加 空串判断
3、修复 nc 重启获取 已下发成功的 任务
This commit is contained in:
fangshunjian
2018-10-18 15:55:40 +08:00
parent 9b3c3ac5d7
commit 5caffbd2c5
4 changed files with 48 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/nms/server/service/UpgradeService.java
View File

@@ -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);