diff --git a/src/main/java/com/ai/da/model/vo/MagicToolResultVO.java b/src/main/java/com/ai/da/model/vo/MagicToolResultVO.java index 6b3fba0c..6cc4392f 100644 --- a/src/main/java/com/ai/da/model/vo/MagicToolResultVO.java +++ b/src/main/java/com/ai/da/model/vo/MagicToolResultVO.java @@ -1,10 +1,13 @@ package com.ai.da.model.vo; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.math.BigDecimal; + @Data @ApiModel("generate result 响应") @AllArgsConstructor @@ -31,6 +34,15 @@ public class MagicToolResultVO { private Long parentId; + private Double brightenValue; + + private BigDecimal imageStrength; + + private String direction; + + @ApiModelProperty("用户输入的提示词") + private String prompt; + public MagicToolResultVO(String taskId, String status) { this.taskId = taskId; this.status = status; diff --git a/src/main/java/com/ai/da/model/vo/PoseTransformationVO.java b/src/main/java/com/ai/da/model/vo/PoseTransformationVO.java index 9fb10d11..d5a28a77 100644 --- a/src/main/java/com/ai/da/model/vo/PoseTransformationVO.java +++ b/src/main/java/com/ai/da/model/vo/PoseTransformationVO.java @@ -34,6 +34,10 @@ public class PoseTransformationVO implements AllCollectionVO{ private Long parentId; + private String modelName; + + private int poseId; + public PoseTransformationVO(Long id, String taskId, String gifUrl, String videoUrl, String firstFrameUrl, byte isLiked, String status) { this.id = id; this.taskId = taskId; diff --git a/src/main/java/com/ai/da/model/vo/ToProductImageResultVO.java b/src/main/java/com/ai/da/model/vo/ToProductImageResultVO.java index 5be3caf5..b9d7f90c 100644 --- a/src/main/java/com/ai/da/model/vo/ToProductImageResultVO.java +++ b/src/main/java/com/ai/da/model/vo/ToProductImageResultVO.java @@ -1,6 +1,7 @@ package com.ai.da.model.vo; import com.ai.da.mapper.primary.entity.ToProductImageResult; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @@ -11,4 +12,6 @@ public class ToProductImageResultVO extends ToProductImageResult implements AllC private Long userLikeSortId; private String relationType; private Long parentId; + @ApiModelProperty("用户输入的提示词") + private String prompt; } diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index 731a8022..bd307380 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -1309,6 +1309,8 @@ public class GenerateServiceImpl extends ServiceImpl i String key = generateResultKey + ":" + taskId; PoseTransformationVO poseTransformationVO = new PoseTransformationVO( poseTransformation.getId(), taskId, gifUrl, videoUrl, imageUrl, (byte) 0, "Success"); + poseTransformationVO.setPoseId(poseTransformation.getPoseId()); + poseTransformationVO.setModelName(poseTransformation.getModelName()); // 2、更新redis redisUtil.addToString(key, new Gson().toJson(poseTransformationVO), CommonConstant.GENERATE_RESULT_EXPIRE_TIME); @@ -2243,6 +2245,7 @@ public class GenerateServiceImpl extends ServiceImpl i List poseTransformations = poseTransformationMapper.selectList(new QueryWrapper().eq("unique_id", taskId).orderByDesc("id")); if (!poseTransformations.isEmpty()) { PoseTransformation poseTransformation = poseTransformations.get(0); + poseTransformationVO = CopyUtil.copyObject(poseTransformation, PoseTransformationVO.class); // 生成视频的gif和第一帧图片 processVideo(videoUrl, poseTransformation); poseTransformationVO.setId(poseTransformation.getId()); diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java index 7d462092..1f52f78b 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -749,6 +749,10 @@ public class UserLikeGroupServiceImpl extends ServiceImpl