From 4c205932116fe7aa5128135d5aafc54bce488e5e Mon Sep 17 00:00:00 2001
From: cherishsince <cherishsince@aliyun.com>
Date: Tue, 4 Jun 2024 17:39:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91AI=20Image?=
 =?UTF-8?q?=20=E5=88=97=E8=A1=A8=E5=85=BC=E5=AE=B9=20Midjourney=20?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/image/vo/AiImageRespVO.java         | 10 ++++++++++
 .../ai/dal/dataobject/image/AiImageDO.java    | 19 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageRespVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageRespVO.java
index 92578ce0c..e9749a21a 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageRespVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageRespVO.java
@@ -1,8 +1,10 @@
 package cn.iocoder.yudao.module.ai.controller.admin.image.vo;
 
+import cn.iocoder.yudao.module.ai.client.vo.MidjourneyNotifyReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
 import java.util.Map;
 
 @Schema(description = "管理后台 - 绘画 Response VO")
@@ -45,4 +47,12 @@ public class AiImageRespVO {
     @Schema(description = "绘制参数")
     private Map<String, String> options;
 
+    @Schema(description = "绘画 response")
+    private MidjourneyNotifyReqVO response;
+
+    @Schema(description = "mj 进度")
+    private String progress;
+
+    @Schema(description = "mj buttons 按钮")
+    private List<MidjourneyNotifyReqVO.Button> buttons;
 }
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/dataobject/image/AiImageDO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/dataobject/image/AiImageDO.java
index b4fc6676a..ee42db3ed 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/dataobject/image/AiImageDO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/dataobject/image/AiImageDO.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.ai.dal.dataobject.image;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.ai.client.vo.MidjourneyNotifyReqVO;
 import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiChatModelDO;
 import cn.iocoder.yudao.module.ai.enums.image.AiImageStatusEnum;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -13,6 +14,7 @@ import lombok.Data;
 import org.springframework.ai.openai.OpenAiImageOptions;
 import org.springframework.ai.stabilityai.api.StabilityAiImageOptions;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -92,6 +94,23 @@ public class AiImageDO extends BaseDO {
     @TableField(typeHandler = JacksonTypeHandler.class)
     private Map<String, String> options;
 
+    /**
+     * 绘画 response
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private MidjourneyNotifyReqVO response;
+
+    /**
+     * mj 进度
+     */
+    private String progress;
+
+    /**
+     * mj buttons 按钮
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<MidjourneyNotifyReqVO.Button> buttons;
+
     // TODO @芋艿：再瞅瞅
     /**
      * midjourney proxy 关联的 job id