diff --git a/src/com/nms/thread/NmsPortThread.java b/src/com/nms/thread/NmsPortThread.java index 7675988..7730341 100644 --- a/src/com/nms/thread/NmsPortThread.java +++ b/src/com/nms/thread/NmsPortThread.java @@ -42,7 +42,7 @@ public class NmsPortThread implements Runnable { ArrayList> portStatusInfo = service.getPortStatusInfo();//串联设备端口配置状态 Map portStatusInfoMap = new HashMap(); for(Map map : portStatusInfo){ - portStatusInfoMap.put(map.get("seqid")+map.get("name_flag"), map.get("port_set_state")); + portStatusInfoMap.put(map.get("seqid")+map.get("name_flag"), map.get("state")); } logger.debug(String.format("查询数量:%s", nmsPortInfo.size())); Map>> data = new HashMap>>(); @@ -71,9 +71,9 @@ public class NmsPortThread implements Runnable { String setStatus = portStatusInfoMap.get(seqId + portName);//配置状态 if(setStatus != null && !setStatus.equals(adminStatus)){ Map sw = new HashMap(); - sw.put("area", info.get("ADDR")); + sw.put("area",info.get("ADDR") ); sw.put("port", portName); - sw.put("status", adminStatus); + sw.put("status", "1".equals(adminStatus)?"UP":"DOWN"); sw.put("commitTime", info.get("DATA_CHECK_TIME")); portStatusWarn.add(sw); } diff --git a/src/com/nms/thread/service/NmsReportService.java b/src/com/nms/thread/service/NmsReportService.java index 286d339..3521045 100644 --- a/src/com/nms/thread/service/NmsReportService.java +++ b/src/com/nms/thread/service/NmsReportService.java @@ -86,8 +86,8 @@ 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" - + "FROM di_switchport ds " + + " ,ds.IFADMINSTATUS ,nt.seq_id" + + " 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;