diff --git a/src/main/java/com/nis/web/dao/NtcReportDao.xml b/src/main/java/com/nis/web/dao/NtcReportDao.xml index 4839b66..7b242a9 100644 --- a/src/main/java/com/nis/web/dao/NtcReportDao.xml +++ b/src/main/java/com/nis/web/dao/NtcReportDao.xml @@ -170,11 +170,11 @@ - STR_TO_DATE(#{searchReportStartTime},'%Y-%m-%d %H:%i:%s')]]> + = STR_TO_DATE(#{searchReportStartTime},'%Y-%m-%d %H:%i:%s')]]> - + diff --git a/src/main/java/com/nis/web/dao/TrafficReportDao.xml b/src/main/java/com/nis/web/dao/TrafficReportDao.xml index b213b69..23ed40e 100644 --- a/src/main/java/com/nis/web/dao/TrafficReportDao.xml +++ b/src/main/java/com/nis/web/dao/TrafficReportDao.xml @@ -170,11 +170,11 @@ - STR_TO_DATE(#{searchReportStartTime},'%Y-%m-%d %H:%i:%s')]]> + = STR_TO_DATE(#{searchReportStartTime},'%Y-%m-%d %H:%i:%s')]]> - + @@ -960,7 +960,7 @@ select addr_type,trans_type,entrance_id,IFNULL((SUM(c2s_byte_len+s2c_byte_len)*8)/300/1024/1024/1024,0) gbps,IFNULL(SUM(c2s_pkt_num+s2c_pkt_num)/300,0) pps,IFNULL(SUM(link_num),0) linkNum, stat_time time from traffic_trans_statistic - where =#{beginDate}]]> + where =#{beginDate}]]> and addr_type !=0 and trans_type!=0 group by stat_time,addr_type,trans_type order by stat_time @@ -988,7 +988,7 @@ diff --git a/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml b/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml index 448a6ee..1e26626 100644 --- a/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml +++ b/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml @@ -129,7 +129,7 @@ diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml index e6154ec..d0f8ada 100644 --- a/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml +++ b/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml @@ -32,7 +32,7 @@ SELECT app_type,SUM(link_num) AS link_num,SUM(c2s_pkt_num+s2c_pkt_num) AS packets, ((SUM(c2s_byte_len+s2c_byte_len)*8)/300/1024/1024/1024) AS GByte FROM traffic_app_statistic WHERE - = #{beginTime} and stat_time<= #{endTime}]]> + = #{beginTime} and stat_time< #{endTime}]]> and app_type in diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml index f86c48a..ae339a5 100644 --- a/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml +++ b/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml @@ -125,7 +125,7 @@ FROM SELECT ip_addr ipAddr,area_id areaId,SUM(c2s_byte_len+s2c_byte_len) count, link_num linkNum ,c2s_pkt_num c2sPktNum,s2c_pkt_num s2cPktNum,c2s_byte_len c2sByteLen,s2c_byte_len s2cByteLen,date_format(stat_time, '%Y-%m-%d %H:%i:%s') statTime FROM traffic_ip_active_statistic WHERE ip_addr=#{ipAddr} - and #{beginDate} and stat_time<=#{endDate}]]> GROUP BY statTime + and = #{beginDate} and stat_time<#{endDate}]]> GROUP BY statTime ORDER BY count DESC LIMIT 1 diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml index e0a79c5..45c8ccf 100644 --- a/src/main/java/com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml +++ b/src/main/java/com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml @@ -29,7 +29,7 @@ SELECT proto_type,SUM(link_num) AS link_num,SUM(c2s_pkt_num+s2c_pkt_num) AS packets, ((SUM(c2s_byte_len+s2c_byte_len)*8)/300/1024/1024/1024) AS GByte FROM traffic_protocol_statistic WHERE - = #{beginTime} and stat_time<= #{endTime}]]> + = #{beginTime} and stat_time< #{endTime}]]> and proto_type in 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 5dd72a6..7847733 100644 --- a/src/main/java/com/nis/web/service/restful/DashboardService.java +++ b/src/main/java/com/nis/web/service/restful/DashboardService.java @@ -102,6 +102,7 @@ public class DashboardService extends BaseService { * @param transType * @return */ + @Deprecated public List getBandwidthTrans(String addrType, Integer transType, String beginDate, String endDate) { ArrayList listMap = new ArrayList(); @@ -121,6 +122,7 @@ public class DashboardService extends BaseService { * @param transType * @return */ + @Deprecated public List getBandwidthTrans2(String addrType, Integer transType, String beginDate, String endDate) { ArrayList listMap = new ArrayList(); @@ -143,6 +145,7 @@ public class DashboardService extends BaseService { * @param entranceId * @return */ + @Deprecated public HashMap getBandwidthTransEntrance(String addrType, Integer transType, String beginDate, String endDate, Integer entranceId) { long start = System.currentTimeMillis(); @@ -220,6 +223,7 @@ public class DashboardService extends BaseService { * @param li * @return */ + @Deprecated public static List formatDateData(String begin, String end, List li) { List resList = new ArrayList(); Map m = new HashMap(); @@ -260,6 +264,7 @@ public class DashboardService extends BaseService { * @param format 如：yyyy-MM-dd HH:mm:ss * @return */ + @Deprecated public static Long dateToStamp(String date_str) { try { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -277,6 +282,7 @@ public class DashboardService extends BaseService { * @param format 如：yyyy-MM-dd HH:mm:ss * @return */ + @Deprecated public static String stampToDate(long timeStamp) { SimpleDateFormat sdf = new SimpleDateFormat("MM-dd HH:mm");// 这个是你要转成后的时间的格式 String sd = sdf.format(new Date(timeStamp)); // 时间戳转换成时间 @@ -622,23 +628,23 @@ public class DashboardService extends BaseService { * @return */ public List ipActiveOneHour(Date beginDate, Date endDate) { - TrafficIpActiveStatistic maxStatTime = trafficIpActiveStatisticDao.getMaxStatTime(); +// TrafficIpActiveStatistic maxStatTime = trafficIpActiveStatisticDao.getMaxStatTime(); ArrayList listMap = new ArrayList(); - if (maxStatTime != null && maxStatTime.getStatTime() != null) { - Date statTime = maxStatTime.getStatTime(); - ArrayList list = trafficIpActiveStatisticDao.ipActiveChart(beginDate, endDate); - if (list != null && list.size() > 0) { - for (LinkedHashMap map : list) { - if (map.get("ipAddr") != null) { - String ipAddr = (String) map.get("ipAddr"); - HashMap resMap = trafficIpActiveStatisticDao.ipActiveOneHour(ipAddr, beginDate,endDate); - if(resMap!=null){ - listMap.add(resMap); - } +// if (maxStatTime != null && maxStatTime.getStatTime() != null) { +// Date statTime = maxStatTime.getStatTime(); + ArrayList list = trafficIpActiveStatisticDao.ipActiveChart(beginDate, endDate); + if (list != null && list.size() > 0) { + for (LinkedHashMap map : list) { + if (map.get("ipAddr") != null) { + String ipAddr = (String) map.get("ipAddr"); + HashMap resMap = trafficIpActiveStatisticDao.ipActiveOneHour(ipAddr, beginDate,endDate); + if(resMap!=null){ + listMap.add(resMap); } } } } +// } return listMap; }