huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-23 07:41:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

【优化】Midjourney 提交任务 保存 ImageOptions

Browse Source
This commit is contained in:
cherishsince 2024-06-05 10:44:16 +08:00
parent fb055bfbb1
commit 8727c4de92
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageMidjourneyImagineReqVO.java
View File

@ -27,10 +27,10 @@ public class AiImageMidjourneyImagineReqVO {
private String model;
@Schema(description = "图片宽度 --ar 设置")
private String width;
private Integer width;
@Schema(description = "图片高度 --ar 设置")
private String height;
private Integer height;
@Schema(description = "版本号 --v 设置")
private String version;

2
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/dataobject/image/AiImageDO.java
View File

@ -92,7 +92,7 @@ public class AiImageDO extends BaseDO {
* 2. {@link StabilityAiImageOptions}
*/
@TableField(typeHandler = JacksonTypeHandler.class)
private Map<String, String> options;
private Map<String, Object> options;
/**
* 绘画 response

19
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/image/AiImageServiceImpl.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.ai.service.image;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.exceptions.ExceptionUtil;
import cn.hutool.core.map.MapUtil;
@ -138,9 +139,9 @@ public class AiImageServiceImpl implements AiImageService {
aiImageDO.setUserId(loginUserId);
aiImageDO.setPrompt(req.getPrompt());
aiImageDO.setPlatform(AiPlatformEnum.MIDJOURNEY.getPlatform());
aiImageDO.setModel(null);
aiImageDO.setWidth(null);
aiImageDO.setHeight(null);
aiImageDO.setModel(req.getModel());
aiImageDO.setWidth(req.getWidth());
aiImageDO.setHeight(req.getHeight());
aiImageDO.setStatus(AiImageStatusEnum.IN_PROGRESS.getStatus());
// 2、保存 image
imageMapper.insert(aiImageDO);
@ -156,15 +157,23 @@ public class AiImageServiceImpl implements AiImageService {
if (!MidjourneySubmitCodeEnum.SUCCESS_CODES.contains(submitRespVO.getCode())) {
throw exception(AI_IMAGE_MIDJOURNEY_SUBMIT_FAIL, submitRespVO.getDescription());
}
// 7、构建 imageOptions 参数
MidjourneyImageOptions imageOptions = new MidjourneyImageOptions()
.setWidth(req.getWidth())
.setHeight(req.getHeight())
.setModel(req.getModel())
.setVersion(req.getVersion())
.setState(imagineReqVO.getState());
// 8、更新 taskId 和参数
imageMapper.updateById(new AiImageDO()
.setId(aiImageDO.getId())
.setTaskId(submitRespVO.getResult())
.setOptions(BeanUtil.beanToMap(imageOptions))
);
return aiImageDO.getId();
}
@Override
public void deleteImageMy(Long id, Long userId) {
// 1. 校验是否存在
@ -269,7 +278,7 @@ public class AiImageServiceImpl implements AiImageService {
* @param model
* @return
*/
private String buildParams(String width, String height, String version, MidjourneyModelEnum model) {
private String buildParams(Integer width, Integer height, String version, MidjourneyModelEnum model) {
StringBuilder params = new StringBuilder();
// --ar 来设置尺寸
params.append(String.format(" --ar %s:%s ", width, height));