From 2a127b5814b023f19a0da244df12fba8808a7079 Mon Sep 17 00:00:00 2001
From: ZLI263 <zhonghua.li.2@volvocars.com>
Date: Mon, 22 Sep 2025 11:47:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E4=BB=A3=E7=A0=81=E7=9A=84?=
 =?UTF-8?q?=E5=81=A5=E5=A3=AE=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ai/analytic/center/enums/CategoryEnum.java   |  2 +-
 .../analytic/center/config/ExecutorConfig.java   |  4 ++--
 .../impl/TmNameplateCorpusServiceImpl.java       | 16 +++++++++-------
 .../TmOdsVdqwMessagearchivingServiceImpl.java    |  3 ---
 4 files changed, 12 insertions(+), 13 deletions(-)

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<TmNameplateCorpusM
 				try {
 					log.info("铭牌语料可用许可授权数，总结和分类场景={}", semaphore.availablePermits());
 					// 获取许可 - 如果没有可用许可会阻塞等待
-					semaphore.acquire();
+					// 获取许可 - 如果没有可用许可会阻塞等待
+					// 修改为带超时的获取许可方式，超时时间为1分钟
+					if (!semaphore.tryAcquire(1, TimeUnit.MINUTES)) {
+						log.warn("获取许可超时，跳过执行任务");
+						return;
+					}
 					//第一个业务场景  开始：    总结和分类业务场景
 					JSONObject execDifyFlow = diFyService.executeDifyFlow(diFyImageReq, BusinessTypeEnum.SMART_ASSISTANT_NAMEPLATE.getCode(),
 							JSONObject.toJSONString(corpusReportDTO), null);
@@ -259,9 +261,9 @@ public class TmNameplateCorpusServiceImpl extends ServiceImpl<TmNameplateCorpusM
 		try {
 
 			log.info("铭牌sendNameplateLto toJSONString :{}", execDifyFlow);
-			log.info("tmNameplateCorpus.tostrign:{}", tmNameplateCorpus.toString());
+			log.info("tmNameplateCorpus.tostrign:{}", tmNameplateCorpus);
 
-			if (execDifyFlow.get("status").equals("succeeded")) {
+			if (execDifyFlow != null && "succeeded".equals(execDifyFlow.get("status"))) {
 				String text = execDifyFlow.getString(outputsFinal);
 				// 发送MQ
 				log.info("铭牌send mq  业务类型是：{}, Json 是：{}", businessType, text);
diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmOdsVdqwMessagearchivingServiceImpl.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmOdsVdqwMessagearchivingServiceImpl.java
index f4d3063..46e6b11 100644
--- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmOdsVdqwMessagearchivingServiceImpl.java
+++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmOdsVdqwMessagearchivingServiceImpl.java
@@ -95,9 +95,6 @@ public class TmOdsVdqwMessagearchivingServiceImpl extends ServiceImpl<TmOdsVdqwM
 	@Value("${batch.threadNum}")
 	int  threadNum =2;
 
-	private Semaphore semaphore = new Semaphore(threadNum); // 限制并发数
-
-
 	String consultantIdStr ="consultantId";
 
 	@Override