Merge branch 'Release-1.3' of http://192.168.10.125/galaxy/galaxy-service.git into Release-1.3

This commit is contained in:
renkaige
2018-10-30 11:13:57 +08:00
2 changed files with 5 additions and 5 deletions

View File

@@ -13,6 +13,6 @@ public interface NtcTotalReportDao {
NtcTotalReport getMaxReportTime();
Map getMaxRecvTime();
List<Map> getTotalReportList(@Param("reportTime") Date reportTime);
List<Map> getNetFlowPortInfoNew(@Param("reportTime") Date recvTime);
List<Map> getNetFlowPortInfoOld(@Param("reportTime") Date recvTime);
List<Map> getNetFlowPortInfoNew(@Param("recvTime") Date recvTime);
List<Map> getNetFlowPortInfoOld(@Param("recvTime") Date recvTime);
}

View File

@@ -22,7 +22,7 @@
</select>
<!-- 获取带宽最近时间并且有效 -->
<select id="getMaxRecvTime" resultType="java.util.HashMap">
SELECT MAX(RECV_TIME) reveTime FROM galaxy.TRAFFIC_NETFLOW_PORT_INFO
SELECT MAX(RECV_TIME) recvTime FROM galaxy.TRAFFIC_NETFLOW_PORT_INFO
</select>
<select id="getTotalReportList" resultType="java.util.HashMap">
SELECT SUM(reject_num) rejectNum,SUM(monitor_num) monitorNum,SUM(c2s_pkt_num) c2sPktNum,SUM(s2c_pkt_num) s2cPktNum,SUM(c2s_byte_len) c2sByteLen,SUM(s2c_byte_len) s2cByteLen,SUM(new_uni_conn_num) newUniConnNum,SUM(live_conn_num) liveConnNum,
@@ -30,12 +30,12 @@
where report_time = #{reportTime}
</select>
<select id="getNetFlowPortInfoNew" resultType="java.util.HashMap">
SELECT SUM(INOCTETS) inoctets ,SUM(OUTOCTETS) outoctets FROM galaxy.TRAFFIC_NETFLOW_PORT_INFO
SELECT IFNULL(SUM(INOCTETS),0) inoctets ,IFNULL(SUM(OUTOCTETS),0) outoctets FROM galaxy.TRAFFIC_NETFLOW_PORT_INFO
where RECV_TIME = #{recvTime}
</select>
<!-- 获取上个时间段的数据 -->
<select id="getNetFlowPortInfoOld" resultType="java.util.HashMap">
SELECT SUM(INOCTETS) inoctets ,SUM(OUTOCTETS) outoctets FROM galaxy.TRAFFIC_NETFLOW_PORT_INFO
SELECT IFNULL(SUM(INOCTETS),0) inoctets ,IFNULL(SUM(OUTOCTETS),0) outoctets FROM galaxy.TRAFFIC_NETFLOW_PORT_INFO
where RECV_TIME = DATE_SUB(#{recvTime},INTERVAL 5 MINUTE)
</select>
</mapper>