From 304b383c95737e1f7b9a16ffe6ba722a47698fb3 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui>
Date: Wed, 20 Feb 2019 14:56:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E4=B8=8A=E6=8A=A5=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=BF=87=E7=A8=8Bbug=E4=BF=AE=E6=94=B9=201.=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3=E6=9F=A5=E8=AF=A2sql=E4=BF=AE=E6=94=B9=202.=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=A4=84=E7=90=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/nms/thread/NmsPortThread.java            | 6 +++---
 src/com/nms/thread/service/NmsReportService.java | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

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<Map<String,String>> portStatusInfo = service.getPortStatusInfo();//串联设备端口配置状态
 				Map<String,String> portStatusInfoMap = new HashMap<String,String>();
 				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()));
 				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);//配置状态
 					if(setStatus != null && !setStatus.equals(adminStatus)){
 						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("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;