添加时间

@@ -21,6 +21,16 @@ public class MaliciousIp {
 	 * 百分比
 	 */
 	private int percent;
+	
+	/**
+	 * 攻击时间
+	 */
+	private String timestamp;
+	
+	/**
+	 * 攻击时间
+	 */
+	private String time;
 
 	public String getIp() {
 		return ip;
@@ -46,8 +56,25 @@ public class MaliciousIp {
 		this.percent = percent;
 	}
 
+	public String getTimestamp() {
+		return timestamp;
+	}
+
+	public void setTimestamp(String timestamp) {
+		this.timestamp = timestamp;
+	}
+
+	public String getTime() {
+		return time;
+	}
+
+	public void setTime(String time) {
+		this.time = time;
+	}
+
 	@Override
 	public String toString() {
-		return "MaliciousIp [ip=" + ip + ", count=" + count + ", percent=" + percent + "]";
+		return "MaliciousIp [ip=" + ip + ", count=" + count + ", percent=" + percent + ", timestamp=" + timestamp
+				+ ", time=" + time + "]";
 	}
 }
\ No newline at end of file

 package com.monitor.other.maliciousip.service.impl;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
@@ -62,6 +64,18 @@ public class MaliciousIpServiceImpl implements MaliciousIpService {
 				return response;
 			}
 			listMaliciousIp = (List<MaliciousIp>) JSON.parseArray(ips_json, MaliciousIp.class);
+			if(CollectionUtils.isNotEmpty(listMaliciousIp)){
+				SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				Date date;
+				for (MaliciousIp maliciousIp : listMaliciousIp) {
+					if(StringUtils.isBlank(maliciousIp.getTimestamp())){
+						continue;
+					}
+					long lt = new Long(maliciousIp.getTimestamp());
+			        date = new Date(lt);
+			        maliciousIp.setTime(simpleDateFormat.format(date));
+				}
+			}
 			Comparator comp = new ComparatorIp();
 			Collections.sort(listMaliciousIp, comp);
 			response.setData(listMaliciousIp);