diff --git a/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java b/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java index 796914d..6f7d89e 100644 --- a/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java +++ b/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java @@ -903,9 +903,9 @@ public class DashboardServiceController extends BaseRestController { } else { Calendar cal = Calendar.getInstance(); cal.setTime(new Date()); - Date begin1 = cal.getTime();// 获取到完整的时间 + Date end1 = cal.getTime();// 获取到完整的时间 cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1); - Date end1 = cal.getTime(); + Date begin1 = cal.getTime(); // 带查询时间查询所有 List websiteChart = dashboardService.getTopicDetails(begin1, end1); if (websiteChart != null && websiteChart.size() > 0) { diff --git a/src/main/java/com/nis/web/dao/NtcReportDao.xml b/src/main/java/com/nis/web/dao/NtcReportDao.xml index 72c3ec7..f5fe55a 100644 --- a/src/main/java/com/nis/web/dao/NtcReportDao.xml +++ b/src/main/java/com/nis/web/dao/NtcReportDao.xml @@ -76,7 +76,6 @@ - - url, ipCount,connCount,reportTime + url, ipCount,connCount FROM (SELECT url, count(distinct ip_addr) ipCount, - sum(sum) connCount, - stat_time reportTime + sum(sum) connCount FROM ntc_reject_url_statistic @@ -775,17 +773,11 @@ - AND url = #{searchUrl} + AND url like concat(concat('%',#{searchUrl}),'%') - GROUP BY url,stat_time - ) ntc_reject_url_statistic - - - ORDER BY ${page.orderBy} - - + GROUP BY url + ) ntc_reject_url_statistic ORDER BY ipcount desc,connCount desc diff --git a/src/main/java/com/nis/web/service/LogDataService.java b/src/main/java/com/nis/web/service/LogDataService.java index 78c1059..635b9d7 100644 --- a/src/main/java/com/nis/web/service/LogDataService.java +++ b/src/main/java/com/nis/web/service/LogDataService.java @@ -81,58 +81,6 @@ public class LogDataService { localLogJDBCByDruid.getNtcConnRecordPercentData(ntcConnRecordPercent, totalSql.toString(), true); return ntcConnRecordPercent; } - - public static void main(String[] args) throws ParseException { - String asn = "s_asn "; - - long startTime = sdf.parse("2018-12-17 21:30:00").getTime() / 1000; - long endTime = sdf.parse("2018-12-17 21:50:00").getTime() / 1000; - - long second = 200l; - StringBuffer sql = new StringBuffer(); - sql.append("SELECT SUM(s2c_pkt_num + s2c_pkt_num)*8/"); - sql.append(second); - sql.append(" AS pps , SUM(c2s_byte_num + s2c_byte_num)*8/"); - sql.append(second); - sql.append(" AS bps,"); - sql.append(asn); - sql.append( - " asn FROM tbs_ods_ntc_conn_record_log_local t WHERE found_time IN ( SELECT DISTINCT found_time FROM tbs_ods_ntc_conn_record_log_local WHERE found_time >= "); - sql.append(startTime); - sql.append(" and found_time< "); - sql.append(endTime); - StringBuffer countSql = new StringBuffer(); - countSql.append("select count(1) from ("); - countSql.append(sql); - countSql.append(" ) group by "); - countSql.append(asn+")"); - - Integer startNum =0; - Integer limitCount = startNum + 20; - - sql.append(" limit " + limitCount + " ) group by "+asn+" limit " + startNum + "," + 20); - - - System.out.println(sql); - System.out.println(countSql); - - } - - - - - - - - - - - - - - - - public void getNtcAsnRecord(Page page, NtcAsnRecord ntcAsnRecord) throws Exception { long startTime = sdf.parse(ntcAsnRecord.getSearchFoundStartTime().toString().trim()).getTime() / 1000; @@ -153,7 +101,7 @@ public class LogDataService { StringBuffer sql = new StringBuffer(); sql.append("SELECT SUM(s2c_pkt_num + s2c_pkt_num)*8/"); sql.append(second); - sql.append(" AS pps , SUM(c2s_byte_num + s2c_byte_num)*8/"); + sql.append(" AS pps , SUM(c2s_byte_num + s2c_byte_num)*8/1024/1024/"); sql.append(second); sql.append(" AS bps,"); sql.append(asn); @@ -170,7 +118,7 @@ public class LogDataService { Integer startNum = (page.getPageNo() - 1) * page.getPageSize(); Integer limitCount = startNum + page.getPageSize(); - sql.append(" limit " + limitCount + " ) group by "+asn+" limit " + startNum + "," + page.getPageSize()); + sql.append(" limit " + limitCount + " ) group by "+asn+" order by bps desc,pps desc limit " + startNum + "," + page.getPageSize()); localLogJDBCByDruid.getCount(page, countSql.toString()); 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 914e829..7bf260e 100644 --- a/src/main/java/com/nis/web/service/restful/DashboardService.java +++ b/src/main/java/com/nis/web/service/restful/DashboardService.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; import java.util.*; import java.util.Map.Entry; + @Service public class DashboardService extends BaseService { @@ -806,8 +807,8 @@ public class DashboardService extends BaseService { * @param endDate * @return */ - public List getWebsiteDetails(Date beginDate, Date endDate,Integer domain,Integer entranceId) { - List list = trafficHttpStatisticDao.getTrafficHttpDomain(beginDate, endDate,domain,entranceId); + public List getWebsiteDetails(Date beginDate, Date endDate, Integer domain, Integer entranceId) { + List list = trafficHttpStatisticDao.getTrafficHttpDomain(beginDate, endDate, domain, entranceId); return list; } @@ -928,7 +929,7 @@ public class DashboardService extends BaseService { */ public List getTopicTop10() { Date startTime = getBeforeByHourTime(1);// 获取上一个小时 - List topicAndDomainList = getTopicAndDomainList(startTime, new Date(), "top"); + List topicAndDomainList = getTopicAndDomainListNoLink(startTime, new Date(), "top"); return topicAndDomainList; } @@ -936,6 +937,87 @@ public class DashboardService extends BaseService { * 主题网站分类，域名 * **/ + public List getTopicAndDomainListNoLink(Date beginDate, Date endDate, String top) { + + Map> topicIdAndIdMap = new HashMap<>();// 存储topicid和id的对应关系,一个topicid有多个id + List topicIdAndIdList = trafficHttpStatisticDao.getDomainByTopicList(beginDate, endDate);// 获取最近一个小时topicId和id的对应关系,group + for (Map map : topicIdAndIdList) { + Object topicIdObj = map.get("topicId"); + Object idObj = map.get("id"); + if (topicIdObj != null && idObj != null) { + if (topicIdAndIdMap.containsKey(String.valueOf(topicIdObj))) { + topicIdAndIdMap.get(String.valueOf(topicIdObj)).add(String.valueOf(idObj)); + } else { + List list = new ArrayList<>(); + list.add(String.valueOf(idObj)); + topicIdAndIdMap.put(String.valueOf(topicIdObj), list); + } + } + } + + Set set = new HashSet<>(); + Map> countAndViewMap = new HashMap<>();// 存储count和map的对应关系,后面根据count过滤,获取top10的count + List webIdAndCountList = trafficHttpStatisticDao.getHttpStatisticNoLinkAndPkt(beginDate, endDate);// 获取最近一小时的webid和count的关系 + for (String topicId : topicIdAndIdMap.keySet()) {// 遍历上面获取的topicid和id的对应关系,拼接json + Map viewMap = new HashMap<>(); + + List list = new ArrayList<>(); + long count = 0l;// 记录当前topicid所有的count +// long linkNum = 0l; +// long packets = 0l; + List idList = topicIdAndIdMap.get(topicId);// 根据topicid获取对应的id + for (String id : idList) { + for (Map webIdAndCountMap : webIdAndCountList) {// 遍历webid和count + String webId = String.valueOf(webIdAndCountMap.get("webId")); + if (webId != null && webId.equals(id)) {// 如果webid和id相等则获取count数据并统计 + String countStr = String.valueOf(webIdAndCountMap.get("byteCount")); +// String linkNumStr = String.valueOf(webIdAndCountMap.get("linkNum")); +// String packetsStr = String.valueOf(webIdAndCountMap.get("pktCount")); + if (countStr != null) { + count += Long.parseLong(countStr);// 将count累加 + } +// if (linkNumStr != null) { +// linkNum += Long.parseLong(linkNumStr);// 将count累加 +// } +// if (packetsStr != null) { +// packets += Long.parseLong(packetsStr);// 将count累加 +// } +// webIdAndCountMap.remove("linkNum"); +// webIdAndCountMap.remove("pktCount"); + list.add(webIdAndCountMap); + } + } + } + if (list.size() > 0) { + viewMap.put("count", count); +// viewMap.put("linkNum", linkNum); +// viewMap.put("packets", packets); + viewMap.put("domainData", list); + viewMap.put("topicId", topicId); + if (countAndViewMap.containsKey(count)) {// 将每个count和对应的viewmap放到map中,count可能相同所以value是list + countAndViewMap.get(count).add(viewMap); + } else { + List listMap = new ArrayList<>(); + listMap.add(viewMap); + countAndViewMap.put(count, listMap); + } + set.add(count); + } + } + List dataList = new ArrayList(); + if (top != null) { + dataList = getTop10Data(set, countAndViewMap, 1); + } else { + dataList = getTop10Data(set, countAndViewMap, 2); + } + return dataList; + } + + + + + + public List getTopicAndDomainList(Date beginDate, Date endDate, String top) { Map> topicIdAndIdMap = new HashMap<>();// 存储topicid和id的对应关系,一个topicid有多个id @@ -959,7 +1041,6 @@ public class DashboardService extends BaseService { List webIdAndCountList = trafficHttpStatisticDao.getTrafficHttpStatistic(beginDate, endDate);// 获取最近一小时的webid和count的关系 for (String topicId : topicIdAndIdMap.keySet()) {// 遍历上面获取的topicid和id的对应关系,拼接json Map viewMap = new HashMap<>(); - viewMap.put("topicId", topicId); List list = new ArrayList<>(); long count = 0l;// 记录当前topicid所有的count long linkNum = 0l; @@ -987,18 +1068,21 @@ public class DashboardService extends BaseService { } } } - viewMap.put("count", count); - viewMap.put("linkNum", linkNum); - viewMap.put("packets", packets); - viewMap.put("domainData", list); - if (countAndViewMap.containsKey(count)) {// 将每个count和对应的viewmap放到map中,count可能相同所以value是list - countAndViewMap.get(count).add(viewMap); - } else { - List listMap = new ArrayList<>(); - listMap.add(viewMap); - countAndViewMap.put(count, listMap); + if (list.size() > 0) { + viewMap.put("count", count); + viewMap.put("linkNum", linkNum); + viewMap.put("packets", packets); + viewMap.put("domainData", list); + viewMap.put("topicId", topicId); + if (countAndViewMap.containsKey(count)) {// 将每个count和对应的viewmap放到map中,count可能相同所以value是list + countAndViewMap.get(count).add(viewMap); + } else { + List listMap = new ArrayList<>(); + listMap.add(viewMap); + countAndViewMap.put(count, listMap); + } + set.add(count); } - set.add(count); } List dataList = new ArrayList(); if (top != null) { @@ -1008,54 +1092,73 @@ public class DashboardService extends BaseService { } return dataList; } - public String [] getFiledTypeByName(String fieldName){ - if(fieldName==null){ + + + + + + + + + + + + + + + + + + + public String[] getFiledTypeByName(String fieldName) { + if (fieldName == null) { return null; } - String fieldType=null; - if("addr_type".equals(fieldName)){ - fieldType= ntcTotalReportDao.getAddrType(); + String fieldType = null; + if ("addr_type".equals(fieldName)) { + fieldType = ntcTotalReportDao.getAddrType(); } - if("trans_type".equals(fieldName)){ - fieldType= ntcTotalReportDao.getTransType(); + if ("trans_type".equals(fieldName)) { + fieldType = ntcTotalReportDao.getTransType(); } - if("entrance_id".equals(fieldName)){ - fieldType= ntcTotalReportDao.getEntranceId(); + if ("entrance_id".equals(fieldName)) { + fieldType = ntcTotalReportDao.getEntranceId(); } - return fieldType==null?null:fieldType.split(","); + return fieldType == null ? null : fieldType.split(","); } - public Map> getBandwidthTransEntrance(String beginDate,String endDate) { + + public Map> getBandwidthTransEntrance(String beginDate, String endDate) { long start = System.currentTimeMillis(); - Map> listMap = new HashMap>(); + Map> listMap = new HashMap>(); List bandwidthList = new ArrayList(); - bandwidthList = ntcTotalReportDao.getBandwidthTrans2(beginDate,endDate); - String[] addrTypes=getFiledTypeByName("addr_type"); - String[] transTypes=getFiledTypeByName("trans_type"); + bandwidthList = ntcTotalReportDao.getBandwidthTrans2(beginDate, endDate); + String[] addrTypes = getFiledTypeByName("addr_type"); + String[] transTypes = getFiledTypeByName("trans_type"); String[] entranceIds = getFiledTypeByName("entrance_id"); for (String entranceId : entranceIds) { for (String addrType : addrTypes) { - listMap.put("ipv"+addrType+"Type"+entranceId, new ArrayList()); + listMap.put("ipv" + addrType + "Type" + entranceId, new ArrayList()); } } for (String entranceId : entranceIds) { for (String transType : transTypes) { - listMap.put("trans"+transType+"Type"+entranceId, new ArrayList()); + listMap.put("trans" + transType + "Type" + entranceId, new ArrayList()); } } for (TrafficTransStatistic tts : bandwidthList) { String addrType = tts.getAddrType(); Integer entranceId = tts.getEntranceId(); Integer transType = tts.getTransType(); - String key1="ipv"+addrType+"Type"+entranceId; - String key2="trans"+transType+"Type"+entranceId; + String key1 = "ipv" + addrType + "Type" + entranceId; + String key2 = "trans" + transType + "Type" + entranceId; listMap.get(key1).add(tts); listMap.get(key2).add(tts); } - Map> resultMap=new HashMap>(); - Set>> entrySet = listMap.entrySet(); + Map> resultMap = new HashMap>(); + Set>> entrySet = listMap.entrySet(); for (Entry> entry : entrySet) { String key = entry.getKey(); - String entranceId = key.substring(key.length()-1); + String entranceId = key.substring(key.length() - 1); List value = entry.getValue(); HashMap newData = getNewData(beginDate, endDate, value); newData.put("entranceId", entranceId); @@ -1073,62 +1176,63 @@ public class DashboardService extends BaseService { List gbpsList = new ArrayList(); List ppsList = new ArrayList(); if (bandwidthList != null && bandwidthList.size() > 0) { - Map m= new HashMap(); - int inter=1000*60*5;// 间隔时间为五分钟 + Map m = new HashMap(); + int inter = 1000 * 60 * 5;// 间隔时间为五分钟 // 开始时间，结束时间 时间戳 Long b = dateToStamp(beginDate); Long e = dateToStamp(endDate); - int num=0; - Long pointTime=b; - while(pointTime=e){ - break; //停止 + int num = 0; + Long pointTime = b; + while (pointTime < e) { + + Long sumL = 0l; + Long sumP = 0l; + Long sumG = 0l; + if (pointTime >= e) { + break; // 停止 } for (TrafficTransStatistic tt : bandwidthList) { - // 实际时间 - String time= tt.getTime(); + // 实际时间 + String time = tt.getTime(); Long t = dateToStamp(time); - if(t>=pointTime&&t= pointTime && t < pointTime + inter) { // 范围之内分到此pointTime组 - sumL=sumL+ tt.getLinkNum(); - sumP=sumP+ tt.getPps(); - sumG=sumG+ tt.getGbps(); + sumL = sumL + tt.getLinkNum(); + sumP = sumP + tt.getPps(); + sumG = sumG + tt.getGbps(); } } // 在结束时间只有当值大于0时才记录数据，防止折线降为0引起误会 - if(pointTime>=e-inter&&sumL>0) { + if (pointTime >= e - inter && sumL > 0) { linkList.add(sumL); } - if(pointTime>=e-inter&&sumP>0) { + if (pointTime >= e - inter && sumP > 0) { ppsList.add(sumP); } - if(pointTime>=e-inter&&sumG>0) { + if (pointTime >= e - inter && sumG > 0) { gbpsList.add(sumG); } - if(pointTime>=e-inter&&(sumL>0||sumG>0||sumP>0)) { + if (pointTime >= e - inter && (sumL > 0 || sumG > 0 || sumP > 0)) { timeList.add(stampToDate(pointTime)); } - if(pointTime getDomainTrans(String beginDate, String endDate, Integer domain, Integer entranceId) { List listMap = new ArrayList(); - HashMap resulMap= new HashMap(); + HashMap resulMap = new HashMap(); List domainList = new ArrayList(); domainList = trafficHttpStatisticDao.getDomainTrans(entranceId, beginDate, endDate, domain); List timeList = new ArrayList(); diff --git a/src/main/resources/commonSources/applicationConfig-parser.xml b/src/main/resources/commonSources/applicationConfig-parser.xml index 38ed8a0..15f1436 100644 --- a/src/main/resources/commonSources/applicationConfig-parser.xml +++ b/src/main/resources/commonSources/applicationConfig-parser.xml @@ -253,7 +253,7 @@ - +