diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.java b/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.java index e7ba1f0..85386e1 100644 --- a/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.java +++ b/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.java @@ -15,7 +15,7 @@ public interface TrafficHttpStatisticDao { //获取域名分类之后属于的网站 List getDomainByWebsiteList(@Param("statTime")Date statTime); - Integer preWebsiteListCount(@Param("websiteServiceId") Integer websiteServiceId,@Param("statTime") Date statTime); + Long preWebsiteListCount(@Param("websiteServiceId") Integer websiteServiceId,@Param("statTime") Date statTime); List getDomainByWebsiteServiceId(@Param("websiteServiceId") Integer websiteServiceId,@Param("statTime") Date statTime); Map websiteDomainOthers(@Param("webIdList") List webIdList,@Param("websiteServiceId") Integer websiteServiceId,@Param("statTime") Date statTime); diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.java b/src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.java index de313c1..7e98c8a 100644 --- a/src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.java +++ b/src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.java @@ -25,7 +25,7 @@ public interface TrafficUaStatisticDao { Map browserOthers(@Param("osType") List osType,@Param("bsType") Integer bsType,@Param("statTime") Date statTime); - Integer preSystemListCount(@Param("osType") Integer osType,@Param("statTime") Date statTime); + Long preSystemListCount(@Param("osType") Integer osType,@Param("statTime") Date statTime); - Integer preBrowserListCount(@Param("bsType") Integer bsType,@Param("statTime") Date statTime); + Long preBrowserListCount(@Param("bsType") Integer bsType,@Param("statTime") Date statTime); } \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/restful/DashboardService.java b/src/main/java/com/nis/web/service/restful/DashboardService.java index e0071a1..408f078 100644 --- a/src/main/java/com/nis/web/service/restful/DashboardService.java +++ b/src/main/java/com/nis/web/service/restful/DashboardService.java @@ -223,7 +223,7 @@ public class DashboardService extends BaseService{ if(maxStatTime!=null) { Date statTime = maxStatTime.getStatTime(); List list = trafficUaStatisticDao.systemList(statTime); - Integer preCount=0; + Long preCount=0l; for (TrafficUaStatistic ua : list) { Map map = new HashMap(); map.put("osType",ua.getOsType()); @@ -272,7 +272,7 @@ public class DashboardService extends BaseService{ if(maxStatTime!=null) { Date statTime = maxStatTime.getStatTime(); List list = trafficUaStatisticDao.browserList(statTime); - Integer preCount=0; + Long preCount=0l; if(list!=null&&list.size()>0){ for (TrafficUaStatistic ua : list) { Map map = new HashMap(); @@ -321,7 +321,7 @@ public class DashboardService extends BaseService{ TrafficHttpStatistic maxStatTime = trafficHttpStatisticDao.getMaxStatTime(); if(maxStatTime!=null) { List list = trafficHttpStatisticDao.websiteList(maxStatTime.getStatTime()); - Integer preCount=0; + Long preCount=0l; if(list!=null&&list.size()>0){ for (TrafficHttpStatistic website : list) { Map map = new HashMap(); @@ -383,7 +383,7 @@ public class DashboardService extends BaseService{ Date statTime = maxStatTime.getStatTime(); List websiteList = trafficHttpStatisticDao.getDomainByWebsiteList(statTime); if(websiteList!=null&&websiteList.size()>0){ - Integer preCount=0; + Long preCount=0l; for (TrafficHttpStatistic website : websiteList) { Map map = new HashMap(); map.put("websiteServiceId",website.getWesiteServiceId());