去除entrance的统计

8 files changed, 162 insertions, 100 deletions

diff --git a/src/main/java/com/nis/web/dao/TrafficReportDao.xml b/src/main/java/com/nis/web/dao/TrafficReportDao.xml
index e6e1470..a555081 100644
--- a/src/main/java/com/nis/web/dao/TrafficReportDao.xml
+++ b/src/main/java/com/nis/web/dao/TrafficReportDao.xml
@@ -178,8 +178,8 @@
 		</if>

 		and addr_type in('4',

 		'6')

-		and entrance_id in (1,

-		2)

+<!-- 		and entrance_id in (1, -->

+<!-- 		2) -->

 		and trans_type in(6,

 		17)

 		group by

@@ -231,8 +231,8 @@
 		</if>

 		and addr_type in('4',

 		'6')

-		and entrance_id in (1,

-		2)

+<!-- 		and entrance_id in (1, -->

+<!-- 		2) -->

 		and trans_type in(6,

 		17)

 		group by

@@ -283,8 +283,8 @@
 		</if>

 		and addr_type in('4',

 		'6')

-		and entrance_id in (1,

-		2)

+<!-- 		and entrance_id in (1, -->

+<!-- 		2) -->

 		and trans_type in(6,

 		17)

 		group by

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 18da3ce..f29e28f 100644
--- a/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml
@@ -35,10 +35,10 @@
 		SELECT  COALESCE(SUM(total_traffic.inoctets),0) AS inoctets ,  COALESCE(SUM(total_traffic.outoctets),0) AS outoctets FROM (

 			SELECT sum(case direction when 1 then c2s_byte_len+s2c_byte_len else 0 end)  inoctets ,

 			sum(case direction when 0 then c2s_byte_len+s2c_byte_len else 0 end) outoctets FROM traffic_trans_statistic

-			where stat_time =  (SELECT distinct(stat_time) FROM traffic_trans_statistic WHERE entrance_id=1 and stat_time > DATE_SUB(now(), INTERVAL 30 MINUTE)  ORDER BY stat_time DESC LIMIT 1,1) and entrance_id=1

+			where stat_time =  (SELECT distinct(stat_time) FROM traffic_trans_statistic WHERE stat_time > DATE_SUB(now(), INTERVAL 30 MINUTE)  ORDER BY stat_time DESC LIMIT 1,1) 

 			UNION ALL

 			SELECT  sum(case direction when 1 then c2s_byte_len+s2c_byte_len else 0 end)  inoctets ,sum(case direction when 0 then c2s_byte_len+s2c_byte_len else 0 end) outoctets FROM traffic_trans_statistic

-			where stat_time =  (SELECT distinct(stat_time) FROM traffic_trans_statistic WHERE entrance_id=2 and stat_time > DATE_SUB(now(), INTERVAL 30 MINUTE) ORDER BY stat_time DESC LIMIT 1,1) and entrance_id=2

+			where stat_time =  (SELECT distinct(stat_time) FROM traffic_trans_statistic WHERE stat_time > DATE_SUB(now(), INTERVAL 30 MINUTE) ORDER BY stat_time DESC LIMIT 1,1) 

 		) total_traffic

 

    </select>

