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

端口上报测试过程bug修改

Browse Source 
1.端口查询sql修改
2.数据处理修改
This commit is contained in:
wangwenrui
2019-02-20 14:56:37 +08:00
parent 4bae6a3299
commit 304b383c95
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/nms/thread/NmsPortThread.java
View File

@@ -42,7 +42,7 @@ public class NmsPortThread implements Runnable {
ArrayList<Map<String,String>> portStatusInfo = service.getPortStatusInfo();//串联设备端口配置状态 ArrayList<Map<String,String>> portStatusInfo = service.getPortStatusInfo();//串联设备端口配置状态
Map<String,String> portStatusInfoMap = new HashMap<String,String>(); Map<String,String> portStatusInfoMap = new HashMap<String,String>();
for(Map<String,String> map : portStatusInfo){ for(Map<String,String> 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())); logger.debug(String.format("查询数量：%s", nmsPortInfo.size()));
Map<String, List<Map<String, String>>> data = new HashMap<String, List<Map<String, String>>>(); Map<String, List<Map<String, String>>> data = new HashMap<String, List<Map<String, String>>>();
@@ -71,9 +71,9 @@ public class NmsPortThread implements Runnable {
String setStatus = portStatusInfoMap.get(seqId + portName);//配置状态 String setStatus = portStatusInfoMap.get(seqId + portName);//配置状态
if(setStatus != null && !setStatus.equals(adminStatus)){ if(setStatus != null && !setStatus.equals(adminStatus)){
Map<String,String> sw = new HashMap<String,String>(); Map<String,String> sw = new HashMap<String,String>();
sw.put("area", info.get("ADDR")); sw.put("area",info.get("ADDR") );
sw.put("port", portName); sw.put("port", portName);
sw.put("status", adminStatus); sw.put("status", "1".equals(adminStatus)?"UP":"DOWN");
sw.put("commitTime", info.get("DATA_CHECK_TIME")); sw.put("commitTime", info.get("DATA_CHECK_TIME"));
portStatusWarn.add(sw); portStatusWarn.add(sw);
} }

4
src/com/nms/thread/service/NmsReportService.java
View File

@@ -86,8 +86,8 @@ public class NmsReportService {
//end=1539073220004l,start=1539064699984l //end=1539073220004l,start=1539064699984l
//只查询 网元类型为 特种设备：1的端口信息 //只查询 网元类型为 特种设备：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 " 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"
+ "FROM di_switchport ds " + " FROM di_switchport ds "
+ "LEFT JOIN node_table nt ON nt.seq_id=ds.seq_id " + "LEFT JOIN node_table nt ON nt.seq_id=ds.seq_id "
+ " left join system_table st on st.system_id = nt.system_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 nt.network_element_type = 1 and nt.node_state=0 AND ds.data_check_time_digital<" + end + " AND ds.data_check_time_digital>=" + start;