From ed6ef2de1377f2b4936e62b8fed08308cc9c0357 Mon Sep 17 00:00:00 2001
From: doufenghu <doufenghu@iie.ac.cn>
Date: Thu, 21 Feb 2019 17:45:27 +0600
Subject: [PATCH] =?UTF-8?q?fix(=E6=97=A5=E5=BF=97&=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=B5=81=E9=87=8F=EF=BC=89=EF=BC=9A=201.=20=E9=A6=96=E9=A1=B5I?=
 =?UTF-8?q?N/OUT=20=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=202.http=E4=B8=8Eproxy=20=E6=94=AF=E6=8C=81=E6=8C=89url?=
 =?UTF-8?q?=E4=B8=8Ewebsite=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml    | 6 +++---
 src/main/java/com/nis/web/service/LogDataService.java       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml b/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml
index c02ef94..18da3ce 100644
--- a/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml
@@ -30,15 +30,15 @@
   <select id="getMaxStatTime" resultType="java.util.HashMap">
   	SELECT stat_time statTime FROM traffic_trans_statistic order by stat_time desc limit 1
   </select>
-  <!-- 根据最近时间条获取带宽，进出口流量 -->
+  <!-- 根据最近30分钟内，次新批数据(最新存在正在写入情况，导致首页显示不正常),IN/OUT带宽流量 -->
 	<select id="getNetFlowPortInfoNew" resultType="java.util.HashMap">
 		SELECT  COALESCE(SUM(total_traffic.inoctets),0) AS inoctets ,  COALESCE(SUM(total_traffic.outoctets),0) AS outoctets FROM (
 			SELECT sum(case direction when 1 then c2s_byte_len+s2c_byte_len else 0 end)  inoctets ,
 			sum(case direction when 0 then c2s_byte_len+s2c_byte_len else 0 end) outoctets FROM traffic_trans_statistic
-			where stat_time =  (SELECT stat_time FROM traffic_trans_statistic WHERE entrance_id=1 and stat_time > DATE_SUB(now(), INTERVAL 15 MINUTE)  ORDER BY stat_time DESC LIMIT 0,1) and entrance_id=1
+			where stat_time =  (SELECT distinct(stat_time) FROM traffic_trans_statistic WHERE entrance_id=1 and stat_time > DATE_SUB(now(), INTERVAL 30 MINUTE)  ORDER BY stat_time DESC LIMIT 1,1) and entrance_id=1
 			UNION ALL
 			SELECT  sum(case direction when 1 then c2s_byte_len+s2c_byte_len else 0 end)  inoctets ,sum(case direction when 0 then c2s_byte_len+s2c_byte_len else 0 end) outoctets FROM traffic_trans_statistic
-			where stat_time =  (SELECT stat_time FROM traffic_trans_statistic WHERE entrance_id=2 and stat_time > DATE_SUB(now(), INTERVAL 15 MINUTE) ORDER BY stat_time DESC LIMIT 0,1) and entrance_id=2
+			where stat_time =  (SELECT distinct(stat_time) FROM traffic_trans_statistic WHERE entrance_id=2 and stat_time > DATE_SUB(now(), INTERVAL 30 MINUTE) ORDER BY stat_time DESC LIMIT 1,1) and entrance_id=2
 		) total_traffic
 
    </select>
diff --git a/src/main/java/com/nis/web/service/LogDataService.java b/src/main/java/com/nis/web/service/LogDataService.java
index fdb8439..2db7dbd 100644
--- a/src/main/java/com/nis/web/service/LogDataService.java
+++ b/src/main/java/com/nis/web/service/LogDataService.java
@@ -353,7 +353,7 @@ public class LogDataService {
 												|| field.equals("website")) {
 											whereSB.append(" and "
 													+ field
-													+ " like '"
+													+ " like '%"
 													+ StringEscapeUtils
 															.unescapeHtml4(value
 																	.toString()
@@ -603,7 +603,7 @@ public class LogDataService {
 											|| field.equals("website")) {
 										whereSB.append(" and "
 												+ field
-												+ " like '"
+												+ " like '%"
 												+ StringEscapeUtils
 														.unescapeHtml4(value
 																.toString()
@@ -986,7 +986,7 @@ public class LogDataService {
 												|| field.equals("website")) {
 											whereSB.append(" and "
 													+ field
-													+ " like '"
+													+ " like '%"
 													+ StringEscapeUtils
 															.unescapeHtml4(value
 																	.toString()