@@ -133,7 +133,7 @@
 <select id="getActionTrans" resultType="com.nis.domain.restful.NtcEntranceReport">

 	select sum(sum) sum,report_time reportTime from ntc_entrance_report r where

 	<![CDATA[${serviceSql} and report_time<#{endDate} and report_time>=#{beginDate}]]>

-	and entrance_id=#{entranceId}

+<!-- 	and entrance_id=#{entranceId} -->

 	group by report_time order by report_time

 </select>

 

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 e71ea8c..3ea5ca6 100644
--- a/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml
@@ -39,9 +39,9 @@
            	#{item}  

        	</foreach>

 	</if>

-	<if test="entranceId !=null and entranceId != ''">

-		and entrance_id=#{entranceId}

-	</if>

+<!-- 	<if test="entranceId !=null and entranceId != ''"> -->

+<!-- 		and entrance_id=#{entranceId} -->

+<!-- 	</if> -->

 	GROUP BY app_type ) p

 	LEFT JOIN ui_code_app_dic c ON p.app_type=c.view_code ORDER BY p.GByte DESC

   </select>

@@ -50,12 +50,12 @@
 		select stat_time time, sum(unique_sip_num) sipNum,sum(unique_dip_num) dipNum from traffic_app_focus_statistic t where

 		<![CDATA[ stat_time>= toDateTime(#{searchStartTime}) and stat_time< toDateTime(#{searchEndTime})

 			and app_id=toInt64(#{searchAppId}) ]]>

-		<if test="searchEntranceId !=null and searchEntranceId != ''">

-			<![CDATA[and entrance_id=toInt64(#{searchEntranceId}) ]]>

-		</if>

-		<if test="ispNum !=null and ispNum != ''">

-			<![CDATA[and concat(toString(entrance_id),toString(device_id)) in (${ispNum})]]>

-		</if>

+<!-- 		<if test="searchEntranceId !=null and searchEntranceId != ''"> -->

+<!-- 			<![CDATA[and entrance_id=toInt64(#{searchEntranceId}) ]]> -->

+<!-- 		</if> -->

+<!-- 		<if test="ispNum !=null and ispNum != ''"> -->

+<!-- 			<![CDATA[and concat(toString(entrance_id),toString(device_id)) in (${ispNum})]]> -->

+<!-- 		</if> -->

 		group by stat_time

 		 order by stat_time

 	</select>

@@ -63,12 +63,12 @@
 		select stat_time time, sum(c2s_byte_len) c2sNum,sum(s2c_byte_len) s2cNum,sum(s2c_byte_len+c2s_byte_len) totalNum from traffic_app_focus_statistic t where

 		<![CDATA[ stat_time>= toDateTime(#{searchStartTime}) and stat_time< toDateTime(#{searchEndTime})

 			and app_id=toInt64(#{searchAppId}) ]]>

-		<if test="searchEntranceId !=null and searchEntranceId != ''">

-			<![CDATA[and entrance_id=toInt64(#{searchEntranceId}) ]]>

-		</if>

-		<if test="ispNum !=null and ispNum != ''">

-			<![CDATA[and concat(toString(entrance_id),toString(device_id)) in (${ispNum})]]>

-		</if>

+<!-- 		<if test="searchEntranceId !=null and searchEntranceId != ''"> -->

+<!-- 			<![CDATA[and entrance_id=toInt64(#{searchEntranceId}) ]]> -->

+<!-- 		</if> -->

+<!-- 		<if test="ispNum !=null and ispNum != ''"> -->

+<!-- 			<![CDATA[and concat(toString(entrance_id),toString(device_id)) in (${ispNum})]]> -->

+<!-- 		</if> -->

 		group by stat_time

 		 order by stat_time

 	</select>

@@ -76,12 +76,12 @@
 		select stat_time time, sum(c2s_pkt_num) c2sNum,sum(s2c_pkt_num) s2cNum,sum(s2c_pkt_num+c2s_pkt_num) totalNum from traffic_app_focus_statistic t where

 		<![CDATA[ stat_time>= toDateTime(#{searchStartTime}) and stat_time< toDateTime(#{searchEndTime})

 			and app_id=toInt64(#{searchAppId}) ]]>

-		<if test="searchEntranceId !=null and searchEntranceId != ''">

-			<![CDATA[and entrance_id=toInt64(#{searchEntranceId}) ]]>

-		</if>

-		<if test="ispNum !=null and ispNum != ''">

-			<![CDATA[and concat(toString(entrance_id),toString(device_id)) in (${ispNum})]]>

-		</if>

+<!-- 		<if test="searchEntranceId !=null and searchEntranceId != ''"> -->

+<!-- 			<![CDATA[and entrance_id=toInt64(#{searchEntranceId}) ]]> -->

+<!-- 		</if> -->

+<!-- 		<if test="ispNum !=null and ispNum != ''"> -->

+<!-- 			<![CDATA[and concat(toString(entrance_id),toString(device_id)) in (${ispNum})]]> -->

+<!-- 		</if> -->

 		group by stat_time

 		 order by stat_time

 	</select>

@@ -91,12 +91,12 @@
 		from tbs_ods_ntc_conn_record_log t where

 		<![CDATA[ found_time>= toDateTime(#{searchStartTime}) and found_time< toDateTime(#{searchEndTime})

 			and app_id=toInt64(#{searchAppId}) ]]>

-		<if test="searchEntranceId !=null and searchEntranceId != ''">

-			<![CDATA[and entrance_id=toInt64(#{searchEntranceId}) ]]>

-		</if>

-		<if test="ispNum !=null and ispNum != ''">

-			<![CDATA[and concat(toString(entrance_id),toString(device_id)) in (${ispNum})]]>

-		</if>

+<!-- 		<if test="searchEntranceId !=null and searchEntranceId != ''"> -->

+<!-- 			<![CDATA[and entrance_id=toInt64(#{searchEntranceId}) ]]> -->

+<!-- 		</if> -->

+<!-- 		<if test="ispNum !=null and ispNum != ''"> -->

+<!-- 			<![CDATA[and concat(toString(entrance_id),toString(device_id)) in (${ispNum})]]> -->

+<!-- 		</if> -->

 		group by s_ip

 		order by

 		<choose>

@@ -118,9 +118,9 @@
 		from tbs_ods_ntc_conn_record_log t where

 		<![CDATA[ found_time>= toDateTime(#{searchStartTime}) and found_time< toDateTime(#{searchEndTime})

 			and app_id=toInt64(#{searchAppId})  ]]>

-		<if test="searchEntranceId !=null and searchEntranceId != ''">

-			<![CDATA[and entrance_id=toInt64(#{searchEntranceId}) ]]>

-		</if>

+<!-- 		<if test="searchEntranceId !=null and searchEntranceId != ''"> -->

+<!-- 			<![CDATA[and entrance_id=toInt64(#{searchEntranceId}) ]]> -->

+<!-- 		</if> -->

 	</select>

 	

 </mapper>
\ 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 ae339a5..3c520a3 100644
--- a/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml
@@ -132,18 +132,18 @@ FROM
             	#{item}  

         	</foreach>

 		</if>

-		<if test="entranceId!=null">

-			and entrance_id=#{entranceId}

-		</if>

+<!-- 		<if test="entranceId!=null"> -->

+<!-- 			and entrance_id=#{entranceId} -->

+<!-- 		</if> -->

 		group by web_id order by unique_num

 	</select>

 	<select id="getDomainTrans" resultType="com.nis.domain.restful.dashboard.TrafficHttpFocusStatistic">

 		select stat_time statTime, max(unique_num)count from traffic_http_focus_statistic t where

 		<![CDATA[ stat_time>= #{beginDate} and stat_time< #{endDate}]]>

 			and web_id=#{domain}

-		<if test="entranceId!=null">

-			and entrance_id=#{entranceId}

-		</if>

+<!-- 		<if test="entranceId!=null"> -->

+<!-- 			and entrance_id=#{entranceId} -->

+<!-- 		</if> -->

 		

 		group by stat_time

 		 order by stat_time

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 ed1eedd..d514d36 100644
--- a/src/main/java/com/nis/web/dao/dashboard/TrafficIpActiveStatisticDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/TrafficIpActiveStatisticDao.xml
@@ -36,9 +36,9 @@
   <select id="ipActiveChart" resultType="java.util.LinkedHashMap">

 	SELECT ip_addr ipAddr,SUM(link_num) linkNum FROM traffic_ip_active_statistic WHERE 

 	<![CDATA[stat_time >= #{beginDate}  AND  stat_time < #{endDate}]]>

-	<if test="entranceId !=null">

-		and area_id=#{entranceId}

-	</if>

+<!-- 	<if test="entranceId !=null"> -->

+<!-- 		and area_id=#{entranceId} -->

+<!-- 	</if> -->

 	GROUP BY ip_addr ORDER BY linkNum DESC LIMIT 0,10

   </select>

   

@@ -65,19 +65,19 @@
   	select ip_addr,SUM(link_num) count ,stat_time from traffic_ip_active_statistic

   	WHERE 

   	<![CDATA[ip_addr in (${ipAddr}) and stat_time>= #{beginDate} and stat_time<#{endDate}]]>

-	 <if test="entranceId !=null">

-		and area_id=#{entranceId}

-	</if>

+<!-- 	 <if test="entranceId !=null"> -->

+<!-- 		and area_id=#{entranceId} -->

+<!-- 	</if> -->

 	  GROUP BY stat_time,ip_addr order by stat_time asc

   </select>

     <!-- IP流量统计一小时-->

   <select id="ipActiveOneHour" resultType="java.util.HashMap">

-	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

+	SELECT ip_addr ipAddr,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 <![CDATA[ stat_time>= #{beginDate} and stat_time<#{endDate}]]>

-	<if test="entranceId !=null">

-		and area_id=#{entranceId}

-	</if>

+<!-- 	<if test="entranceId !=null"> -->

+<!-- 		and area_id=#{entranceId} -->

+<!-- 	</if> -->

 	GROUP BY statTime

 	ORDER BY count DESC LIMIT 1

   </select>

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 4b006e9..2280376 100644
--- a/src/main/java/com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml
@@ -36,9 +36,9 @@
            	#{item}  

        	</foreach>

 	</if>

-	<if test="entranceId !=null">

-		and entrance_id = #{entranceId}

-	</if>

+<!-- 	<if test="entranceId !=null"> -->

+<!-- 		and entrance_id = #{entranceId} -->

+<!-- 	</if> -->

 	<if test="searchDirection !=null">

 		and direction = #{searchDirection}

 	</if>

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 e35c87c..53022d1 100644
--- a/src/main/java/com/nis/web/service/restful/DashboardService.java
+++ b/src/main/java/com/nis/web/service/restful/DashboardService.java
@@ -413,13 +413,13 @@ public class DashboardService extends BaseService {
 		}

 		ArrayList<HashMap> listMap = new ArrayList<HashMap>();

 		List<NtcEntranceReport> entrance1 = new ArrayList<NtcEntranceReport>();

-		List<NtcEntranceReport> entrance2 = new ArrayList<NtcEntranceReport>();

+//		List<NtcEntranceReport> entrance2 = new ArrayList<NtcEntranceReport>();

 		HashMap m1 = new HashMap();

-		HashMap m2 = new HashMap();

+//		HashMap m2 = new HashMap();

 		entrance1 = ntcTotalReportDao.getActionTrans(begin, end, 1, sql);

-		entrance2 = ntcTotalReportDao.getActionTrans(begin, end, 2, sql);

+//		entrance2 = ntcTotalReportDao.getActionTrans(begin, end, 2, sql);

 

-		if (!StringUtil.isEmpty(entrance1) || !StringUtil.isEmpty(entrance2)) {

+		if (!StringUtil.isEmpty(entrance1) ) {

 			Map<String, Comparable> m = new HashMap<String, Comparable>();

 			Date beginDate = DateUtils.parseDate(begin);

 			Date endDate = DateUtils.parseDate(end);

@@ -433,19 +433,19 @@ public class DashboardService extends BaseService {
 				calendar.add(Calendar.MINUTE, Constants.TREND_TIME_INTERVAL);

 			}

 			int index1 = 0;

-			int index2 = 0;

+//			int index2 = 0;

 			List sumList1 = new ArrayList();

-			List sumList2 = new ArrayList();

+//			List sumList2 = new ArrayList();

 			Long sumEnt1 = 0L;

-			Long sumEnt2 = 0L;

+//			Long sumEnt2 = 0L;

 			for (int i = 0; i < dateRangeList.size(); i++) {

 				// 存放一个时间点中总数

 				List listEnt1 = new ArrayList();

-				List listEnt2 = new ArrayList();

+//				List listEnt2 = new ArrayList();

 				Map<String, Long> ipCountMap = new HashMap<String, Long>();

 				Date date = dateRangeList.get(i);

 				Long num1 = 0L;

-				Long num2 = 0L;

+//				Long num2 = 0L;

 				for (int j = index1; j < entrance1.size(); j++) {

 					NtcEntranceReport ipInfo = entrance1.get(j);

 					if (ipInfo.getReportTime() != null) {

@@ -460,21 +460,21 @@ public class DashboardService extends BaseService {
 					}

 				}

 

-				for (int j = index2; j < entrance2.size(); j++) {

-					NtcEntranceReport ipInfo = entrance2.get(j);

-					if (ipInfo.getReportTime() != null) {

-						if (ipInfo.getReportTime().compareTo(date) >= 0 && (i + 1 < dateRangeList.size()

-								? ipInfo.getReportTime().compareTo(dateRangeList.get(i + 1)) < 0

-								: true)) {

-							num2 = num2 + ipInfo.getSum();

-						} else {

-							index2 = j;

-							break;

-						}

-					}

-				}

+//				for (int j = index2; j < entrance2.size(); j++) {

+//					NtcEntranceReport ipInfo = entrance2.get(j);

+//					if (ipInfo.getReportTime() != null) {

+//						if (ipInfo.getReportTime().compareTo(date) >= 0 && (i + 1 < dateRangeList.size()

+//								? ipInfo.getReportTime().compareTo(dateRangeList.get(i + 1)) < 0

+//								: true)) {

+//							num2 = num2 + ipInfo.getSum();

+//						} else {

+//							index2 = j;

+//							break;

+//						}

+//					}

+//				}

 				// 最后一个时间点,全为0 直接跳过不存入列表

-				if (i + 1 == dateRangeList.size() && num1.compareTo(0L) == 0 && num2.compareTo(0L) == 0) {

+				if (i + 1 == dateRangeList.size() && num1.compareTo(0L) == 0) {

 					break;

 				}

 				sumEnt1 += num1;

@@ -482,20 +482,20 @@ public class DashboardService extends BaseService {
 				listEnt1.add(num1);

 				sumList1.add(listEnt1);

 

-				sumEnt2 += num2;

-				listEnt2.add(date.getTime());

-				listEnt2.add(num2);

-				sumList2.add(listEnt2);

+//				sumEnt2 += num2;

+//				listEnt2.add(date.getTime());

+//				listEnt2.add(num2);

+//				sumList2.add(listEnt2);

 			}

 			// 整合 count time

 			m1.put("sum", sumEnt1);

 			m1.put("result", sumList1);

-			m1.put("entranceId", 1);

-			m2.put("sum", sumEnt2);//

-			m2.put("result", sumList2);

-			m2.put("entranceId", 2);

+//			m1.put("entranceId", 1);

+//			m2.put("sum", sumEnt2);//

+//			m2.put("result", sumList2);

+//			m2.put("entranceId", 2);

 			listMap.add(m1);

-			listMap.add(m2);

+//			listMap.add(m2);

 		}

 		return listMap;

 	}

diff --git a/src/main/java/com/nis/web/service/restful/TrafficReportService.java b/src/main/java/com/nis/web/service/restful/TrafficReportService.java
index 2781c33..8a4f991 100644
--- a/src/main/java/com/nis/web/service/restful/TrafficReportService.java
+++ b/src/main/java/com/nis/web/service/restful/TrafficReportService.java
@@ -124,22 +124,18 @@ public class TrafficReportService extends BaseLogService {
 		Map<String, Map<String, Object>> map = new HashMap<>();

 		if (list != null) {

 			Set<String> dataKey = new HashSet<>();//无论有没有数据都要组装这几个json,界面需要这几个数据

-			dataKey.add("ipv4Type1");//ip只有4,6两种,协议只有tcp和udp,这里都写死了

-			dataKey.add("ipv4Type2");

-			dataKey.add("ipv6Type1");

-			dataKey.add("ipv6Type2");

+			dataKey.add("ipv4Type");//ip只有4,6两种,协议只有tcp和udp,这里都写死了

+			dataKey.add("ipv6Type");

 

-			dataKey.add("trans6Type1");

-			dataKey.add("trans6Type2");

-			dataKey.add("trans17Type1");

-			dataKey.add("trans17Type2");

+			dataKey.add("trans6Type");

+			dataKey.add("trans17Type");

 

 			for (TrafficTransStatisticCK trafficTransStatisticCK : list) {

 				Integer entranceId = trafficTransStatisticCK.getEntranceId();

 				Integer addrType = trafficTransStatisticCK.getAddrType();

 				Integer transType = trafficTransStatisticCK.getTransType();

-				String addrAndEntrKey = "ipv" + addrType + "Type" + entranceId;

-				String transAndEntrKey = "trans" + transType + "Type" + entranceId;

+				String addrAndEntrKey = "ipv" + addrType + "Type";

+				String transAndEntrKey = "trans" + transType + "Type";

 

 				if (mapList.containsKey(addrAndEntrKey)) {

 					mapList.get(addrAndEntrKey).add(trafficTransStatisticCK);

@@ -201,6 +197,72 @@ public class TrafficReportService extends BaseLogService {
 		return map;

 	}

 	

+	private Map<String, Map<String, Object>> forMatData(Map<String, Map<String, Object>> map) {

+

+		Map<String, Object> ipv41Map = map.get("ipv4Type1");

+		Map<String, Object> ipv42Map = map.get("ipv4Type2");

+		Map<String, Object> ipv61Map = map.get("ipv6Type1");

+		Map<String, Object> ipv62Map = map.get("ipv6Type2");

+		Map<String, Object> trans61Map = map.get("trans6Type1");

+		Map<String, Object> trans62Map = map.get("trans6Type2");

+		Map<String, Object> trans171Map = map.get("trans17Type1");

+		Map<String, Object> trans172Map = map.get("trans17Type2");

+

+		ipv41Map.put("sum", ((Long) ipv41Map.get("sum") + (Long) ipv42Map.get("sum")));

+		for (List<Long> list1 : (List<List<Long>>) ipv41Map.get("result")) {

+			for (List<Long> list2 : (List<List<Long>>) ipv42Map.get("result")) {

+				if (list1.get(0).compareTo(list2.get(0)) == 0) {

+					Long subSum = list1.get(1) + list2.get(1);

+					list1.remove(1);

+					list1.add(subSum);

+					break;

+				}

+			}

+		}

+

+		ipv61Map.put("sum", ((Long) ipv61Map.get("sum") + (Long) ipv62Map.get("sum")));

+		for (List<Long> list1 : (List<List<Long>>) ipv61Map.get("result")) {

+			for (List<Long> list2 : (List<List<Long>>) ipv62Map.get("result")) {

+				if (list1.get(0).compareTo(list2.get(0)) == 0) {

+					Long subSum = list1.get(1) + list2.get(1);

+					list1.remove(1);

+					list1.add(subSum);

+					break;

+				}

+			}

+		}

+

+		trans61Map.put("sum", ((Long) trans61Map.get("sum") + (Long) trans62Map.get("sum")));

+		for (List<Long> list1 : (List<List<Long>>) trans61Map.get("result")) {

+			for (List<Long> list2 : (List<List<Long>>) trans62Map.get("result")) {

+				if (list1.get(0).compareTo(list2.get(0)) == 0) {

+					Long subSum = list1.get(1) + list2.get(1);

+					list1.remove(1);

+					list1.add(subSum);

+					break;

+				}

+			}

+		}

+

+		trans171Map.put("sum", ((Long) trans171Map.get("sum") + (Long) trans172Map.get("sum")));

+		for (List<Long> list1 : (List<List<Long>>) trans171Map.get("result")) {

+			for (List<Long> list2 : (List<List<Long>>) trans172Map.get("result")) {

+				if (list1.get(0).compareTo(list2.get(0)) == 0) {

+					Long subSum = list1.get(1) + list2.get(1);

+					list1.remove(1);

+					list1.add(subSum);

+					break;

+				}

+			}

+		}

+

+		map.put("ipv4Type1", ipv41Map);

+		map.put("ipv6Type1", ipv61Map);

+		map.put("trans6Type1", trans61Map);

+		map.put("trans17Type1", trans171Map);

+		return map;

+	}

+	

 	/**

 	 * 根据service 动作查询近五分钟变化趋势 entrance 默认为1,2

 	 */