From 702990f37461da43226fc5c00593ac53615d16e6 Mon Sep 17 00:00:00 2001
From: zren25 <zhen.ren.2@volvocars.com>
Date: Thu, 3 Apr 2025 15:38:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analytic/center/mq/IntelligentCustomerMqConsumer.java  | 7 +++++--
 .../service/impl/IntelligentCustomerServiceImpl.java       | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/IntelligentCustomerMqConsumer.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/IntelligentCustomerMqConsumer.java
index 3b1e46b..62c76b3 100644
--- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/IntelligentCustomerMqConsumer.java
+++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/IntelligentCustomerMqConsumer.java
@@ -7,6 +7,7 @@ import com.volvo.ai.analytic.center.dto.req.FourInOneRequestDTO;
 import com.volvo.ai.analytic.center.service.AiAnalysisRequestLogsService;
 import com.volvo.ai.analytic.center.service.IntelligentCustomerService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
 import org.apache.rocketmq.spring.core.RocketMQListener;
@@ -73,8 +74,10 @@ public class IntelligentCustomerMqConsumer implements RocketMQListener<MessageEx
 			log.info("intelligentCustomerMqConsumer 当前线程: {}, 线程ID: {}", Thread.currentThread().getName(), Thread.currentThread().getId());
 			log.info("IntelligentCustomerMqConsumer message: " + message);
 			FourInOneRequestDTO fourRequestDTO = objectMapper.readValue(message, FourInOneRequestDTO.class);
-			intelligentCustomerService.fourInOneMqService(fourRequestDTO);
-			log.info("FourInOneRequestDTO处理完成，耗时：{}", System.currentTimeMillis() - startTime);
+			if(null != fourRequestDTO && StringUtils.isNotEmpty(fourRequestDTO.getWorkOrderContent()) && StringUtils.isNotEmpty(fourRequestDTO.getWorkOrderSource())){
+				intelligentCustomerService.fourInOneMqService(fourRequestDTO);
+				log.info("FourInOneRequestDTO处理完成，耗时：{}", System.currentTimeMillis() - startTime);
+			}
 		} catch (JsonProcessingException e) {
 			log.info(" dcc mq 处理失败：{}", e.getMessage());
 		}
diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/IntelligentCustomerServiceImpl.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/IntelligentCustomerServiceImpl.java
index 9ef5c48..a04e77d 100644
--- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/IntelligentCustomerServiceImpl.java
+++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/IntelligentCustomerServiceImpl.java
@@ -89,12 +89,13 @@ public class IntelligentCustomerServiceImpl implements IntelligentCustomerServic
 
 			RunMaskingRuleInput runMaskingRuleInput = new RunMaskingRuleInput();
 			runMaskingRuleInput.setDataMaskingRules(maskingRuleItems);
+			String yuliao = StringUtils.isNotEmpty(fourInOneRequestDTO.getRelationCorpusContent())?fourInOneRequestDTO.getRelationCorpusContent().concat(" \n  ").concat(fourInOneRequestDTO.getWorkOrderContent()):fourInOneRequestDTO.getWorkOrderContent();
 
 			Map<String, Object> inputMap = new HashMap();
 			DiFyReq diFyImageReq = new DiFyReq();
 			diFyImageReq.setUser(ConstantStr.INTELLIGENT_CUSTOMER_4IN1);
 			diFyImageReq.setFlowId(fourInOneToken);
-			inputMap.put("yuliao", fourInOneRequestDTO.getWorkOrderContent());
+			inputMap.put("yuliao", yuliao);
 			inputMap.put("laiyuan",fourInOneRequestDTO.getWorkOrderSource());
 			diFyImageReq.setInputs(inputMap);