Authored by qinchao

恶意ip添加统计周期

@@ -25,4 +25,7 @@ public class MaliciousIpsRecordForbid { @@ -25,4 +25,7 @@ public class MaliciousIpsRecordForbid {
25 25
26 //封禁status 1 表示封 26 //封禁status 1 表示封
27 private String forbidStatus; 27 private String forbidStatus;
  28 +
  29 + //统计周期
  30 + private String dur;
28 } 31 }
@@ -8,9 +8,10 @@ @@ -8,9 +8,10 @@
8 <result column="forbid_status" property="forbidStatus" jdbcType="VARCHAR" /> 8 <result column="forbid_status" property="forbidStatus" jdbcType="VARCHAR" />
9 <result column="hbase_time" property="hbaseTime" jdbcType="VARCHAR" /> 9 <result column="hbase_time" property="hbaseTime" jdbcType="VARCHAR" />
10 <result column="create_time" property="createTime" jdbcType="TIMESTAMP" /> 10 <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
  11 + <result column="dur" property="dur" jdbcType="VARCHAR" />
11 </resultMap> 12 </resultMap>
12 <sql id="Base_Column_List" > 13 <sql id="Base_Column_List" >
13 - id, ip,reason,create_time,forbid_status,hbase_time 14 + id, ip,reason,create_time,forbid_status,hbase_time,dur
14 </sql> 15 </sql>
15 16
16 <select id="getAlarmCountMipsInfoToOpsDb" resultType="java.lang.Integer"> 17 <select id="getAlarmCountMipsInfoToOpsDb" resultType="java.lang.Integer">
@@ -45,8 +46,8 @@ @@ -45,8 +46,8 @@
45 </select> 46 </select>
46 47
47 <insert id="insert" parameterType="com.model.MaliciousIpsRecordForbid"> 48 <insert id="insert" parameterType="com.model.MaliciousIpsRecordForbid">
48 - insert into malicious_ips_record_forbid(ip,reason,hbase_time,create_time)  
49 - values(#{ip,jdbcType=VARCHAR},#{reason,jdbcType=VARCHAR},#{hbaseTime,jdbcType=VARCHAR},now()) 49 + insert into malicious_ips_record_forbid(ip,reason,dur,hbase_time,create_time)
  50 + values(#{ip,jdbcType=VARCHAR},#{reason,jdbcType=VARCHAR},#{dur,jdbcType=VARCHAR},#{hbaseTime,jdbcType=VARCHAR},now())
50 </insert> 51 </insert>
51 52
52 <update id="updateForbidStatusByPrimaryKey" parameterType="com.model.MaliciousIpsRecordForbid" > 53 <update id="updateForbidStatusByPrimaryKey" parameterType="com.model.MaliciousIpsRecordForbid" >
@@ -65,6 +65,8 @@ public class MaliciousIp { @@ -65,6 +65,8 @@ public class MaliciousIp {
65 private List<String> duration;*/ 65 private List<String> duration;*/
66 private String reasonDur; 66 private String reasonDur;
67 67
  68 + private String dur;
  69 +
68 70
69 71
70 72
@@ -211,13 +211,14 @@ public class MaliciousIpServiceImpl implements MaliciousIpService { @@ -211,13 +211,14 @@ public class MaliciousIpServiceImpl implements MaliciousIpService {
211 String ip=jo.getString("ip"); 211 String ip=jo.getString("ip");
212 String reason=jo.getString("reason"); 212 String reason=jo.getString("reason");
213 String hbaseTime=String.valueOf(jo.getLongValue("timestamp")); 213 String hbaseTime=String.valueOf(jo.getLongValue("timestamp"));
214 - //String duration=jo.get("duration")==null?"":""+jo.get("duration"); 214 + String duration=jo.get("duration")==null?"":""+jo.get("duration");
215 if(StringUtils.isNotBlank(ip)){ 215 if(StringUtils.isNotBlank(ip)){
216 216
217 MaliciousIpsRecordForbid record=new MaliciousIpsRecordForbid(); 217 MaliciousIpsRecordForbid record=new MaliciousIpsRecordForbid();
218 record.setIp(ip); 218 record.setIp(ip);
219 record.setReason(reason); 219 record.setReason(reason);
220 record.setHbaseTime(hbaseTime); 220 record.setHbaseTime(hbaseTime);
  221 + record.setDur(duration);
221 maliciousIpsRecordForbidMapper.insert(record); 222 maliciousIpsRecordForbidMapper.insert(record);
222 223
223 logger.info("MaliciousIpServiceImpl writeMipsObjToOpsReids - "+ip); 224 logger.info("MaliciousIpServiceImpl writeMipsObjToOpsReids - "+ip);
@@ -363,6 +364,8 @@ public class MaliciousIpServiceImpl implements MaliciousIpService { @@ -363,6 +364,8 @@ public class MaliciousIpServiceImpl implements MaliciousIpService {
363 String insertTime2=""; 364 String insertTime2="";
364 String hbaseTime=""; 365 String hbaseTime="";
365 String hbaseTime2=""; 366 String hbaseTime2="";
  367 + String dur="";
  368 + String dur2="";
366 for(String mipKey : mipKeys){ 369 for(String mipKey : mipKeys){
367 MaliciousIp mip = new MaliciousIp(); 370 MaliciousIp mip = new MaliciousIp();
368 mip.setIp(mipKey); 371 mip.setIp(mipKey);
@@ -374,6 +377,7 @@ public class MaliciousIpServiceImpl implements MaliciousIpService { @@ -374,6 +377,7 @@ public class MaliciousIpServiceImpl implements MaliciousIpService {
374 String reason=awsInfo.get("reason"); 377 String reason=awsInfo.get("reason");
375 insertTime=awsInfo.get("createtime"); 378 insertTime=awsInfo.get("createtime");
376 hbaseTime=awsInfo.get("hbasetime"); 379 hbaseTime=awsInfo.get("hbasetime");
  380 + dur=awsInfo.get("dur");
377 try{ 381 try{
378 MaliciousIpModel model=JSON.parseObject(reason,MaliciousIpModel.class); 382 MaliciousIpModel model=JSON.parseObject(reason,MaliciousIpModel.class);
379 reason=model.toHtmlString(); 383 reason=model.toHtmlString();
@@ -393,6 +397,7 @@ public class MaliciousIpServiceImpl implements MaliciousIpService { @@ -393,6 +397,7 @@ public class MaliciousIpServiceImpl implements MaliciousIpService {
393 String reason=qcloudInfo.get("reason"); 397 String reason=qcloudInfo.get("reason");
394 insertTime2=qcloudInfo.get("createtime"); 398 insertTime2=qcloudInfo.get("createtime");
395 hbaseTime2=qcloudInfo.get("hbasetime"); 399 hbaseTime2=qcloudInfo.get("hbasetime");
  400 + dur2=qcloudInfo.get("dur");
396 try{ 401 try{
397 MaliciousIpModel model=JSON.parseObject(reason,MaliciousIpModel.class); 402 MaliciousIpModel model=JSON.parseObject(reason,MaliciousIpModel.class);
398 reason=model.toHtmlString(); 403 reason=model.toHtmlString();
@@ -424,16 +429,20 @@ public class MaliciousIpServiceImpl implements MaliciousIpService { @@ -424,16 +429,20 @@ public class MaliciousIpServiceImpl implements MaliciousIpService {
424 if(hbaseTime.compareTo(hbaseTime2)>0){ 429 if(hbaseTime.compareTo(hbaseTime2)>0){
425 mip.setHbaseTime(hbaseTime); 430 mip.setHbaseTime(hbaseTime);
426 mip.setTime(insertTime); 431 mip.setTime(insertTime);
  432 + mip.setDur(dur);
427 }else{ 433 }else{
428 mip.setHbaseTime(hbaseTime2); 434 mip.setHbaseTime(hbaseTime2);
429 mip.setTime(insertTime2); 435 mip.setTime(insertTime2);
  436 + mip.setDur(dur2);
430 } 437 }
431 }else if(StringUtils.isNotBlank(hbaseTime2)){ 438 }else if(StringUtils.isNotBlank(hbaseTime2)){
432 mip.setHbaseTime(hbaseTime2); 439 mip.setHbaseTime(hbaseTime2);
433 mip.setTime(insertTime2); 440 mip.setTime(insertTime2);
  441 + mip.setDur(dur2);
434 }else{ 442 }else{
435 mip.setHbaseTime(hbaseTime); 443 mip.setHbaseTime(hbaseTime);
436 mip.setTime(insertTime); 444 mip.setTime(insertTime);
  445 + mip.setDur(dur);
437 } 446 }
438 447
439 listMaliciousIp.add(mip); 448 listMaliciousIp.add(mip);