diff --git a/src/com/nms/server/service/CommonService.java b/src/com/nms/server/service/CommonService.java index e83d5ab..ace94c3 100644 --- a/src/com/nms/server/service/CommonService.java +++ b/src/com/nms/server/service/CommonService.java @@ -3701,7 +3701,7 @@ public class CommonService { //-- 获取ID fields.clear(); - String id = DetectInfo.computeId(checkTime, seqId, setInfoId); + String id = DetectInfo.computeId(alarms[5], seqId, setInfoId); /*String searchIdSql = "select seq_detection_info.nextval id from dual"; fields.add("id"); diff --git a/src/com/nms/server/util/SNMP4JUtils.java b/src/com/nms/server/util/SNMP4JUtils.java index 114ea2f..a2897ff 100644 --- a/src/com/nms/server/util/SNMP4JUtils.java +++ b/src/com/nms/server/util/SNMP4JUtils.java @@ -398,11 +398,11 @@ public class SNMP4JUtils { for (int j = 0; j < list.size(); j++) { TreeEvent treeEvent = (TreeEvent)list.get(j); if (treeEvent.isError()) - throw new Exception((new StringBuilder("i18n_server.SNMP4JUtils.Exception3_n81i:")).append(treeEvent.getErrorMessage()).toString()); + throw new Exception((new StringBuilder("Error getting SNMP table:")).append(treeEvent.getErrorMessage()).toString()); if (treeEvent.getException() != null) - throw new Exception((new StringBuilder("i18n_server.SNMP4JUtils.Exception4_n81i:")).append(treeEvent.getErrorMessage()).append(" ").append(treeEvent.getException().getMessage()).toString()); + throw new Exception((new StringBuilder("Get an exception in SNMP table:")).append(treeEvent.getErrorMessage()).append(" ").append(treeEvent.getException().getMessage()).toString()); if (treeEvent.getStatus() != 0) - throw new Exception((new StringBuilder("i18n_server.SNMP4JUtils.Exception3_n81i:")).append(treeEvent.getErrorMessage()).toString()); + throw new Exception((new StringBuilder("Error getting SNMP table:")).append(treeEvent.getErrorMessage()).toString()); if (treeEvent.getVariableBindings() != null ){ VariableBinding vbArr[] = treeEvent.getVariableBindings(); if(vbArr != null){ @@ -457,11 +457,11 @@ public class SNMP4JUtils { for (int j = 0; j < list.size(); j++) { TreeEvent treeEvent = (TreeEvent)list.get(j); if (treeEvent.isError()) - throw new Exception((new StringBuilder("i18n_server.SNMP4JUtils.Exception3_n81i:")).append(treeEvent.getErrorMessage()).toString()); + throw new Exception((new StringBuilder("Error getting SNMP table:")).append(treeEvent.getErrorMessage()).toString()); if (treeEvent.getException() != null) - throw new Exception((new StringBuilder("i18n_server.SNMP4JUtils.Exception4_n81i:")).append(treeEvent.getErrorMessage()).append(" ").append(treeEvent.getException().getMessage()).toString()); + throw new Exception((new StringBuilder("Get an exception in SNMP table:")).append(treeEvent.getErrorMessage()).append(" ").append(treeEvent.getException().getMessage()).toString()); if (treeEvent.getStatus() != 0) - throw new Exception((new StringBuilder("i18n_server.SNMP4JUtils.Exception3_n81i:")).append(treeEvent.getErrorMessage()).toString()); + throw new Exception((new StringBuilder("Error getting SNMP table:")).append(treeEvent.getErrorMessage()).toString()); if (treeEvent.getVariableBindings() != null ){ VariableBinding vbArr[] = treeEvent.getVariableBindings(); if(vbArr != null){