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

1.snmp对1.3.6.1.4.1.5000000.1.4.1.1.3特殊处理

Browse Source 
2.不执行其他system的任务
This commit is contained in:
chenjinsong
2018-10-30 13:57:52 +08:00
parent 6850bf8980
commit 32a1746aaa
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,6 +55,8 @@ public class UpgradeService extends CommonService{
*/
public ArrayList<MissionStateTable> getNewMessionList(Long missionId){
//-- 查询可执行的任务
String systemSql = "-1".equals(Constants.CURRENT_SYSTEM_ID) ? "" : "and mst.system_id=" + Constants.CURRENT_SYSTEM_ID + " ";
StringBuffer searchSQL = new StringBuffer();
searchSQL.append("select mst.mission_id,");
searchSQL.append("mst.mission_type,");
@@ -67,6 +69,7 @@ public class UpgradeService extends CommonService{
searchSQL.append("mst.loop_delay ");
searchSQL.append("from mission_state_table mst ");
searchSQL.append("where 1=1 ");
searchSQL.append(systemSql);
//2012-03-20 取消任务时间过滤，将对所有任务进行处理
// searchSQL.append("and (mst.end_time>sysdate or mst.end_time is null) ");// 周期任务（未过时） or 非周期任务
if (missionId!=null && missionId.longValue() !=0l) {
@@ -123,6 +126,8 @@ public class UpgradeService extends CommonService{
*/
public ArrayList<MissionStateTable> getStartMessionList(String ids){
//-- 查询可执行的任务
String systemSql = "-1".equals(Constants.CURRENT_SYSTEM_ID) ? "" : "and mst.system_id=" + Constants.CURRENT_SYSTEM_ID + " ";
StringBuffer searchSQL = new StringBuffer();
searchSQL.append("select mst.mission_id,");
searchSQL.append("mst.mission_type,");
@@ -135,6 +140,7 @@ public class UpgradeService extends CommonService{
searchSQL.append("mst.loop_delay ");
searchSQL.append("from mission_state_table mst ");
searchSQL.append("where 1=1 ");
searchSQL.append(systemSql);
// searchSQL.append("and (mst.end_time>sysdate or mst.end_time is null) ");
searchSQL.append("and mst.mission_state in(2,6) ");
if(StringUtils.isNotEmpty(ids)){