From 84780ecf3e3fe39c83a4f4d9382cbb555c8069cf Mon Sep 17 00:00:00 2001
From: zren25 <zhen.ren.2@volvocars.com>
Date: Wed, 16 Apr 2025 18:33:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=9E=E8=B0=83=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mq/AnalysisDifyCallbackMqConsumer.java    | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/AnalysisDifyCallbackMqConsumer.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/AnalysisDifyCallbackMqConsumer.java
index 35dbf3e..c5b55ba 100644
--- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/AnalysisDifyCallbackMqConsumer.java
+++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/AnalysisDifyCallbackMqConsumer.java
@@ -3,8 +3,8 @@ package com.volvo.ai.analytic.center.mq;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.volvo.ai.analytic.center.dto.req.DiFyReq;
 import com.volvo.ai.analytic.center.dto.resp.AnalysisDifyResultDTO;
+import com.volvo.ai.analytic.center.dto.resp.AnalysisResp;
 import com.volvo.ai.analytic.center.entity.AiAnalysisRequestLogs;
 import com.volvo.ai.analytic.center.service.AiAnalysisRequestLogsService;
 import com.volvo.ai.analytic.center.service.DiFyService;
@@ -15,13 +15,13 @@ import org.apache.rocketmq.spring.core.RocketMQListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.concurrent.CompletableFuture;
-
 /**
  * @ClassName AnalysisDifyMqConsumer
  * @Description AI解析MQ-Callback处理
@@ -62,11 +62,17 @@ public class AnalysisDifyCallbackMqConsumer implements RocketMQListener<MessageE
 			log.info("analysisDifyCallbackMqConsumer 当前线程: {}, 线程ID: {}", Thread.currentThread().getName(), Thread.currentThread().getId());
 			String message = new String(messageExt.getBody());
 			log.info("analysisDifyCallbackMqConsumer message: " + message);
-			AnalysisDifyResultDTO analysisResp = JSONObject.parseObject(message, AnalysisDifyResultDTO.class);
-			AiAnalysisRequestLogs aiAnalysisRequestLogs = aiAnalysisRequestLogsService.queryByAiAnalysisRequestId(analysisResp.getAiAnalysisRequestId());
-
-			ResponseEntity<String> response = restTemplate.getForEntity(aiAnalysisRequestLogs.getCallbackUrl(), String.class);
+			AnalysisDifyResultDTO analysisRestDto = JSONObject.parseObject(message, AnalysisDifyResultDTO.class);
+			AiAnalysisRequestLogs aiAnalysisRequestLogs = aiAnalysisRequestLogsService.queryByAiAnalysisRequestId(analysisRestDto.getAiAnalysisRequestId());
+			AnalysisResp analysisResp = new AnalysisResp();
+			analysisResp.setAiAnalysisRequestId(analysisRestDto.getAiAnalysisRequestId());
+			analysisResp.setData(analysisRestDto.getDifyResponse());
 
+			HttpHeaders headers = new HttpHeaders();
+			headers.set("Content-Type", "application/json");
+			// 封装请求体和请求头
+			HttpEntity<AnalysisResp> requestEntity = new HttpEntity<>(analysisResp, headers);
+			ResponseEntity<String> response = restTemplate.postForEntity(aiAnalysisRequestLogs.getCallbackUrl(), requestEntity, String.class);                         // 响应类型);
 			if (response.getStatusCode().is2xxSuccessful()) {
 				log.info("analysisDifyCallbackMqConsumer aiAnalysisRequestId：{},回调请求成功，url:{}: " ,analysisResp.getAiAnalysisRequestId(), aiAnalysisRequestLogs.getCallbackUrl());
 			} else {