添加日志

@@ -72,6 +72,6 @@ public class MaliciousIp {
 	public String toString() {
 		return "MaliciousIp [ip=" + ip + ", qps=" + qps + ", allCount=" + allCount + ", impCount=" + impCount + ", ipPrecent="
 				+ ipPrecent + ", impApiPrecent=" + impApiPrecent + ", udidCount=" + udidCount + ", notExsitUdidCount="
-				+ notExsitUdidCount + ", timestamp=" + timestamp + ", time=" + time + "]";
+				+ notExsitUdidCount + ", timestamp=" + timestamp + ", time=" + time +", hbaseTime="+hbaseTime+ "]";
 	}
 }
\ No newline at end of file

@@ -369,11 +369,6 @@ public class MaliciousIpServiceImpl implements MaliciousIpService {
 
 			String reasonDur = "";
 
-			if("43.242.153.113".equals(mipKey)){
-				logger.error("listMaliciousIpinfo awsIpInfo is {}",JSON.toJSONString(awsIpInfo));
-				logger.error("listMaliciousIpinfo qcloudIpInfo is {}",JSON.toJSONString(qcloudIpInfo));
-			}
-
 			if( awsIpInfo.get(mipKey) != null){
 				Map<String,String> awsInfo = awsIpInfo.get(mipKey);
 				String reason=awsInfo.get("reason");
@@ -424,28 +419,21 @@ public class MaliciousIpServiceImpl implements MaliciousIpService {
 				mip.setTime(time);
 			}*/
 			mip.setTs(ts);
-			if(StringUtils.isNotBlank(insertTime)&&StringUtils.isNotBlank(insertTime2)){
-					if(insertTime.compareTo(insertTime2)>0){
-						mip.setTime(insertTime);
-					}else{
-						mip.setTime(insertTime2);
-					}
-			}
 
 			if(StringUtils.isNotBlank(hbaseTime)&&StringUtils.isNotBlank(hbaseTime2)){
 				if(hbaseTime.compareTo(hbaseTime2)>0){
 					mip.setHbaseTime(hbaseTime);
+					mip.setTime(insertTime);
 				}else{
 					mip.setHbaseTime(hbaseTime2);
+					mip.setTime(insertTime2);
 				}
 			}else if(StringUtils.isNotBlank(hbaseTime2)){
-				mip.setHbaseTime(hbaseTime);
-			}else{
 				mip.setHbaseTime(hbaseTime2);
-			}
-
-			if("43.242.153.113".equals(mipKey)){
-				logger.error("listMaliciousIpinfo mip is {}",JSON.toJSONString(mip));
+				mip.setTime(insertTime2);
+			}else{
+				mip.setHbaseTime(hbaseTime);
+				mip.setTime(insertTime);
 			}
 
 			listMaliciousIp.add(mip);