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

fix:app策略表，引用界面。大屏app映射使用；开启协议与隧道限速业务注释

Browse Source
This commit is contained in:
doufenghu
2019-01-21 10:17:31 +06:00
parent 6848876a97
commit f0478109c1
4 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,8 @@
<!-- 根据最近时间条获取带宽，进出口流量 -->
<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
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
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

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

@@ -714,8 +714,8 @@ public class LogDataService {
* 将fileds中的字段根据DfLogSearchDao.xml中对应的resultMap转换为数据库中的字段
*
* @param mapName
* @param fileds与界面商定好的是传日志类中的对象名
* (界面没有表结构不知道对象属性对应的数据库字段名称是什么),不是数据库中的字段名
* @param fileds 与界面商定好的是传日志类中的对象名
* (界面没有表结构不知道对象属性对应的数据库字段名称是什么),不是数据库中的字段名
* @return
* @throws Exception
*/