From 1f77500d61e2dd434f8e61c04585db9bb3ee2f9a Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Tue, 8 Jul 2025 11:39:05 +0800
Subject: [PATCH] =?UTF-8?q?TASK:product/relight/pose=20transfer=E7=9A=84?=
 =?UTF-8?q?=E5=85=A5=E5=8F=82=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E9=BB=98=E8=AE=A4like?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ai/da/model/dto/PoseTransformDTO.java |  6 ++
 .../ai/da/model/dto/ToProductImageDTO.java    |  5 +-
 .../da/service/impl/GenerateServiceImpl.java  | 15 ++--
 .../impl/UserLikeGroupServiceImpl.java        | 69 +++++++++++--------
 4 files changed, 59 insertions(+), 36 deletions(-)

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<GenerateMapper, Generate> 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<UserLikeGroupMapper, U
                 toProductImageResult.setResultType(CollectionType.TO_PRODUCT_IMAGE.getValue());
                 toProductImageResultMapper.insert(toProductImageResult);
 //                toProductImageResult.setUrl(minioUtil.getPresignedUrl(toProductImageResult.getUrl(), 24 * 60));
-                // 满足条件情况下默认添加到like
-                Integer sort = addToProductLike(toProductImageVO.getParentId(), toProductImageResult.getId(), toProductImageDTO.getProjectId());
-                // 重新排序
-                Integer reSort = rearrangeChildSort(toProductImageResult.getId(), CollectionType.TO_PRODUCT_IMAGE.getValue(),
-                        toProductImageVO.getParentId(), toProductImageVO.getUserLikeSortId());
-                // 将生成结果的排序返回
-                toProductImageResult.setSort(Objects.isNull(reSort) ? sort : reSort);
+                // 先判断是否需要默认like
+                if (Objects.nonNull(toProductImageDTO.getIsDefaultLike()) && toProductImageDTO.getIsDefaultLike()){
+                    // 满足条件情况下默认添加到like
+                    Integer sort = addToProductLike(toProductImageVO.getParentId(), toProductImageResult.getId(), toProductImageDTO.getProjectId());
+                    // 重新排序
+                    Integer reSort = rearrangeChildSort(toProductImageResult.getId(), CollectionType.TO_PRODUCT_IMAGE.getValue(),
+                            toProductImageVO.getParentId(), toProductImageVO.getUserLikeSortId());
+                    // 将生成结果的排序返回
+                    toProductImageResult.setSort(Objects.isNull(reSort) ? sort : reSort);
+                }
                 result.add(toProductImageResult);
             }else {
                 if (StringUtils.isEmpty(prompt)) {
@@ -536,13 +539,16 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                 toProductImageResult.setResultType(CollectionType.TO_PRODUCT_IMAGE.getValue());
                 toProductImageResultMapper.insert(toProductImageResult);
 //                toProductImageResult.setUrl(minioUtil.getPresignedUrl(toProductImageResult.getUrl(), 24 * 60));
-                // 满足条件情况下默认添加到like
-                Integer sort = addToProductLike(toProductImageVO.getParentId(), toProductImageResult.getId(), toProductImageDTO.getProjectId());
-                // 重新排序
-                Integer reSort = rearrangeChildSort(toProductImageResult.getId(), CollectionType.TO_PRODUCT_IMAGE.getValue(),
-                        toProductImageVO.getParentId(), toProductImageVO.getUserLikeSortId());
-                // 将生成结果的排序返回
-                toProductImageResult.setSort(Objects.isNull(reSort) ? sort : reSort);
+                // 先判断是否需要默认like
+                if (Objects.nonNull(toProductImageDTO.getIsDefaultLike()) && toProductImageDTO.getIsDefaultLike()){
+                    // 满足条件情况下默认添加到like
+                    Integer sort = addToProductLike(toProductImageVO.getParentId(), toProductImageResult.getId(), toProductImageDTO.getProjectId());
+                    // 重新排序
+                    Integer reSort = rearrangeChildSort(toProductImageResult.getId(), CollectionType.TO_PRODUCT_IMAGE.getValue(),
+                            toProductImageVO.getParentId(), toProductImageVO.getUserLikeSortId());
+                    // 将生成结果的排序返回
+                    toProductImageResult.setSort(Objects.isNull(reSort) ? sort : reSort);
+                }
                 result.add(toProductImageResult);
             }
             i ++;
@@ -1130,14 +1136,16 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                 toProductImageResult.setResultType(CollectionType.RELIGHT.getValue());
                 toProductImageResultMapper.insert(toProductImageResult);
 //                toProductImageResult.setUrl(minioUtil.getPresignedUrl(toProductImageResult.getUrl(), 24 * 60));
-
-                // 满足条件情况下默认添加到like
-                Integer sort = addToProductLike(toProductImageVO.getParentId(), toProductImageResult.getId(), toProductImageDTO.getProjectId());
-                // 重新排序
-                Integer reSort = rearrangeChildSort(toProductImageResult.getId(), CollectionType.RELIGHT.getValue(),
-                        toProductImageVO.getParentId(), toProductImageVO.getUserLikeSortId());
-                // 将生成结果的排序返回
-                toProductImageResult.setSort(Objects.isNull(reSort) ? sort : reSort);
+                // 先判断是否需要默认like
+                if (Objects.nonNull(toProductImageDTO.getIsDefaultLike()) && toProductImageDTO.getIsDefaultLike()){
+                    // 满足条件情况下默认添加到like
+                    Integer sort = addToProductLike(toProductImageVO.getParentId(), toProductImageResult.getId(), toProductImageDTO.getProjectId());
+                    // 重新排序
+                    Integer reSort = rearrangeChildSort(toProductImageResult.getId(), CollectionType.RELIGHT.getValue(),
+                            toProductImageVO.getParentId(), toProductImageVO.getUserLikeSortId());
+                    // 将生成结果的排序返回
+                    toProductImageResult.setSort(Objects.isNull(reSort) ? sort : reSort);
+                }
                 result.add(toProductImageResult);
             }else {
                 ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageVO.getElementId());
