1、修改snmp采集数据的告警

2、修改解析入库时 warning恢复判断

src/com/nms/server/thread/monitor/SNMP4JThread.java

@@ -119,14 +119,11 @@ public class SNMP4JThread implements Runnable{
 			nextTime.add(Calendar.MINUTE, info.getCheckGap().intValue());
 			pubDatas.add(nextTime.getTimeInMillis() + "");// 下次计划监测时间，
 
-
-
 			//- DetecDatas 拼写 Body
 			List<List<String>> pubDatasList = new ArrayList<List<String>>();
 			if(state != -1){
-				pubDatasList = datasBody(retries,stateInfo.toString(),state,snmpDatasList);
+				pubDatasList = snmpDatasList;//datasBody(retries,stateInfo.toString(),state,snmpDatasList);
 			}
-			
 			pubDatas.add(state+""); // 执行状态
 			pubDatas.add(stateInfo.toString()); // 状态信息（描述信息），
 			pubDatas.add(""); // 性能数据，
@@ -139,6 +136,7 @@ public class SNMP4JThread implements Runnable{
 			//- 存入缓存
 			if(pubDatasList!=null && pubDatasList.size()>0){
 				try {
+					Common.alarmJudgement(pubDatasList);//告警判断
 					Common.addDeteData(CSVUtils.csvFilePrinter(pubDatasList, Constants.COMMON_TEXT_CODING));
 					logger.debug("监测数据以 CSV格式 保存完成");
 				} catch (Exception e) {