From 70d5ce99efaa3861194c7d3b49bf8d0d6a533a2e Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@zdjizhi.com>
Date: Mon, 21 Jan 2019 16:37:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1app?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=8D=E8=BF=94=E5=9B=9E=E8=BF=90=E8=90=A5?=
 =?UTF-8?q?=E5=95=86=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/restful/DashboardServiceController.java  | 6 +++---
 .../com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java b/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java
index 56ad55c..a51e4a3 100644
--- a/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java
+++ b/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java
@@ -1082,11 +1082,11 @@ public class DashboardServiceController extends BaseRestController {
 				ispNum = dashboardService.getIspNum(entity.getSearchIspCode());
 				entity.setIspNum(ispNum);
 			}
-			List<SysDeviceInfo> sysDeviceInfo =dashboardService.getIspListByIspNum(ispNum);
+//			List<SysDeviceInfo> sysDeviceInfo =dashboardService.getIspListByIspNum(ispNum);
 			CustomerContextHolder.setCustomerType(CustomerContextHolder.DATA_SOURCE_B);
 			list = dashboardService.appConnRecordTop100(entity);
 			// 设置运营商编码
-			if(list!=null&&list.size()>0&&sysDeviceInfo!=null&&sysDeviceInfo.size()>0){
+			/*if(list!=null&&list.size()>0&&sysDeviceInfo!=null&&sysDeviceInfo.size()>0){
 				for (AppConnRecordStatistic app : list) {
 					for (SysDeviceInfo device : sysDeviceInfo) {
 						if((app.getIspNum().trim()).equals(device.getIspNum().trim())){
@@ -1095,7 +1095,7 @@ public class DashboardServiceController extends BaseRestController {
 						}
 					}
 				}
-			}
+			}*/
 			CustomerContextHolder.clearCustomerType();
 			
 		} catch (Exception e) {
diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml
index 1f279ff..d7955c4 100644
--- a/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml
@@ -61,7 +61,7 @@
 	</select>
 	<!-- App 活跃IP Top100 -->
 	<select id="appConnRecordTop100" parameterType="com.nis.domain.restful.dashboard.AppConnRecordStatistic" resultType="com.nis.domain.restful.dashboard.AppConnRecordStatistic">
-		select s_ip ipAddr,concat(toString(entrance_id),toString(device_id)) ispNum, sum(c2s_byte_num + s2c_byte_num) byteNum, sum(c2s_pkt_num + s2c_pkt_num) pktNum, count(s_ip) logNum
+		select s_ip ipAddr, sum(c2s_byte_num + s2c_byte_num) byteNum, sum(c2s_pkt_num + s2c_pkt_num) pktNum, count(s_ip) logNum
 		from tbs_ods_ntc_conn_record_log t where
 		<![CDATA[ found_time>= toDateTime(#{searchStartTime}) and found_time< toDateTime(#{searchEndTime})
 			and app_id=toInt64(#{searchAppId}) ]]>
@@ -71,7 +71,7 @@
 		<if test="ispNum !=null and ispNum != ''">
 			<![CDATA[and concat(toString(entrance_id),toString(device_id)) in (${ispNum})]]>
 		</if>
-		group by s_ip,entrance_id,device_id
+		group by s_ip
 		order by
 		<choose>
 			<when test="searchQuota !=null and searchQuota != '' and searchQuota == 2 ">