From 980d7c1c7e36d09e2303120f8edd585357e6db13 Mon Sep 17 00:00:00 2001
From: doufenghu <doufenghu@iie.ac.cn>
Date: Mon, 28 Jan 2019 17:03:06 +0600
Subject: [PATCH] =?UTF-8?q?feature(=E9=80=9A=E8=81=94=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=B1=82=E5=8D=95=E5=90=91=E6=B5=81=EF=BC=89=EF=BC=9A=E9=80=9A?=
 =?UTF-8?q?=E8=81=94=E5=8D=95=E5=90=91=E6=B5=81=E6=94=AF=E6=8C=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6-=E8=BF=90=E8=90=A5=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/restful/NtcConnRecordPercent.java  | 17 ++++++----
 .../com/nis/web/service/LogDataService.java   | 34 ++++++++++++++-----
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/nis/domain/restful/NtcConnRecordPercent.java b/src/main/java/com/nis/domain/restful/NtcConnRecordPercent.java
index 0f445c9..2c7aa30 100644
--- a/src/main/java/com/nis/domain/restful/NtcConnRecordPercent.java
+++ b/src/main/java/com/nis/domain/restful/NtcConnRecordPercent.java
@@ -1,9 +1,9 @@
 package com.nis.domain.restful;
 
-import java.io.Serializable;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import java.io.Serializable;
+
 /**
  * 
  * @ClassName:NtcConnRecordLog
@@ -25,6 +25,7 @@ public class NtcConnRecordPercent implements Serializable {
 	private String searchFoundStartTime;// 开始发现时间
 	private String searchFoundEndTime;// 结束发现时间
 	private String searchEntranceId;
+	protected String searchIspCode;// 运营商
 
 	public String getBps() {
 		return bps;
@@ -83,8 +84,12 @@ public class NtcConnRecordPercent implements Serializable {
 	public void setSearchEntranceId(String searchEntranceId) {
 		this.searchEntranceId = searchEntranceId;
 	}
-	
-	
-	
-	
+	@JsonIgnore
+	public String getSearchIspCode() {
+		return searchIspCode;
+	}
+
+	public void setSearchIspCode(String searchIspCode) {
+		this.searchIspCode = searchIspCode;
+	}
 }
diff --git a/src/main/java/com/nis/web/service/LogDataService.java b/src/main/java/com/nis/web/service/LogDataService.java
index 8930d57..fdb8439 100644
--- a/src/main/java/com/nis/web/service/LogDataService.java
+++ b/src/main/java/com/nis/web/service/LogDataService.java
@@ -82,21 +82,39 @@ public class LogDataService {
 		sql.append(endTime);
 		StringBuffer totalSql = new StringBuffer();
 		totalSql.append(sql);
-		if (ntcConnRecordPercent.getSearchEntranceId() != null
-				&& !ntcConnRecordPercent.getSearchEntranceId().trim().equals("")) {
-			totalSql.append(" and stream_dir in(1,2,3)   and entrance_id ="
+
+
+		if (StringUtil.isNotBlank(ntcConnRecordPercent.getSearchEntranceId())) {
+
+			totalSql.append("  and entrance_id ="
 					+ ntcConnRecordPercent.getSearchEntranceId());
-			sql.append(" and stream_dir in(1,2)  and entrance_id ="
+
+			sql.append(" and entrance_id ="
 					+ ntcConnRecordPercent.getSearchEntranceId());
-		} else {
-			totalSql.append(" and stream_dir in(1,2,3) ");
-			sql.append(" and stream_dir in(1,2)  ");
 		}
+
+		if (StringUtil.isNotBlank(ntcConnRecordPercent.getSearchIspCode())) {
+			String ispNum = getIspNum(ntcConnRecordPercent.getSearchIspCode());
+
+			totalSql.append("  and concat(toString(entrance_id),toString(device_id)) in ("
+					+ ispNum + ") ");
+
+			sql.append("  and concat(toString(entrance_id),toString(device_id)) in ("
+					+ ispNum + ") ");
+
+		}
+
+		totalSql.append(" and stream_dir in(1,2,3) ");
+		sql.append(" and stream_dir in(1,2)  ");
+
 		localLogJDBCByDruid.getNtcConnRecordPercentData(ntcConnRecordPercent,
 				sql.toString(), false);
 		localLogJDBCByDruid.getNtcConnRecordPercentData(ntcConnRecordPercent,
 				totalSql.toString(), true);
 		return ntcConnRecordPercent;
+
+
+
 	}
 
 	public void getNtcAsnRecord(Page page, TrafficAsnStatistic ntcAsnRecord)
@@ -213,7 +231,7 @@ public class LogDataService {
 
 	/**
 	 * 判断日志查询条件中是否有运营商的查询条件,如果有则去数据库中查询运营商的组合信息
-	 * 
+	 *
 	 * @param obj
 	 * @return
 	 * @throws Exception