Commit 1a7446b914d6a32dfc241ba641732f35bbe06558
1 parent
6e3f34b0
【定义】定义 midjourney 相关功能操作api
Showing
6 changed files
with
81 additions
and
15 deletions
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/AiImageController.java
| ... | ... | @@ -3,17 +3,14 @@ package cn.iocoder.yudao.module.ai.controller.admin.image; |
| 3 | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | 4 | import cn.iocoder.yudao.module.ai.controller.admin.image.vo.AiImageDallDrawingReqVO; |
| 5 | 5 | import cn.iocoder.yudao.module.ai.controller.admin.image.vo.AiImageDallDrawingRespVO; |
| 6 | -import cn.iocoder.yudao.module.ai.controller.admin.image.vo.AiImageMidjourneyReq; | |
| 6 | +import cn.iocoder.yudao.module.ai.controller.admin.image.vo.AiImageMidjourneyReqVO; | |
| 7 | 7 | import cn.iocoder.yudao.module.ai.service.AiImageService; |
| 8 | 8 | import io.swagger.v3.oas.annotations.Operation; |
| 9 | 9 | import io.swagger.v3.oas.annotations.tags.Tag; |
| 10 | 10 | import lombok.AllArgsConstructor; |
| 11 | 11 | import lombok.extern.slf4j.Slf4j; |
| 12 | 12 | import org.springframework.validation.annotation.Validated; |
| 13 | -import org.springframework.web.bind.annotation.PostMapping; | |
| 14 | -import org.springframework.web.bind.annotation.RequestBody; | |
| 15 | -import org.springframework.web.bind.annotation.RequestMapping; | |
| 16 | -import org.springframework.web.bind.annotation.RestController; | |
| 13 | +import org.springframework.web.bind.annotation.*; | |
| 17 | 14 | |
| 18 | 15 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 19 | 16 | |
| ... | ... | @@ -40,10 +37,34 @@ public class AiImageController { |
| 40 | 37 | return aiImageService.dallDrawing(req); |
| 41 | 38 | } |
| 42 | 39 | |
| 43 | - @Operation(summary = "midjourney", description = "midjourney图片绘画流程:1、提交任务 2、获取完成的任务 3、选择对应功能 4、获取最终结果") | |
| 40 | + @Operation(summary = "midjourney绘画", description = "midjourney图片绘画流程:1、提交任务 2、获取完成的任务 3、选择对应功能 4、获取最终结果") | |
| 44 | 41 | @PostMapping("/midjourney") |
| 45 | - public CommonResult<Void> midjourney(@Validated @RequestBody AiImageMidjourneyReq req) { | |
| 42 | + public CommonResult<Void> midjourney(@Validated @RequestBody AiImageMidjourneyReqVO req) { | |
| 46 | 43 | aiImageService.midjourney(req); |
| 47 | 44 | return success(null); |
| 48 | 45 | } |
| 46 | + | |
| 47 | + @Operation(summary = "midjourney绘画操作", description = "一般有选择图片、放大、换一批...") | |
| 48 | + @PostMapping("/midjourney-operate") | |
| 49 | + public CommonResult<Void> midjourneyOperate(@Validated @RequestBody AiImageMidjourneyReqVO req) { | |
| 50 | + return success(null); | |
| 51 | + } | |
| 52 | + | |
| 53 | + @Operation(summary = "获取midjourney绘画列表", description = "获取 Midjourney 绘画列表") | |
| 54 | + @GetMapping("/get-midjourney-list") | |
| 55 | + public CommonResult<Void> getMidjourneyList(@Validated @RequestBody AiImageMidjourneyReqVO req) { | |
| 56 | + return success(null); | |
| 57 | + } | |
| 58 | + | |
| 59 | + @Operation(summary = "取消 midjourney 绘画", description = "取消 midjourney 绘画") | |
| 60 | + @PostMapping("/cancel-midjourney") | |
| 61 | + public CommonResult<Void> cancelMidjourney(@RequestParam("id") Long id) { | |
| 62 | + return success(null); | |
| 63 | + } | |
| 64 | + | |
| 65 | + @Operation(summary = "删除绘画记录", description = "") | |
| 66 | + @DeleteMapping("/delete") | |
| 67 | + public CommonResult<Void> delete(@RequestParam("id") Long id) { | |
| 68 | + return success(null); | |
| 69 | + } | |
| 49 | 70 | } | ... | ... |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageMidjourneyReq.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageMidjourneyListReqVO.java
| 1 | 1 | package cn.iocoder.yudao.module.ai.controller.admin.image.vo; |
| 2 | 2 | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 3 | 4 | import io.swagger.v3.oas.annotations.media.Schema; |
| 4 | 5 | import lombok.Data; |
| 5 | 6 | import lombok.experimental.Accessors; |
| ... | ... | @@ -13,9 +14,6 @@ import lombok.experimental.Accessors; |
| 13 | 14 | */ |
| 14 | 15 | @Data |
| 15 | 16 | @Accessors(chain = true) |
| 16 | -public class AiImageMidjourneyReq { | |
| 17 | - | |
| 18 | - @Schema(description = "提示词") | |
| 19 | - private String prompt; | |
| 17 | +public class AiImageMidjourneyListReqVO extends PageParam { | |
| 20 | 18 | |
| 21 | 19 | } | ... | ... |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageMidjourneyListRespVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.ai.controller.admin.image.vo; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | +import lombok.Data; | |
| 5 | +import lombok.experimental.Accessors; | |
| 6 | + | |
| 7 | +/** | |
| 8 | + * midjourney req | |
| 9 | + * | |
| 10 | + * @author fansili | |
| 11 | + * @time 2024/4/28 17:42 | |
| 12 | + * @since 1.0 | |
| 13 | + */ | |
| 14 | +@Data | |
| 15 | +@Accessors(chain = true) | |
| 16 | +public class AiImageMidjourneyListRespVO extends PageParam { | |
| 17 | + | |
| 18 | +} | ... | ... |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageMidjourneyReqVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.ai.controller.admin.image.vo; | |
| 2 | + | |
| 3 | +import io.swagger.v3.oas.annotations.media.Schema; | |
| 4 | +import lombok.Data; | |
| 5 | +import lombok.experimental.Accessors; | |
| 6 | + | |
| 7 | +/** | |
| 8 | + * midjourney req | |
| 9 | + * | |
| 10 | + * @author fansili | |
| 11 | + * @time 2024/4/28 17:42 | |
| 12 | + * @since 1.0 | |
| 13 | + */ | |
| 14 | +@Data | |
| 15 | +@Accessors(chain = true) | |
| 16 | +public class AiImageMidjourneyReqVO { | |
| 17 | + | |
| 18 | + @Schema(description = "提示词") | |
| 19 | + private String prompt; | |
| 20 | + | |
| 21 | + @Schema(description = "绘画比例 1:1、3:4、4:3、9:16、16:9") | |
| 22 | + private String size; | |
| 23 | + | |
| 24 | + @Schema(description = "风格") | |
| 25 | + private String style; | |
| 26 | + | |
| 27 | + @Schema(description = "参考图") | |
| 28 | + private String referImage; | |
| 29 | +} | ... | ... |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/AiImageService.java
| ... | ... | @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.ai.service; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.yudao.module.ai.controller.admin.image.vo.AiImageDallDrawingReqVO; |
| 4 | 4 | import cn.iocoder.yudao.module.ai.controller.admin.image.vo.AiImageDallDrawingRespVO; |
| 5 | -import cn.iocoder.yudao.module.ai.controller.admin.image.vo.AiImageMidjourneyReq; | |
| 5 | +import cn.iocoder.yudao.module.ai.controller.admin.image.vo.AiImageMidjourneyReqVO; | |
| 6 | 6 | |
| 7 | 7 | /** |
| 8 | 8 | * ai 作图 |
| ... | ... | @@ -26,5 +26,5 @@ public interface AiImageService { |
| 26 | 26 | * @param req |
| 27 | 27 | * @return |
| 28 | 28 | */ |
| 29 | - void midjourney(AiImageMidjourneyReq req); | |
| 29 | + void midjourney(AiImageMidjourneyReqVO req); | |
| 30 | 30 | } | ... | ... |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiImageServiceImpl.java
| ... | ... | @@ -16,7 +16,7 @@ import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; |
| 16 | 16 | import cn.iocoder.yudao.module.ai.ErrorCodeConstants; |
| 17 | 17 | import cn.iocoder.yudao.module.ai.controller.admin.image.vo.AiImageDallDrawingReqVO; |
| 18 | 18 | import cn.iocoder.yudao.module.ai.controller.admin.image.vo.AiImageDallDrawingRespVO; |
| 19 | -import cn.iocoder.yudao.module.ai.controller.admin.image.vo.AiImageMidjourneyReq; | |
| 19 | +import cn.iocoder.yudao.module.ai.controller.admin.image.vo.AiImageMidjourneyReqVO; | |
| 20 | 20 | import cn.iocoder.yudao.module.ai.convert.AiImageConvert; |
| 21 | 21 | import cn.iocoder.yudao.module.ai.dal.dataobject.image.AiImageDO; |
| 22 | 22 | import cn.iocoder.yudao.module.ai.dal.mysql.AiImageMapper; |
| ... | ... | @@ -96,7 +96,7 @@ public class AiImageServiceImpl implements AiImageService { |
| 96 | 96 | |
| 97 | 97 | @Override |
| 98 | 98 | @Transactional(rollbackFor = Exception.class) |
| 99 | - public void midjourney(AiImageMidjourneyReq req) { | |
| 99 | + public void midjourney(AiImageMidjourneyReqVO req) { | |
| 100 | 100 | // 保存数据库 |
| 101 | 101 | AiImageDO aiImageDO = doSave(req.getPrompt(), null, "midjoureny", |
| 102 | 102 | null, AiChatDrawingStatusEnum.SUBMIT, null); | ... | ... |