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

修改流量统计ua跟http网站other范围

Browse Source
This commit is contained in:
zhanghongqing
2018-11-16 16:28:14 +08:00
parent 0412708c99
commit c92b3691a0
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.xml
View File

@@ -43,7 +43,7 @@
SELECT SUM(link_num) count FROM traffic_ua_statistic SELECT SUM(link_num) count FROM traffic_ua_statistic
WHERE bs_type !=0 and os_type=#{osType} WHERE bs_type !=0 and os_type=#{osType}
<if test="bsType!=null and bsType.size()>0"> <if test="bsType!=null and bsType.size()>0">
and os_type not in and bs_type not in
<foreach collection="bsType" item="singleType" index="index" open="(" close=")" separator=","> <foreach collection="bsType" item="singleType" index="index" open="(" close=")" separator=",">
#{singleType} #{singleType}
</foreach> </foreach>
@@ -74,7 +74,7 @@
SELECT SUM(link_num) count FROM traffic_ua_statistic SELECT SUM(link_num) count FROM traffic_ua_statistic
WHERE os_type !=0 and bs_type=#{bsType} WHERE os_type !=0 and bs_type=#{bsType}
<if test="osType!=null and osType.size()>0"> <if test="osType!=null and osType.size()>0">
and bs_type not in and os_type not in
<foreach collection="osType" item="singleType" index="index" open="(" close=")" separator=","> <foreach collection="osType" item="singleType" index="index" open="(" close=")" separator=",">
#{singleType} #{singleType}
</foreach> </foreach>

36
src/main/java/com/nis/web/service/restful/DashboardService.java
View File

@@ -271,11 +271,13 @@ public class DashboardService extends BaseService{
for (Map map : list) { for (Map map : list) {
bsType.add(map.get("bsType")); bsType.add(map.get("bsType"));
} }
Map others = new HashMap(); if(list.size()>10) {
others = trafficUaStatisticDao.systemOthers(bsType,osType,statTime); Map others = new HashMap();
if(others!=null&&others.size()>0){ others = trafficUaStatisticDao.systemOthers(bsType,osType,statTime);
others.put("bsType", "-1"); if(others!=null&&others.size()>0){
list.add(others); others.put("bsType", "-1");
list.add(others);
}
} }
} }
} }
@@ -320,11 +322,13 @@ public class DashboardService extends BaseService{
for (Map map : list) { for (Map map : list) {
osType.add(map.get("osType")); osType.add(map.get("osType"));
} }
Map others = new HashMap(); if(list.size()>10) {
others = trafficUaStatisticDao.browserOthers(osType,bsType,statTime); Map others = new HashMap();
if(others!=null&&others.size()>0){ others = trafficUaStatisticDao.browserOthers(osType,bsType,statTime);
others.put("osType", "-1"); if(others!=null&&others.size()>0){
list.add(others); others.put("osType", "-1");
list.add(others);
}
} }
} }
} }
@@ -372,11 +376,13 @@ public class DashboardService extends BaseService{
for (Map map : list) { for (Map map : list) {
webIdList.add(map.get("webId")); webIdList.add(map.get("webId"));
} }
Map others = new HashMap(); if(list.size()>10) {
others = trafficHttpStatisticDao.websiteDomainOthers(webIdList,websiteServiceId,statTime); Map others = new HashMap();
if(others!=null&&others.size()>0){ others = trafficHttpStatisticDao.websiteDomainOthers(webIdList,websiteServiceId,statTime);
others.put("webId", "-1"); if(others!=null&&others.size()>0){
list.add(others); others.put("webId", "-1");
list.add(others);
}
} }
} }
} }