恶意ip排序

@@ -439,29 +439,31 @@ public class MaliciousIpServiceImpl implements MaliciousIpService {
 			listMaliciousIp.add(mip);
 		}
 		//排序
+		//排序
 		Collections.sort(listMaliciousIp,new Comparator<MaliciousIp>(){
 			public int compare(MaliciousIp arg0, MaliciousIp arg1) {
-				/*long compare= arg0.getTs() - arg1.getTs();
-				if(compare<0L){
-					return 1;
-				}else{
+				String o1=arg0.getTime();
+				String o2=arg1.getTime();
+				if(StringUtils.isBlank(o1) ){
+					o1="";
+				}
+				if(StringUtils.isBlank(o2)){
+					o2="";
+				}
+
+				if(o1.compareTo(o2) > 0){
 					return -1;
-				}*/
-				if(StringUtils.isBlank(arg0.getTime())){
-					return 1;
-				}else if(StringUtils.isBlank(arg1.getTime())){
+				}
+				if(o1.compareTo(o2) < 0){
 					return 1;
-				}else{
-					int i= arg0.getTime().compareTo(arg1.getTime());
-					if(i<0){
-						return 1;
-					}else{
-						return -1;
-					}
 				}
-
+				if(o1.compareTo(o2) == 0){
+					return 0;
+				}
+				return 0;
 			}
 		});
+
 		logger.error("listMaliciousIpinfo is {}",JSON.toJSONString(listMaliciousIp));
 		response.setData(listMaliciousIp);
 		return response;