From b8d3b0192d1fceea25a9f881a3dd8bd622fadb0a Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Fri, 6 Jun 2025 17:18:59 +0800 Subject: [PATCH] TASK:cloud; --- .../da/common/RabbitMQ/GenerateConsumer.java | 32 +++++++++---------- .../java/com/ai/da/python/PythonService.java | 2 +- 2 files changed, 17 insertions(+), 17 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 018a37c9..c5dd2be7 100644 --- a/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java +++ b/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java @@ -375,23 +375,23 @@ public class GenerateConsumer { log.info("toProductImageBatch response : {}", generateResult); try { - log.info("tasks_id : {} start ", generateResult.get("tasks_id")); + log.info("task_id : {} start ", generateResult.get("task_id")); if (!StringUtils.isEmpty(generateResult.getString("progress"))) { String progress = generateResult.getString("progress"); - JSONObject result = generateResult.getJSONObject("result_data"); + JSONObject result = generateResult.getJSONObject("result"); String url = null; if (!StringUtils.isEmpty(result)) { url = result.getString("image_url"); - String taskId = generateResult.getString("tasks_id"); + String taskId = generateResult.getString("task_id"); userLikeGroupService.toProductBatch(taskId, url, progress); } } else { // 修改redis中的数据状态为exception - String key = toProductImageResultKey + ":" + generateResult.get("tasks_id"); + String key = toProductImageResultKey + ":" + generateResult.get("task_id"); redisUtil.addToString(key, new Gson().toJson(new GenerateResultVO(generateResult.getString("tasks_id"), null, null, "Fail")), CommonConstant.GENERATE_RESULT_EXPIRE_TIME); // 将异常信息存到exception中 HashMap exceptionInfo = new HashMap<>(); - exceptionInfo.put(generateResult.getString("tasks_id"), generateResult.getString("data")); + exceptionInfo.put(generateResult.getString("task_id"), generateResult.getString("data")); // 存redis redisUtil.addToMap(exceptionMapKey, exceptionInfo); } @@ -400,7 +400,7 @@ public class GenerateConsumer { try { channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false); // 将消息从redis排队队列中删除,需保证被消费的消息存储到db之后再从redis删除 - redisUtil.removeFromZSet(consumptionOrderKey, generateResult.getString("tasks_id")); + redisUtil.removeFromZSet(consumptionOrderKey, generateResult.getString("task_id")); } catch (IOException exception) { log.error("手动确认，取消返回队列，不再重新消费"); } @@ -408,13 +408,13 @@ public class GenerateConsumer { String exceptionMessage = JSONObject.toJSONString(generateResult) + " Exception message ： " + e.getMessage(); HashMap exceptionInfo = new HashMap<>(); - exceptionInfo.put(String.valueOf(generateResult.get("tasks_id")), exceptionMessage); + exceptionInfo.put(String.valueOf(generateResult.get("task_id")), exceptionMessage); // 存redis redisUtil.addToMap(exceptionMapKey, exceptionInfo); } long end = System.currentTimeMillis(); - log.info("tasks_id : {}, end , message : {}, 执行时长： {} 毫秒", generateResult.get("tasks_id"), generateResult.get("message"), (end - start)); + log.info("task_id : {}, end , message : {}, 执行时长： {} 毫秒", generateResult.get("task_id"), generateResult.get("message"), (end - start)); log.info("============ProcessToProductImageBatchResult End listening=========="); } @@ -426,23 +426,23 @@ public class GenerateConsumer { log.info("relightBatch response : {}", generateResult); try { - log.info("task_id : {} start ", generateResult.get("tasks_id")); + log.info("task_id : {} start ", generateResult.get("task_id")); if (!StringUtils.isEmpty(generateResult.getString("progress"))) { String progress = generateResult.getString("progress"); - JSONObject result = generateResult.getJSONObject("result_data"); + JSONObject result = generateResult.getJSONObject("result"); String url = null; if (!StringUtils.isEmpty(result)) { url = result.getString("image_url"); - String taskId = generateResult.getString("tasks_id"); + String taskId = generateResult.getString("task_id"); userLikeGroupService.relightBatch(taskId, url, progress); } } else { // 修改redis中的数据状态为exception - String key = relightResultKey + ":" + generateResult.get("tasks_id"); + String key = relightResultKey + ":" + generateResult.get("task_id"); redisUtil.addToString(key, new Gson().toJson(new GenerateResultVO(generateResult.getString("tasks_id"), null, null, "Fail")), CommonConstant.GENERATE_RESULT_EXPIRE_TIME); // 将异常信息存到exception中 HashMap exceptionInfo = new HashMap<>(); - exceptionInfo.put(generateResult.getString("tasks_id"), generateResult.getString("data")); + exceptionInfo.put(generateResult.getString("task_id"), generateResult.getString("data")); // 存redis redisUtil.addToMap(exceptionMapKey, exceptionInfo); } @@ -451,7 +451,7 @@ public class GenerateConsumer { try { channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false); // 将消息从redis排队队列中删除,需保证被消费的消息存储到db之后再从redis删除 - redisUtil.removeFromZSet(consumptionOrderKey, generateResult.getString("tasks_id")); + redisUtil.removeFromZSet(consumptionOrderKey, generateResult.getString("task_id")); } catch (IOException exception) { log.error("手动确认，取消返回队列，不再重新消费"); } @@ -459,13 +459,13 @@ public class GenerateConsumer { String exceptionMessage = JSONObject.toJSONString(generateResult) + " Exception message ： " + e.getMessage(); HashMap exceptionInfo = new HashMap<>(); - exceptionInfo.put(String.valueOf(generateResult.get("tasks_id")), exceptionMessage); + exceptionInfo.put(String.valueOf(generateResult.get("task_id")), exceptionMessage); // 存redis redisUtil.addToMap(exceptionMapKey, exceptionInfo); } long end = System.currentTimeMillis(); - log.info("task_id : {}, end , message : {}, 执行时长： {} 毫秒", generateResult.get("tasks_id"), generateResult.get("message"), (end - start)); + log.info("task_id : {}, end , message : {}, 执行时长： {} 毫秒", generateResult.get("task_id"), generateResult.get("message"), (end - start)); log.info("============ProcessRelightBatchResult End listening=========="); } diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 1dd9d3ec..3fbd37c6 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -4288,7 +4288,7 @@ public class PythonService { map.put("batch_tasks_id", taskIdBatch); log.info("toProductImage请求python 参数:####{}", map); String param = JSON.toJSONString(map, SerializerFeature.WriteNullStringAsEmpty); - System.out.println(param); + System.out.println(JSONObject.toJSONString(param)); RequestBody body = RequestBody.create(mediaType, param); Request request = new Request.Builder() // .url(accessPythonIp + ":" + accessPythonPort + "/api/generate_product_image")