@@ -1168,13 +1176,16 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                 toProductImageResult.setResultType(CollectionType.RELIGHT.getValue());
                 toProductImageResultMapper.insert(toProductImageResult);
 //                toProductImageResult.setUrl(minioUtil.getPresignedUrl(toProductImageResult.getUrl(), 24 * 60));
-                // 满足条件情况下默认添加到like
-                Integer sort = addToProductLike(toProductImageVO.getParentId(), toProductImageResult.getId(), toProductImageDTO.getProjectId());
-                // 重新排序
-                Integer reSort = rearrangeChildSort(toProductImageResult.getId(), CollectionType.RELIGHT.getValue(),
-                        toProductImageVO.getParentId(), toProductImageVO.getUserLikeSortId());
-                // 将生成结果的排序返回
-                toProductImageResult.setSort(Objects.isNull(reSort) ? sort : reSort);
+                // 先判断是否需要默认like
+                if (Objects.nonNull(toProductImageDTO.getIsDefaultLike()) && toProductImageDTO.getIsDefaultLike()){
+                    // 满足条件情况下默认添加到like
+                    Integer sort = addToProductLike(toProductImageVO.getParentId(), toProductImageResult.getId(), toProductImageDTO.getProjectId());
+                    // 重新排序
+                    Integer reSort = rearrangeChildSort(toProductImageResult.getId(), CollectionType.RELIGHT.getValue(),
+                            toProductImageVO.getParentId(), toProductImageVO.getUserLikeSortId());
+                    // 将生成结果的排序返回
+                    toProductImageResult.setSort(Objects.isNull(reSort) ? sort : reSort);
+                }
                 result.add(toProductImageResult);
             }
             // 添加需要扣除的积分到预扣除区