diff --git a/src/main/java/com/ai/da/model/dto/PoseTransformDTO.java b/src/main/java/com/ai/da/model/dto/PoseTransformDTO.java index 22367894..64991fc0 100644 --- a/src/main/java/com/ai/da/model/dto/PoseTransformDTO.java +++ b/src/main/java/com/ai/da/model/dto/PoseTransformDTO.java @@ -20,9 +20,15 @@ public class PoseTransformDTO { @NotNull(message = "please select a pose") private Integer poseId; + @ApiModelProperty("模型名") private String modelName; + @ApiModelProperty("design结果在collectionSort中的id") private Long parentId; + @ApiModelProperty("子集中的元素作为父元素") private Long userLikeSortId; + + @ApiModelProperty("是否默认喜欢") + private Boolean isDefaultLike; } diff --git a/src/main/java/com/ai/da/model/dto/ToProductImageDTO.java b/src/main/java/com/ai/da/model/dto/ToProductImageDTO.java index 810f8452..4a496eb1 100644 --- a/src/main/java/com/ai/da/model/dto/ToProductImageDTO.java +++ b/src/main/java/com/ai/da/model/dto/ToProductImageDTO.java @@ -18,6 +18,9 @@ public class ToProductImageDTO { private BigDecimal imageStrengthMax; private String modelName; private String ageGroup; - + // 使用子集中的元素作为父元素 private Long userLikeSortId; + + // 是否默认like生成的元素 + private Boolean isDefaultLike; } 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 b3f962b7..a3754c17 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -1166,19 +1166,22 @@ public class GenerateServiceImpl extends ServiceImpl i poseTransformation.setIsLiked((byte)1); poseTransformation.setCreateTime(LocalDateTime.now()); poseTransformationMapper.insert(poseTransformation); - // 满足条件下添加到like - Integer sort = addPoseTransferLike(poseTransformDTO, poseTransformation.getId()); - Integer reSort = userLikeGroupService.rearrangeChildSort(poseTransformation.getId(), CollectionType.POSE_TRANSFORM.getValue(), - poseTransformDTO.getParentId(), poseTransformDTO.getUserLikeSortId()); + // 当需要默认like + ToProductImageResultVO toProductImageResultVO = new ToProductImageResultVO(); + if (Objects.nonNull(poseTransformDTO.getIsDefaultLike()) && poseTransformDTO.getIsDefaultLike()){ + // 满足条件下添加到like + Integer sort = addPoseTransferLike(poseTransformDTO, poseTransformation.getId()); + Integer reSort = userLikeGroupService.rearrangeChildSort(poseTransformation.getId(), CollectionType.POSE_TRANSFORM.getValue(), + poseTransformDTO.getParentId(), poseTransformDTO.getUserLikeSortId()); + toProductImageResultVO.setSort(Objects.isNull(reSort) ? sort : reSort); + } if (flag){ // 6、添加预扣除积分到redis creditsService.addRecordToCreditsDeduction(accountId, taskId, creditsEventsEnum); // 6.1 添加积分扣除记录到db creditsService.preInsert(accountId, creditsEventsEnum.getName(), taskId, Boolean.TRUE, null); - ToProductImageResultVO toProductImageResultVO = new ToProductImageResultVO(); toProductImageResultVO.setTaskId(taskId); - toProductImageResultVO.setSort(Objects.isNull(reSort) ? sort : reSort); // 更新项目更新时间 projectService.modifyProjectUpdateTime(projectId); return toProductImageResultVO; 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 b8b1a1d6..900a8e44 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -489,13 +489,16 @@ public class UserLikeGroupServiceImpl extends ServiceImpl