Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java

@@ -27,7 +27,7 @@ import java.util.concurrent.*;
 public class FactOriginExtractServiceImpl implements FactOriginExtractService {
     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
             .setNameFormat("factOriginExtract-pool-%d").build();
-    ExecutorService threadPool = new ThreadPoolExecutor(1, 1,
+    ExecutorService threadPool = new ThreadPoolExecutor(3, 6,
             10L, TimeUnit.MINUTES,
             new LinkedBlockingQueue<>(500), namedThreadFactory, new ThreadPoolExecutor.CallerRunsPolicy());
 
@@ -98,6 +98,7 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
             }
         });
         threadPool.submit(() -> {
+            log.info("extractAll start param:{}", JSON.toJSONString(param));
             if(StringUtils.isNotBlank(param.getDateId())){
                 try {
                     factOriginTopicMainDailyService.topicCleaning(param);
@@ -110,12 +111,14 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
                     for (int i = 0; i < daysBetween.size(); i++) {
                         String dateDimId = daysBetween.get(i);
                         param.setDateId(dateDimId);
+                        log.info("extractAll cal param:{}", JSON.toJSONString(param));
                         factOriginTopicMainDailyService.topicCleaning(param);
                     }
                 } catch (Exception e) {
                     log.error("抽取【话题数据】发生异常,参数:" + JSON.toJSONString(param), e);
                 }
             }
+            log.info("extractAll end param:{}", JSON.toJSONString(param));
         });
         threadPool.submit(() -> {
             if(StringUtils.isNotBlank(param.getDateId())){