From 6f44489c6e483648786b808f23b7b4f13fd20e7a Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 24 Jun 2025 16:11:53 +0800 Subject: [PATCH] =?UTF-8?q?BUGFIX:=E6=B6=88=E6=81=AF=E7=9B=91=E5=90=AC?= =?UTF-8?q?=EF=BC=8C=E6=B6=88=E6=81=AF=E8=A7=A3=E6=9E=90=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=EF=BC=8C=E9=87=8D=E5=A4=8D=E6=B6=88=E8=B4=B9=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=AF=BC=E8=87=B4=E6=97=A5=E5=BF=97=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=86=85=E5=AE=B9=E9=AA=A4=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/da/common/RabbitMQ/GenerateConsumer.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java b/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java index 8c319b97..fb119b1f 100644 --- a/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java +++ b/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java @@ -71,9 +71,9 @@ public class GenerateConsumer { public void generate(Message msg, Channel channel, String consumerName) { log.info("============start listening=========="); long start = System.currentTimeMillis(); - - GenerateThroughImageTextDTO generateThroughImageTextDTO = JSONObject.parseObject(msg.getBody(), GenerateThroughImageTextDTO.class); - String uniqueId = generateThroughImageTextDTO.getUniqueId(); + Map resp = jsonBytesToMap(msg, channel); + String uniqueId = resp.get("tasks_id"); +// String uniqueId = generateThroughImageTextDTO.getUniqueId(); log.info("From " + consumerName + " : " + uniqueId); try { @@ -87,6 +87,7 @@ public class GenerateConsumer { log.error("手动确认，不返回队列重新消费"); } } else { + GenerateThroughImageTextDTO generateThroughImageTextDTO = JSONObject.parseObject(msg.getBody(), GenerateThroughImageTextDTO.class); generateService.generateThroughImageText(generateThroughImageTextDTO); // 将消息从redis排队队列中删除,需保证被消费的消息存储到db之后再从redis删除 redisUtil.removeFromZSet(consumptionOrderKey, uniqueId); @@ -101,13 +102,13 @@ public class GenerateConsumer { // 将消息从redis排队队列中删除,需保证被消费的消息存储到db之后再从redis删除 redisUtil.removeFromZSet(consumptionOrderKey, uniqueId); String key = generateResultKey + ":" + uniqueId; - GenerateResultVO generateResultVO = new GenerateResultVO(generateThroughImageTextDTO.getUniqueId(), null, null, "Fail"); + GenerateResultVO generateResultVO = new GenerateResultVO(uniqueId, null, null, "Fail"); redisUtil.addToString(key, new Gson().toJson(generateResultVO), CommonConstant.GENERATE_RESULT_EXPIRE_TIME); } catch (IOException exception) { log.error("手动确认，取消返回队列，不再重新消费"); } // 将入参和错误信息存入数据库 - String exceptionMessage = JSONObject.toJSONString(generateThroughImageTextDTO) + + String exceptionMessage = JSONObject.toJSONString(resp) + " Exception message ： " + e.getMessage(); HashMap exceptionInfo = new HashMap<>(); exceptionInfo.put(String.valueOf(uniqueId), exceptionMessage); @@ -124,7 +125,7 @@ public class GenerateConsumer { log.info("============ProcessGenerateResult listening=========="); long start = System.currentTimeMillis(); - Map generateResult = JSONObject.parseObject(msg.getBody(), Map.class); + Map generateResult = jsonBytesToMap(msg, channel); log.info("generate response : {}", generateResult); try { @@ -172,7 +173,7 @@ public class GenerateConsumer { log.info("============processToProductImageResult listening=========="); long start = System.currentTimeMillis(); - Map generateResult = JSONObject.parseObject(msg.getBody(), Map.class); + Map generateResult = jsonBytesToMap(msg, channel); log.info("toProductImage response : {}", generateResult); try { @@ -222,7 +223,7 @@ public class GenerateConsumer { log.info("============processRelightResult listening=========="); long start = System.currentTimeMillis(); - Map generateResult = JSONObject.parseObject(msg.getBody(), Map.class); + Map generateResult = jsonBytesToMap(msg, channel); log.info("toProductImage response : {}", generateResult); try {