diff --git a/src/com/nms/thread/NmsPortThread.java b/src/com/nms/thread/NmsPortThread.java index b405200..4ee84b2 100644 --- a/src/com/nms/thread/NmsPortThread.java +++ b/src/com/nms/thread/NmsPortThread.java @@ -67,7 +67,7 @@ public class NmsPortThread implements Runnable { //整理端口状态告警推送 String seqId = info.get("seq_id"); String portName = info.get("IFDESCR"); - String adminStatus = info.get("IFADMINSTATUS"); + String adminStatus = info.get("IFOPERSTATUS"); String ip = info.get("node_ip"); String setStatus = portStatusInfoMap.get(seqId + portName);//配置状态 if(setStatus != null && !setStatus.equals(adminStatus)){ diff --git a/src/com/nms/thread/service/NmsReportService.java b/src/com/nms/thread/service/NmsReportService.java index 3521045..f88d9b2 100644 --- a/src/com/nms/thread/service/NmsReportService.java +++ b/src/com/nms/thread/service/NmsReportService.java @@ -86,11 +86,11 @@ public class NmsReportService { //end=1539073220004l,start=1539064699984l //只查询 网元类型为 特种设备:1的端口信息 String sql = "SELECT DISTINCT nt.node_ip, nt.node_name, ds.ifindex, ds.IFDESCR, ds.IFSPEED, ds.IFINOCTETS, ds.IFOUTOCTETS,ds.INOCTETSSPEED,ds.INPKTSSPEED,ds.OUTOCTETSSPEED, ds.OUTPKTSSPEED, ds.DATA_CHECK_TIME,st.ADDR " - + " ,ds.IFADMINSTATUS ,nt.seq_id" + + " ,ds.IFADMINSTATUS ,nt.seq_id,ds.IFOPERSTATUS " + " FROM di_switchport ds " + "LEFT JOIN node_table nt ON nt.seq_id=ds.seq_id " + " left join system_table st on st.system_id = nt.system_id " - + "WHERE nt.network_element_type = 1 and nt.node_state=0 AND ds.data_check_time_digital<" + end + " AND ds.data_check_time_digital>=" + start; + + "WHERE ds.DETECTION_SET_INFO_ID = 9 and nt.network_element_type = 1 and nt.node_state=0 AND ds.data_check_time_digital<" + end + " AND ds.data_check_time_digital>=" + start; ArrayList fields = new ArrayList(); fields.add("node_ip"); fields.add("node_name"); @@ -107,6 +107,7 @@ public class NmsReportService { fields.add("ADDR"); fields.add("IFADMINSTATUS"); fields.add("seq_id"); + fields.add("IFOPERSTATUS"); try { ArrayList> dbSelect = dao.dbSelect(sql, fields);