From bb5a2c4a91677ac6673d0946015dbe50b98d6c35 Mon Sep 17 00:00:00 2001
From: ZLI263 <zhonghua.li.2@volvocars.com>
Date: Thu, 18 Sep 2025 18:14:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=AD=E7=89=8C=E5=B9=B6=E5=8F=91=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=20=E4=BC=81=E5=BE=AE=E4=BC=81=E5=BE=AE?=
 =?UTF-8?q?=E8=AF=AD=E6=96=99=E9=97=AE=E9=A2=98=20=EF=BC=8C=E5=8A=A0?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/TmNameplateCorpusServiceImpl.java      |  5 +++--
 .../TmOdsVdqwMessagearchivingServiceImpl.java   | 17 +++++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

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 8f834d0..5ee85a1 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
@@ -72,6 +72,8 @@ public class TmNameplateCorpusServiceImpl extends ServiceImpl<TmNameplateCorpusM
     private String outputsFinal = "outputs";
     private String aiAnalysisRequestIdFinal = "aiAnalysisRequestId";
 
+    // 使用多线程并行执行两个业务场景
+    ExecutorService executorService = Executors.newFixedThreadPool(2);
 
     @Override
     public void runNameplateCorpusDifyRetry(String paramJson) {
@@ -164,8 +166,7 @@ public class TmNameplateCorpusServiceImpl extends ServiceImpl<TmNameplateCorpusM
             corpusReportDTO.setCarModel(carModel);
             // 获取配置
 
-            // 使用多线程并行执行两个业务场景
-            ExecutorService executorService = Executors.newFixedThreadPool(2);
+
             log.info("铭牌语料第1个业务场景， 优先执行。 ");
             long startTime = System.currentTimeMillis();
             CompletableFuture.runAsync(() -> {
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 9fc1e49..bbf89b3 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
@@ -188,8 +188,12 @@ public class TmOdsVdqwMessagearchivingServiceImpl extends ServiceImpl<TmOdsVdqwM
 				List<DataMaskingRule> maskingRuleItems = dataMaskingRuleService.getDataMaskingRuleListByApplicationChannel(BusinessTypeEnum.SMART_ASSISTANT_QIWEI.getCode());
 				RunMaskingRuleInput runMaskingRuleInput = new RunMaskingRuleInput();
 				runMaskingRuleInput.setDataMaskingRules(maskingRuleItems);
-
+				chatList = new StringBuffer();
+				StringBuffer chatList2 = new StringBuffer();
+				StringBuffer chatList3 = new StringBuffer();
+				StringBuffer chatList4 = new StringBuffer();
 				AtomicInteger externalcontactCount = new AtomicInteger();
+				StringBuffer finalChatList = chatList;
 				contetnList.forEach(contentItem -> {
 					String title = "";
 					if (tmOdsVdqwExternalcontact.getExternalUserId().equals(contentItem.getFromUserId())) {
@@ -204,8 +208,12 @@ public class TmOdsVdqwMessagearchivingServiceImpl extends ServiceImpl<TmOdsVdqwM
 					String chat = title.concat(content);
 					runMaskingRuleInput.setOldStr(chat);
 					String corpusChat = dataMaskingRuleService.runMaskingRule(runMaskingRuleInput);
-					chatList.append(corpusChat).append("\n");
-					log.info("第几循环次数{} ，掩码前：{} ,掩码后：{},合并后的总语料数据 ：{}", externalcontactCount.get(),  chat,corpusChat,chatList.toString());
+					finalChatList.append(corpusChat).append("\n");
+					chatList2.append(corpusChat).append("#########################");
+					chatList3.append(corpusChat).append("\n");
+					chatList4.append(corpusChat).append("\r");
+					log.info("第几循环次数{} ，掩码前：{} ,掩码后：{},合并后的总语料数据 ：{}", externalcontactCount.get(),  chat,corpusChat, finalChatList.toString());
+					log.info("chatList2:  {} ,chatList3：{} ,chatList4：{},", chatList2,  chatList3,chatList2.toString(), finalChatList.toString());
 				});
 				if (externalcontactCount.get() < 1) {
 					log.info("没有客户回复的语料，无需解析");
@@ -246,8 +254,9 @@ public class TmOdsVdqwMessagearchivingServiceImpl extends ServiceImpl<TmOdsVdqwM
 		long startTime2 = System.currentTimeMillis();
 		OdsVdqwMessageOTD finalMaxMsgTimeItem2 = finalMaxMsgTimeItem;
 		String finalUnionId = unionId;
+		StringBuffer finalChatList1 = chatList;
 		CompletableFuture<Void> portraitTask = CompletableFuture.runAsync(() -> {
-			executePortraitTask(finalUnionId, finalMaxMsgTimeItem2, chatList, corpusReportDTO);
+			executePortraitTask(finalUnionId, finalMaxMsgTimeItem2, finalChatList1, corpusReportDTO);
 		}, executor);
 
 		// 等待两个任务完成