diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/enums/CategoryEnum.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/enums/CategoryEnum.java index 3325388..4bddd9e 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/enums/CategoryEnum.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/enums/CategoryEnum.java @@ -5,7 +5,7 @@ public enum CategoryEnum { ENTERPRISE_WECHAT("enterprise_wechat", "企微记录"), ENTERPRISE_WECHAT_PORTRAIT("enterprise_wechat_portrait", "企微语料客户画像"), PHONE_VOICE("phone_voice", "语音电话"), - PORTRAIT_ALLIN("portrait_allin", "语音电话,用户画像"), + PORTRAIT_ALLIN("portrait_allin", "综合allin,用户画像"), NAMEPLATE_VOICE("nameplate_voice", "铭牌"), NAMEPLATE_VOICE_PORTRAIT("nameplate_voice_portrait", "铭牌客户画像"), diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/ExecutorConfig.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/ExecutorConfig.java index 3247e21..f3ad6e7 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/ExecutorConfig.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/ExecutorConfig.java @@ -24,7 +24,7 @@ public class ExecutorConfig { private int maxPoolSize; @Value("${task.pool.keepAliveSeconds}") - private int keepAliveSeconds=6000000; + private int keepAliveSeconds=120; @Value("${task.pool.queueCapacity}") private int queueCapacity; @@ -97,7 +97,7 @@ public class ExecutorConfig { try { // 等待所有任务完成,最多等待30秒 - if (!threadPoolExecutor.awaitTermination(30, TimeUnit.SECONDS)) { + if (!threadPoolExecutor.awaitTermination(120, TimeUnit.SECONDS)) { log.warn("线程池未能在30秒内正常关闭,强制关闭"); threadPoolExecutor.shutdownNow(); } diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmNameplateCorpusServiceImpl.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmNameplateCorpusServiceImpl.java index d99b59f..7200450 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmNameplateCorpusServiceImpl.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmNameplateCorpusServiceImpl.java @@ -28,10 +28,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.time.LocalDate; import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Semaphore; +import java.util.concurrent.*; /** @@ -183,7 +180,12 @@ public class TmNameplateCorpusServiceImpl extends ServiceImpl