diff --git a/src/main/java/com/nis/domain/restful/dashboard/TrafficAppStatistic.java b/src/main/java/com/nis/domain/restful/dashboard/TrafficAppStatistic.java index 6a03315..227cef0 100644 --- a/src/main/java/com/nis/domain/restful/dashboard/TrafficAppStatistic.java +++ b/src/main/java/com/nis/domain/restful/dashboard/TrafficAppStatistic.java @@ -9,13 +9,13 @@ public class TrafficAppStatistic { private Integer entranceId; - private Integer c2sPktNum; + private Long c2sPktNum; - private Integer s2cPktNum; + private Long s2cPktNum; - private Integer c2sByteLen; + private Long c2sByteLen; - private Integer s2cByteLen; + private Long s2cByteLen; private Date statTime; @@ -43,39 +43,39 @@ public class TrafficAppStatistic { this.entranceId = entranceId; } - public Integer getC2sPktNum() { - return c2sPktNum; - } + public Long getC2sPktNum() { + return c2sPktNum; + } - public void setC2sPktNum(Integer c2sPktNum) { - this.c2sPktNum = c2sPktNum; - } + public void setC2sPktNum(Long c2sPktNum) { + this.c2sPktNum = c2sPktNum; + } - public Integer getS2cPktNum() { - return s2cPktNum; - } + public Long getS2cPktNum() { + return s2cPktNum; + } - public void setS2cPktNum(Integer s2cPktNum) { - this.s2cPktNum = s2cPktNum; - } + public void setS2cPktNum(Long s2cPktNum) { + this.s2cPktNum = s2cPktNum; + } - public Integer getC2sByteLen() { - return c2sByteLen; - } + public Long getC2sByteLen() { + return c2sByteLen; + } - public void setC2sByteLen(Integer c2sByteLen) { - this.c2sByteLen = c2sByteLen; - } + public void setC2sByteLen(Long c2sByteLen) { + this.c2sByteLen = c2sByteLen; + } - public Integer getS2cByteLen() { - return s2cByteLen; - } + public Long getS2cByteLen() { + return s2cByteLen; + } - public void setS2cByteLen(Integer s2cByteLen) { - this.s2cByteLen = s2cByteLen; - } + public void setS2cByteLen(Long s2cByteLen) { + this.s2cByteLen = s2cByteLen; + } - public Date getStatTime() { + public Date getStatTime() { return statTime; } diff --git a/src/main/java/com/nis/domain/restful/dashboard/TrafficHttpStatistic.java b/src/main/java/com/nis/domain/restful/dashboard/TrafficHttpStatistic.java index 9fadebf..40aa5e8 100644 --- a/src/main/java/com/nis/domain/restful/dashboard/TrafficHttpStatistic.java +++ b/src/main/java/com/nis/domain/restful/dashboard/TrafficHttpStatistic.java @@ -9,20 +9,20 @@ public class TrafficHttpStatistic { private Integer webId; - private Integer c2sPktNum; + private Long c2sPktNum; - private Integer s2cPktNum; + private Long s2cPktNum; - private Integer c2sByteLen; + private Long c2sByteLen; - private Integer s2cByteLen; + private Long s2cByteLen; private Date statTime; // 自定义字段 - private Integer count; - private Integer pktNum; - private Integer byteLen; + private Long count; + private Long pktNum; + private Long byteLen; private Integer websiteServiceId;//网站id @@ -34,29 +34,6 @@ public class TrafficHttpStatistic { this.websiteServiceId = websiteServiceId; } - public Integer getCount() { - return count; - } - - public void setCount(Integer count) { - this.count = count; - } - - public Integer getPktNum() { - return pktNum; - } - - public void setPktNum(Integer pktNum) { - this.pktNum = pktNum; - } - - public Integer getByteLen() { - return byteLen; - } - - public void setByteLen(Integer byteLen) { - this.byteLen = byteLen; - } public Integer getStatId() { return statId; @@ -82,39 +59,67 @@ public class TrafficHttpStatistic { this.webId = webId; } - public Integer getC2sPktNum() { - return c2sPktNum; - } + public Long getC2sPktNum() { + return c2sPktNum; + } - public void setC2sPktNum(Integer c2sPktNum) { - this.c2sPktNum = c2sPktNum; - } + public void setC2sPktNum(Long c2sPktNum) { + this.c2sPktNum = c2sPktNum; + } - public Integer getS2cPktNum() { - return s2cPktNum; - } + public Long getS2cPktNum() { + return s2cPktNum; + } - public void setS2cPktNum(Integer s2cPktNum) { - this.s2cPktNum = s2cPktNum; - } + public void setS2cPktNum(Long s2cPktNum) { + this.s2cPktNum = s2cPktNum; + } - public Integer getC2sByteLen() { - return c2sByteLen; - } + public Long getC2sByteLen() { + return c2sByteLen; + } - public void setC2sByteLen(Integer c2sByteLen) { - this.c2sByteLen = c2sByteLen; - } + public void setC2sByteLen(Long c2sByteLen) { + this.c2sByteLen = c2sByteLen; + } - public Integer getS2cByteLen() { - return s2cByteLen; - } + public Long getS2cByteLen() { + return s2cByteLen; + } - public void setS2cByteLen(Integer s2cByteLen) { - this.s2cByteLen = s2cByteLen; - } + public void setS2cByteLen(Long s2cByteLen) { + this.s2cByteLen = s2cByteLen; + } - public Date getStatTime() { + public Long getCount() { + return count; + } + + public void setCount(Long count) { + this.count = count; + } + + public Long getPktNum() { + return pktNum; + } + + public void setPktNum(Long pktNum) { + this.pktNum = pktNum; + } + + public Long getByteLen() { + return byteLen; + } + + public void setByteLen(Long byteLen) { + this.byteLen = byteLen; + } + + public Integer getWebsiteServiceId() { + return websiteServiceId; + } + + public Date getStatTime() { return statTime; } diff --git a/src/main/java/com/nis/domain/restful/dashboard/TrafficIpActiveStatistic.java b/src/main/java/com/nis/domain/restful/dashboard/TrafficIpActiveStatistic.java index 2f715a3..514abd8 100644 --- a/src/main/java/com/nis/domain/restful/dashboard/TrafficIpActiveStatistic.java +++ b/src/main/java/com/nis/domain/restful/dashboard/TrafficIpActiveStatistic.java @@ -16,15 +16,15 @@ public class TrafficIpActiveStatistic extends BaseEntity - - - - + + + + @@ -18,7 +18,7 @@ \ No newline at end of file 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 1bd6828..f9f5e6e 100644 --- a/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml +++ b/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml @@ -5,10 +5,10 @@ - - - - + + + + @@ -20,7 +20,7 @@ FROM galaxy.TRAFFIC_HTTP_STATISTIC t LEFT JOIN galaxy.ui_website_domain_topic u ON t.web_id = u.id and t.web_id!=0 - and t.stat_time >= DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic),INTERVAL 5 MINUTE) + and t.stat_time >= DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic WHERE web_id != 0),INTERVAL 5 MINUTE) GROUP BY u.website_service_id ORDER BY count limit 0,10 @@ -37,7 +37,7 @@ SELECT SUM(link_num) count FROM galaxy.traffic_http_statistic t LEFT JOIN galaxy.ui_website_domain_topic u ON t.web_id = u.id WHERE u.website_service_id=#{websiteServiceId} - and stat_time between DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic),INTERVAL 10 MINUTE) and DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic),INTERVAL 5 MINUTE) + and stat_time between DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic WHERE web_id != 0),INTERVAL 10 MINUTE) and DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic),INTERVAL 5 MINUTE) @@ -52,7 +52,7 @@ FROM galaxy.traffic_http_statistic t LEFT JOIN galaxy.ui_website_domain_topic u ON t.web_id=u.id where u.website_service_id=#{websiteServiceId} - and t.stat_time >= DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic),INTERVAL 5 MINUTE) + and t.stat_time >= DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic WHERE web_id != 0),INTERVAL 5 MINUTE) GROUP BY t.web_id ORDER BY count limit 0,10 @@ -61,7 +61,7 @@ FROM galaxy.traffic_http_statistic t LEFT JOIN galaxy.ui_website_domain_topic u ON t.web_id=u.id where u.topic_id=#{topicId} - and t.stat_time >= DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic),INTERVAL 5 MINUTE) + and t.stat_time >= DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic WHERE web_id != 0),INTERVAL 5 MINUTE) GROUP BY t.web_id ORDER BY count limit 0,10 @@ -77,6 +77,6 @@ #{singleType} - and stat_time >= DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic),INTERVAL 5 MINUTE) + and stat_time >= DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_http_statistic WHERE web_id != 0),INTERVAL 5 MINUTE) \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficIpActiveStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficIpActiveStatisticDao.xml index 57a4db1..be6183a 100644 --- a/src/main/java/com/nis/web/dao/dashboard/TrafficIpActiveStatisticDao.xml +++ b/src/main/java/com/nis/web/dao/dashboard/TrafficIpActiveStatisticDao.xml @@ -5,11 +5,11 @@ - - - - - + + + + + diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficPortActiveStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficPortActiveStatisticDao.xml index ef418ad..473b213 100644 --- a/src/main/java/com/nis/web/dao/dashboard/TrafficPortActiveStatisticDao.xml +++ b/src/main/java/com/nis/web/dao/dashboard/TrafficPortActiveStatisticDao.xml @@ -4,13 +4,12 @@ - + 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 d30a2ec..6c2dd89 100644 --- a/src/main/java/com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml +++ b/src/main/java/com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml @@ -5,10 +5,10 @@ - - - - + + + + @@ -17,6 +17,6 @@ \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.xml index 2d6ffb2..ea93aca 100644 --- a/src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.xml +++ b/src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.xml @@ -6,10 +6,10 @@ - - - - + + + + @@ -19,19 +19,19 @@ @@ -44,7 +44,7 @@ #{singleType} - and stat_time >= DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_ua_statistic),INTERVAL 5 MINUTE) + and stat_time >= DATE_SUB((SELECT MAX(stat_time) FROM galaxy.traffic_ua_statistic WHERE bs_type != 0),INTERVAL 5 MINUTE)