修复多攻击类型多线程时OriginalData为空问题

src/main/java/cn/mesalab/service/BaselineGeneration.java

@@ -28,7 +28,6 @@ public class BaselineGeneration {
     private static DruidData druidData;
     private static HbaseUtils hbaseUtils;
     private static Table hbaseTable;
-
     private static List<Map<String, Object>> batchDruidData = new ArrayList<>();
 
     private static final Integer BASELINE_POINT_NUM = ApplicationConfig.BASELINE_RANGE_DAYS * 24 * (60/ApplicationConfig.HISTORICAL_GRAD);
@@ -44,7 +43,7 @@ public class BaselineGeneration {
 
         try{
             generateBaselinesThread(ApplicationConfig.DRUID_ATTACKTYPE_TCP_SYN_FLOOD);
-//            generateBaselines(ApplicationConfig.DRUID_ATTACKTYPE_UDP_FLOOD);
+            generateBaselines(ApplicationConfig.DRUID_ATTACKTYPE_UDP_FLOOD);
 //            generateBaselines(ApplicationConfig.DRUID_ATTACKTYPE_ICMP_FLOOD);
 //            generateBaselines(ApplicationConfig.DRUID_ATTACKTYPE_DNS_AMPL);
 
@@ -86,8 +85,10 @@ public class BaselineGeneration {
         for (int batchCurrent = 0; batchCurrent <batchCount; batchCurrent++){
             List<String> batchIps = destinationIps.subList(batchCurrent*ApplicationConfig.GENERATE_BATCH_NUM,
                     (batchCurrent+1)*ApplicationConfig.GENERATE_BATCH_NUM);
+            if(batchIps.size()>0){
                 executor.execute(() -> generateBaselines(batchIps, attackType));
             }
+        }
 
         executor.shutdown();
         executor.awaitTermination(10L, TimeUnit.SECONDS);

src/main/resources/application.properties

@@ -6,7 +6,7 @@ druid.table=top_server_ip_test_log
 
 #字段映射
 druid.attacktype.tcpsynflood=sessions
-#druid.attacktype.udpflood=IPv6_TCP
+druid.attacktype.udpflood=bytes
 #druid.attacktype.icmpflood=IPv6_UDP
 #druid.attacktype.dnsamplification=IPv4_UDP
 druid.serverip.columnname=destination

target/classes/application.properties

@@ -6,7 +6,7 @@ druid.table=top_server_ip_test_log
 
 #字段映射
 druid.attacktype.tcpsynflood=sessions
-#druid.attacktype.udpflood=IPv6_TCP
+druid.attacktype.udpflood=bytes
 #druid.attacktype.icmpflood=IPv6_UDP
 #druid.attacktype.dnsamplification=IPv4_UDP
 druid.serverip.columnname=destination