From 58580d7d4e5ac4ce730db4c6eac83b922cc7829f Mon Sep 17 00:00:00 2001
From: doufenghu <doufenghu@iie.ac.cn>
Date: Tue, 22 Jan 2019 19:21:09 +0600
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=AD=A3=E6=9F=A5=E8=AF=A2isp?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=97=A0=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E4=B8=94=E5=87=BA=E7=8E=B0=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/service/LogDataService.java   | 43 ++++++++++---------
 .../web/service/restful/DashboardService.java | 13 +++---
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/nis/web/service/LogDataService.java b/src/main/java/com/nis/web/service/LogDataService.java
index 2126b36..8930d57 100644
--- a/src/main/java/com/nis/web/service/LogDataService.java
+++ b/src/main/java/com/nis/web/service/LogDataService.java
@@ -1,22 +1,5 @@
 package com.nis.web.service;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.ibatis.mapping.ResultMap;
-import org.apache.ibatis.mapping.ResultMapping;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.nis.domain.Page;
 import com.nis.domain.restful.NtcConnRecordPercent;
 import com.nis.domain.restful.dashboard.TrafficAsnStatistic;
@@ -28,6 +11,22 @@ import com.nis.web.dao.IspInfoDao;
 import com.nis.web.dao.impl.LocalLogJDBCByDruid;
 import com.nis.web.dao.impl.LogJDBCByDruid;
 import com.zdjizhi.utils.StringUtil;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.ibatis.mapping.ResultMap;
+import org.apache.ibatis.mapping.ResultMapping;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 从clickhouse或者hive中查询数据并set到page.list返回给界面
@@ -840,7 +839,7 @@ public class LogDataService {
 	 * 利用反射查询一个对象中是否存在某个属性
 	 * 
 	 * @param obj
-	 * @param fieldName
+	 * @param filedName
 	 * @throws Exception
 	 */
 	private static boolean ifExistFiledName(Object obj, String filedName)
@@ -1130,7 +1129,9 @@ public class LogDataService {
 	 */
 	private String getIspNum(String ispCode) {
 		List<String> ispNum = ispInfoDao.getIspNum(ispCode);
-		if (ispNum != null && ispNum.size() > 0) {
+		String  result = "'NA'";
+
+		if (StringUtil.isNotEmpty(ispNum)) {
 			StringBuffer sb = new StringBuffer();
 			for (String ispNumStr : ispNum) {
 				sb.append("'");
@@ -1138,9 +1139,9 @@ public class LogDataService {
 				sb.append("'");
 				sb.append(",");
 			}
-			return sb.substring(0, sb.length() - 1);
+			result= sb.substring(0, sb.length() - 1);
 		}
-		return null;
+		return result;
 	}
 
 }
diff --git a/src/main/java/com/nis/web/service/restful/DashboardService.java b/src/main/java/com/nis/web/service/restful/DashboardService.java
index cb51619..e3c51d3 100644
--- a/src/main/java/com/nis/web/service/restful/DashboardService.java
+++ b/src/main/java/com/nis/web/service/restful/DashboardService.java
@@ -309,8 +309,7 @@ public class DashboardService extends BaseService {
 	/**
 	 * 日期格式字符串转换成时间戳
 	 * 
-	 * @param date   字符串日期
-	 * @param format 如：yyyy-MM-dd HH:mm:ss
+	 * @param date_str   字符串日期
 	 * @return
 	 */
 	@Deprecated
@@ -327,8 +326,7 @@ public class DashboardService extends BaseService {
 	/**
 	 * 时间戳 换成日期格式字符串转
 	 * 
-	 * @param 时间     1544602212000
-	 * @param format 如：yyyy-MM-dd HH:mm:ss
+	 * @param timeStamp     1544602212000
 	 * @return
 	 */
 	@Deprecated
@@ -1784,6 +1782,7 @@ public class DashboardService extends BaseService {
 	 * @return
 	 */
 	public String getIspNum(String ispCode) {
+		String  result = "'NA'";
 		List<String> ispNum = ispInfoDao.getIspNum(ispCode);
 		if (ispNum != null && ispNum.size() > 0) {
 			StringBuffer sb = new StringBuffer();
@@ -1793,9 +1792,11 @@ public class DashboardService extends BaseService {
 				sb.append("'");
 				sb.append(",");
 			}
-			return sb.substring(0, sb.length() - 1);
+			result= sb.substring(0, sb.length() - 1);
+
 		}
-		return null;
+		return result;
+
 	}
 
 	public List<SysDeviceInfo> getIspListByIspNum(String ispNum) {