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

Merge branch 'dev' of git@192.168.10.125:nms/nmsserver.git into dev

Browse Source
This commit is contained in:
fangshunjian
2018-10-18 15:55:58 +08:00
parent 5caffbd2c5 7e4b6cc905
commit aee6676d0d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/nms/server/service/CommonService.java
View File

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

12
src/com/nms/server/util/SNMP4JUtils.java
View File

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