From baf0a08058b0394b4e9ea4d2d54a812d743d715c Mon Sep 17 00:00:00 2001
From: renkaige <renkaige@iie.ac.cn>
Date: Tue, 18 Dec 2018 06:46:27 +0600
Subject: [PATCH] =?UTF-8?q?1:=E4=B8=BA=E9=80=9A=E8=81=94=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0asn=E7=9A=84=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=202:=E4=BF=AE=E6=94=B9traffic=E7=9A=84=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/restful/NtcAsnRecord.java  | 12 ++++++++
 .../java/com/nis/web/dao/NtcReportDao.xml     | 26 +++++++++-------
 .../dao/dashboard/TrafficHttpStatisticDao.xml |  6 ++--
 .../com/nis/web/service/LogDataService.java   | 30 ++++++++++++-------
 4 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/nis/domain/restful/NtcAsnRecord.java b/src/main/java/com/nis/domain/restful/NtcAsnRecord.java
index 3cb29d3..7f8b1ed 100644
--- a/src/main/java/com/nis/domain/restful/NtcAsnRecord.java
+++ b/src/main/java/com/nis/domain/restful/NtcAsnRecord.java
@@ -21,6 +21,9 @@ public class NtcAsnRecord implements Serializable {
 	private String bps;
 	private String pps;
 	private String asn;
+	
+	
+	private String searchAsn;
 	private String searchFoundStartTime;// 开始发现时间
 	private String searchFoundEndTime;// 结束发现时间
 
@@ -50,6 +53,15 @@ public class NtcAsnRecord implements Serializable {
 		this.asn = asn;
 	}
 
+	@JsonIgnore
+	public String getSearchAsn() {
+		return searchAsn;
+	}
+
+	public void setSearchAsn(String searchAsn) {
+		this.searchAsn = searchAsn;
+	}
+
 	@JsonIgnore
 	public String getSearchAsnType() {
 		return searchAsnType;
diff --git a/src/main/java/com/nis/web/dao/NtcReportDao.xml b/src/main/java/com/nis/web/dao/NtcReportDao.xml
index f5fe55a..4839b66 100644
--- a/src/main/java/com/nis/web/dao/NtcReportDao.xml
+++ b/src/main/java/com/nis/web/dao/NtcReportDao.xml
@@ -75,7 +75,8 @@
 		type="com.nis.domain.restful.NtcURLIpReport">
 		<result column="url" jdbcType="VARCHAR" property="url" />
 		<result column="ipCount" jdbcType="BIGINT" property="ipCount" />
-		<result column="connCount" jdbcType="BIGINT" property="connCount" />
+		<result column="connCount" jdbcType="BIGINT"
+			property="connCount" />
 	</resultMap>
 
 	<resultMap id="NtcRadiusReportMap"
@@ -97,7 +98,8 @@
 			property="ipEndNum" />
 		<result column="ip_sub" jdbcType="VARCHAR" property="ipSub" />
 		<result column="country" jdbcType="VARCHAR" property="country" />
-		<result column="area_type" jdbcType="VARCHAR" property="areaType" />
+		<result column="area_type" jdbcType="VARCHAR"
+			property="areaType" />
 		<result column="desc_detail" jdbcType="VARCHAR" property="desc" />
 	</resultMap>
 
@@ -755,12 +757,12 @@
 				${page.fields}
 			</when>
 			<otherwise>
-				url, ipCount,connCount 
+				url, ipCount,connCount
 			</otherwise>
 		</choose>
 		FROM (SELECT url,
-	count(distinct ip_addr) ipCount,
-	sum(sum) connCount 
+		count(distinct ip_addr) ipCount,
+		sum(sum) connCount
 		FROM ntc_reject_url_statistic
 
 		<where>
@@ -776,8 +778,8 @@
 				AND url like concat(concat('%',#{searchUrl}),'%')
 			</if>
 		</where>
-		GROUP BY url 
-		) ntc_reject_url_statistic 	 ORDER BY ipcount desc,connCount desc
+		GROUP BY url
+		) ntc_reject_url_statistic ORDER BY ipcount desc,connCount desc
 	</select>
 
 
@@ -850,7 +852,8 @@
 	<select id="findNtcIpRangeReport"
 		parameterType="com.nis.domain.restful.NtcIpRangeReport"
 		resultMap="NtcIpRangeReportMap">
-		SELECT ip_start,ip_end,ip_start_num,ip_end_num,ip_sub,country,area_type,desc_detail
+		SELECT
+		ip_start,ip_end,ip_start_num,ip_end_num,ip_sub,country,area_type,desc_detail
 		FROM
 		traffic_ip_identify
 		<where>
@@ -861,9 +864,9 @@
 				<![CDATA[AND country= #{searchCountry} ]]>
 			</if>
 			<if test="searchIp != null and searchIp !=''">
-				<![CDATA[AND ip_start_num>= #{searchIp} and ip_end_num<=#{searchIp}]]>
+				<![CDATA[AND  ip_end_num>=#{searchIp} and  ip_start_num<= #{searchIp} ]]>
 			</if>
-		<if test="searchDesc != null and searchDesc !=''">
+			<if test="searchDesc != null and searchDesc !=''">
 				<![CDATA[AND desc_detail= #{searchDesc} ]]>
 			</if>
 		</where>
@@ -877,7 +880,8 @@
 		VALUES
 		<foreach collection="list" item="ipRange" separator=",">
 			(#{ipRange.ipStart}, #{ipRange.ipEnd},
-			#{ipRange.ipStartNum}, #{ipRange.ipEndNum},
+			#{ipRange.ipStartNum},
+			#{ipRange.ipEndNum},
 			#{ipRange.ipSub}, #{ipRange.areaType},
 			#{ipRange.country})
 		</foreach>
diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml
index 678fede..b78c764 100644
--- a/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml
@@ -123,7 +123,7 @@ FROM
 	</select>
 	<!--获取域名 -->
 	<select id="getTrafficHttpDomain" resultType="java.util.HashMap">
-		select 	web_id webId, unique_num uniqueNum,entrance_id entranceId,SUM(c2s_byte_len + s2c_byte_len) byteCount,
+		select 	web_id webId, max(unique_num) uniqueNum,entrance_id entranceId,SUM(c2s_byte_len + s2c_byte_len) byteCount,
 		sum(c2s_pkt_num + s2c_pkt_num) pktCount from traffic_http_focus_statistic t where
 		<![CDATA[ stat_time>= #{beginDate} and stat_time< #{endDate}]]>
 		<if test="domain!=null">
@@ -135,12 +135,14 @@ FROM
 		group by web_id order by unique_num
 	</select>
 	<select id="getDomainTrans" resultType="com.nis.domain.restful.dashboard.TrafficHttpFocusStatistic">
-		select 	stat_time time, unique_num count from traffic_http_focus_statistic t where
+		select 	stat_time time, max(unique_num)count from traffic_http_focus_statistic t where
 		<![CDATA[ stat_time>= #{beginDate} and stat_time< #{endDate}]]>
 			and web_id=#{domain}
 		<if test="entranceId!=null">
 			and entrance_id=#{entranceId}
 		</if>
+		
+		group by stat_time
 		 order by stat_time
 	</select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/service/LogDataService.java b/src/main/java/com/nis/web/service/LogDataService.java
index 635b9d7..dd68b81 100644
--- a/src/main/java/com/nis/web/service/LogDataService.java
+++ b/src/main/java/com/nis/web/service/LogDataService.java
@@ -89,9 +89,8 @@ public class LogDataService {
 			throw new RestServiceException("searchFoundStartTime() can not exceed searchFoundEndTime",
 					RestBusinessCode.param_formate_error.getValue());
 		}
-		
-		
-		
+
+		String searchAsn = ntcAsnRecord.getSearchAsn();
 		String asn = "s_asn  ";
 		if (ntcAsnRecord.getSearchAsnType().trim().equals("1")) {
 			asn = "d_asn  ";
@@ -110,16 +109,27 @@ public class LogDataService {
 		sql.append(startTime);
 		sql.append(" and found_time< ");
 		sql.append(endTime);
+
+		if (searchAsn != null && !searchAsn.equals("")) {
+			sql.append(" and " + asn + "='" + searchAsn + "'");
+		}
+
 		StringBuffer countSql = new StringBuffer();
 		countSql.append("select count(1) from (");
 		countSql.append(sql);
-		countSql.append(" ) group by ");
-		countSql.append(asn+")");
-		Integer startNum = (page.getPageNo() - 1) * page.getPageSize();
-		Integer limitCount = startNum + page.getPageSize();
-
-		sql.append(" limit " + limitCount + " ) group by "+asn+" 	order by bps  desc,pps desc  limit " + startNum + "," + page.getPageSize());
-
+		countSql.append(" ) ");
+		if (searchAsn != null && !searchAsn.equals("")) {
+			countSql.append(" and " + asn + "='" + searchAsn + "'");
+		}
+		countSql.append("group by ");
+		countSql.append(asn + ")");
+		Integer startNum = 0;
+		Integer limitCount = startNum + 20;
+		sql.append(" limit " + limitCount + " ) ");
+		if (searchAsn != null && !searchAsn.equals("")) {
+			sql.append(" and " + asn + "='" + searchAsn + "'");
+		}
+		sql.append("group by " + asn + " 	order by bps  desc,pps desc  limit " + startNum + "," + 20);
 		localLogJDBCByDruid.getCount(page, countSql.toString());
 
 		page.setList(localLogJDBCByDruid.getNtcAsnRecordData(sql.toString()));