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

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

@@ -43,7 +43,7 @@
   	SELECT SUM(link_num) count  FROM traffic_ua_statistic
 	WHERE bs_type !=0 and os_type=#{osType}
 		<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=",">
 				 #{singleType}
 		</foreach>
@@ -74,7 +74,7 @@
   	SELECT SUM(link_num) count  FROM traffic_ua_statistic
 	WHERE os_type !=0 and bs_type=#{bsType}
 		<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=",">
 				 #{singleType}
 		</foreach>

src/main/java/com/nis/web/service/restful/DashboardService.java

@@ -271,6 +271,7 @@ public class DashboardService extends BaseService{
 					for (Map map : list) {
 						bsType.add(map.get("bsType"));
 					}
+					if(list.size()>10) {
 						Map others = new HashMap();
 						others = trafficUaStatisticDao.systemOthers(bsType,osType,statTime);
 						if(others!=null&&others.size()>0){
@@ -279,6 +280,7 @@ public class DashboardService extends BaseService{
 						}
 					}
 				}
+		}
 		return list;
 	}
 
@@ -320,6 +322,7 @@ public class DashboardService extends BaseService{
 				for (Map map : list) {
 					osType.add(map.get("osType"));
 				}
+				if(list.size()>10) {
 					Map others = new HashMap();
 					others = trafficUaStatisticDao.browserOthers(osType,bsType,statTime);
 					if(others!=null&&others.size()>0){
@@ -328,6 +331,7 @@ public class DashboardService extends BaseService{
 					}
 				}
 			}	
+		}
 		return list;
 	}
 	public List<Map> websiteList() {
@@ -372,6 +376,7 @@ public class DashboardService extends BaseService{
 				for (Map map : list) {
 					webIdList.add(map.get("webId"));
 				}
+				if(list.size()>10) {
 					Map others = new HashMap();
 					others = trafficHttpStatisticDao.websiteDomainOthers(webIdList,websiteServiceId,statTime);
 					if(others!=null&&others.size()>0){
@@ -380,6 +385,7 @@ public class DashboardService extends BaseService{
 					}
 				}
 			}	
+		}
 		return list;
 	}