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

src/main/java/cn/mesalab/dao/DruidData.java

@@ -59,7 +59,7 @@ public class DruidData {
                 + " FROM " + ApplicationConfig.DRUID_TABLE
                 + " WHERE " + ApplicationConfig.DRUID_ATTACKTYPE_COLUMN_NAME + " = '" + attackType + "'"
                 + " AND " + timeFilter
-                + " LIMIT 100"; // FOR TEST
+                + " LIMIT 10"; // FOR TEST
         try{
             ResultSet resultSet = DruidUtils.executeQuery(connection,sql);
             while(resultSet.next()){
@@ -104,7 +104,7 @@ public class DruidData {
     }
 
     public List<Map<String, Object>> getTimeSeriesData(List<Map<String, Object>> allData, String ip, String attackType){
-        List<Map<String, Object>> rsList = null;
+        List<Map<String, Object>> rsList = new ArrayList<>();
         try{
             rsList = allData.stream().
                     filter(i->(i.get(ApplicationConfig.DRUID_SERVERIP_COLUMN_NAME).equals(ip)))

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

@@ -140,12 +140,12 @@ public class BaselineGeneration {
         Long startQuerySingleIPTime = System.currentTimeMillis();
         List<Map<String, Object>> originSeries = druidData.getTimeSeriesData(batchDruidData, ip, attackType);
 
-        if (originSeries==null){
+        if (originSeries.size()==0){
             return null;
         }
 
         Long endQuerySingleIPTime = System.currentTimeMillis();
-        LOG.info("性能测试：单个ip查询耗时——"+(endQuerySingleIPTime-startQuerySingleIPTime));
+        //LOG.info("性能测试：单个ip查询耗时——"+(endQuerySingleIPTime-startQuerySingleIPTime));
 
         // 时间序列缺失值补0
         List<Map<String, Object>> completSeries = SeriesUtils.complementSeries(originSeries);
@@ -176,7 +176,7 @@ public class BaselineGeneration {
         }
 
         Long endGenerateSingleIPTime = System.currentTimeMillis();
-        LOG.info("性能测试：单个baseline生成耗时——"+(endGenerateSingleIPTime-endQuerySingleIPTime));
+        //LOG.info("性能测试：单个baseline生成耗时——"+(endGenerateSingleIPTime-endQuerySingleIPTime));
 
         return baselineArr;
     }

src/main/resources/application.properties

@@ -54,5 +54,5 @@ baseline.kalman.r=0.002
 # 每更新1000个记录打印log
 log.write.count=10000
 # FOR TEST
-generate.batch.number=100
+generate.batch.number=5
 

target/classes/application.properties

@@ -54,5 +54,5 @@ baseline.kalman.r=0.002
 # 每更新1000个记录打印log
 log.write.count=10000
 # FOR TEST
-generate.batch.number=100
+generate.batch.number=5