From f37c137903d14ded77adfd380e1fa25a6e1c2bce Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Wed, 10 Oct 2018 19:17:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/nms/server/util/SNMP4JUtils.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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){ From e10049894b8ea129b3f547a7c4143de24e792608 Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Fri, 12 Oct 2018 18:59:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?nc=20restart=20=E4=BB=BB=E5=8A=A1=E5=BE=AA?= =?UTF-8?q?=E7=8E=AF=E6=89=A7=E8=A1=8Cbug=20=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nms/server/service/UpgradeService.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/com/nms/server/service/UpgradeService.java b/src/com/nms/server/service/UpgradeService.java index dc47870..695981b 100644 --- a/src/com/nms/server/service/UpgradeService.java +++ b/src/com/nms/server/service/UpgradeService.java @@ -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); From 3d031c3811b450a6e48767913b9abd415c94551b Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Fri, 12 Oct 2018 19:08:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=A3=E6=9E=90=20=E7=A9=BA=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detectDataHandler/DataResolveThread.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/com/nms/server/thread/detectDataHandler/DataResolveThread.java b/src/com/nms/server/thread/detectDataHandler/DataResolveThread.java index e82848c..859eba1 100644 --- a/src/com/nms/server/thread/detectDataHandler/DataResolveThread.java +++ b/src/com/nms/server/thread/detectDataHandler/DataResolveThread.java @@ -955,28 +955,32 @@ public class DataResolveThread implements Runnable{ } try { String fileType = field.getFiledType().toUpperCase(); + String col = detailsArr0[index]; if("DATE".equals(fileType)){ - if(StringUtils.isNumeric(detailsArr0[index])){//如果为数字型时间，转换 - detail.put(field.getFiledName(), format.format(new Date(Long.parseLong(detailsArr0[index].trim())))); + if(StringUtils.isBlank(col)){ + detail.put(field.getFiledName(), null); + }else if(StringUtils.isNumeric(col)){//如果为数字型时间，转换 + detail.put(field.getFiledName(), format.format(new Date(Long.parseLong(col.trim())))); }else{//eg:2016-03-06 12:12:12 - detail.put(field.getFiledName(), detailsArr0[index].trim()); + detail.put(field.getFiledName(), col.trim()); } }else{ if("NUMBER".equals(fileType)){ - if (StringUtils.isBlank(detailsArr0[index]) - || StringUtil.isRationalNumber(detailsArr0[index])) { - detail.put(field.getFiledName(), detailsArr0[index].trim()); - } else if (detailsArr0[index].trim().contains(" days, ")) { - detail.put(field.getFiledName(), CommonService.getLongTimeStr(detailsArr0[index].trim())); + if(StringUtils.isBlank(col)){ + detail.put(field.getFiledName(), null); + } else if (StringUtil.isRationalNumber(col)) { + detail.put(field.getFiledName(), col.trim()); + } else if (col.trim().contains(" days, ")) { + detail.put(field.getFiledName(), CommonService.getLongTimeStr(col.trim())); } else { throw new Exception("NUMBER数据格式错误！"); } }else{ // VARCHAR2(x) String length = fileType.replaceAll("VARCHAR2\\((\\d+)\\)", "$1"); - if(Integer.parseInt(length) < detailsArr0[index].trim().length()) { + if(Integer.parseInt(length) < col.trim().length()) { throw new Exception("VARCHAR2数据格式错误！"); } - detail.put(field.getFiledName(), detailsArr0[index].trim()); + detail.put(field.getFiledName(), col.trim()); } } } catch (Exception e) { @@ -988,7 +992,7 @@ public class DataResolveThread implements Runnable{ } errorInfo.deleteCharAt(errorInfo.length()-1); //监测数据的详细信息如果和指定的字段类型不匹配，则抛弃此条监测数据，避免影响批量入库 - logger.error(" 第一步-1： 新格式监测数据解析异常： seqId:"+seqId+",setInfoId:"+setInfoId+",checkType:"+checkType+" checkTime:"+new Date(checkTime)+" 监测数据解析异常："+errorInfo); + logger.error(" 第一步-1： 新格式监测数据解析异常： seqId:"+seqId+",setInfoId:"+setInfoId+",checkType:"+checkType+" checkTime:"+new Date(checkTime)+" 监测数据解析异常："+errorInfo,e); return null; } index++; From 7e4b6cc9052a4b95b10bdbaa032e9dbc968bcfca Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Mon, 15 Oct 2018 10:40:10 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=A5=E5=BA=93bug=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/nms/server/service/CommonService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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");