gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(日志&首页流量）：

Browse Source 
1. 首页IN/OUT 显示异常修正
2.http与proxy 支持按url与website模糊查询
This commit is contained in:
doufenghu
2019-02-21 17:45:27 +06:00
parent e78cf4b0e3
commit ed6ef2de13
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml
View File

@@ -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>

6
src/main/java/com/nis/web/service/LogDataService.java
View File

@@ -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()