活跃详情IP增加排序，界面图表园姐增加蓝色风格颜色

src/main/java/com/nis/web/controller/dashboard/DashboardController.java

@@ -6,6 +6,8 @@ import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -94,6 +96,22 @@ public class DashboardController extends BaseController{
 		}
 		return list;
 	}
+	/**
+	 * 跳转活跃端口详情界面
+	 * @return
+	 */
+	@RequestMapping(value="portActiveList")
+	public String portActiveList(Model model){
+		// 默认当前时间一小时
+			Calendar cal = Calendar. getInstance ();
+			cal.setTime(new Date());
+			String endDate =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间
+			cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1);
+			String beginDate =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());
+		model.addAttribute("beginDate", beginDate);
+		model.addAttribute("endDate", endDate);
+		return "/dashboard/trafficPortActiveList";
+	}
 	/**
 	 * 活跃IP TOP10
 	 */
@@ -194,7 +212,7 @@ public class DashboardController extends BaseController{
 		return "/dashboard/trafficIpActiveList";
 	}
 	/**
-	 * 活跃IP TOP10 一小时 间隔5分钟数据
+	 * 活跃IP TOP10 一小时每个IP的最大值
 	 */
 	@RequestMapping(value="ajaxIpActiveList")
 	@ResponseBody
@@ -209,6 +227,24 @@ public class DashboardController extends BaseController{
 			fromJsonList = gson.fromJson(string, new TypeToken<Map<String, Object>>(){}.getType());
 			logger.debug("活跃IP1小时"+fromJsonList);
 			list = gson.fromJson(fromJsonList.get("data").toString(), new TypeToken<List<TrafficIpActiveStatistic>>() {}.getType()) ;
+			Collections.sort(list, new Comparator<TrafficIpActiveStatistic>() {
+
+				@Override
+				public int compare(TrafficIpActiveStatistic o1, TrafficIpActiveStatistic o2) {
+					if(o1==null&&o2!=null){
+						return 1;
+					}
+					if(o1!=null&&o2==null){
+						return -1;
+					}
+					if(o1==o2&&o1==null){
+						return 0;
+					}
+					Long ob1 = o1.getC2sByteLen()+o1.getS2cByteLen();
+					Long ob2 = o2.getC2sByteLen()+o2.getS2cByteLen();
+					return -(ob1).compareTo(ob2);
+				}
+			});
 		
 		} catch (Exception e) {
 			e.printStackTrace();