Commit 4c205932116fe7aa5128135d5aafc54bce488e5e
1 parent
541f6b9e
【增加】AI Image 列表兼容 Midjourney 操作按钮
Showing
2 changed files
with
29 additions
and
0 deletions
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageRespVO.java
| 1 | package cn.iocoder.yudao.module.ai.controller.admin.image.vo; | 1 | package cn.iocoder.yudao.module.ai.controller.admin.image.vo; |
| 2 | 2 | ||
| 3 | +import cn.iocoder.yudao.module.ai.client.vo.MidjourneyNotifyReqVO; | ||
| 3 | import io.swagger.v3.oas.annotations.media.Schema; | 4 | import io.swagger.v3.oas.annotations.media.Schema; |
| 4 | import lombok.Data; | 5 | import lombok.Data; |
| 5 | 6 | ||
| 7 | +import java.util.List; | ||
| 6 | import java.util.Map; | 8 | import java.util.Map; |
| 7 | 9 | ||
| 8 | @Schema(description = "管理后台 - 绘画 Response VO") | 10 | @Schema(description = "管理后台 - 绘画 Response VO") |
| @@ -45,4 +47,12 @@ public class AiImageRespVO { | @@ -45,4 +47,12 @@ public class AiImageRespVO { | ||
| 45 | @Schema(description = "绘制参数") | 47 | @Schema(description = "绘制参数") |
| 46 | private Map<String, String> options; | 48 | private Map<String, String> options; |
| 47 | 49 | ||
| 50 | + @Schema(description = "绘画 response") | ||
| 51 | + private MidjourneyNotifyReqVO response; | ||
| 52 | + | ||
| 53 | + @Schema(description = "mj 进度") | ||
| 54 | + private String progress; | ||
| 55 | + | ||
| 56 | + @Schema(description = "mj buttons 按钮") | ||
| 57 | + private List<MidjourneyNotifyReqVO.Button> buttons; | ||
| 48 | } | 58 | } |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/dataobject/image/AiImageDO.java
| 1 | package cn.iocoder.yudao.module.ai.dal.dataobject.image; | 1 | package cn.iocoder.yudao.module.ai.dal.dataobject.image; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | 3 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
| 4 | +import cn.iocoder.yudao.module.ai.client.vo.MidjourneyNotifyReqVO; | ||
| 4 | import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiChatModelDO; | 5 | import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiChatModelDO; |
| 5 | import cn.iocoder.yudao.module.ai.enums.image.AiImageStatusEnum; | 6 | import cn.iocoder.yudao.module.ai.enums.image.AiImageStatusEnum; |
| 6 | import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; | 7 | import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; |
| @@ -13,6 +14,7 @@ import lombok.Data; | @@ -13,6 +14,7 @@ import lombok.Data; | ||
| 13 | import org.springframework.ai.openai.OpenAiImageOptions; | 14 | import org.springframework.ai.openai.OpenAiImageOptions; |
| 14 | import org.springframework.ai.stabilityai.api.StabilityAiImageOptions; | 15 | import org.springframework.ai.stabilityai.api.StabilityAiImageOptions; |
| 15 | 16 | ||
| 17 | +import java.util.List; | ||
| 16 | import java.util.Map; | 18 | import java.util.Map; |
| 17 | 19 | ||
| 18 | /** | 20 | /** |
| @@ -92,6 +94,23 @@ public class AiImageDO extends BaseDO { | @@ -92,6 +94,23 @@ public class AiImageDO extends BaseDO { | ||
| 92 | @TableField(typeHandler = JacksonTypeHandler.class) | 94 | @TableField(typeHandler = JacksonTypeHandler.class) |
| 93 | private Map<String, String> options; | 95 | private Map<String, String> options; |
| 94 | 96 | ||
| 97 | + /** | ||
| 98 | + * 绘画 response | ||
| 99 | + */ | ||
| 100 | + @TableField(typeHandler = JacksonTypeHandler.class) | ||
| 101 | + private MidjourneyNotifyReqVO response; | ||
| 102 | + | ||
| 103 | + /** | ||
| 104 | + * mj 进度 | ||
| 105 | + */ | ||
| 106 | + private String progress; | ||
| 107 | + | ||
| 108 | + /** | ||
| 109 | + * mj buttons 按钮 | ||
| 110 | + */ | ||
| 111 | + @TableField(typeHandler = JacksonTypeHandler.class) | ||
| 112 | + private List<MidjourneyNotifyReqVO.Button> buttons; | ||
| 113 | + | ||
| 95 | // TODO @芋艿：再瞅瞅 | 114 | // TODO @芋艿：再瞅瞅 |
| 96 | /** | 115 | /** |
| 97 | * midjourney proxy 关联的 job id | 116 | * midjourney proxy 关联的 job id |