From bb0a3bd1cdeb6da49c8d48502a098d9c8f468000 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Tue, 22 Jul 2025 11:09:47 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:=201=E3=80=81=E5=85=81=E8=AE=B8=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E6=B2=A1=E6=9C=89=E6=BD=98=E9=80=9A=E5=80=BC=E7=9A=84?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=202=E3=80=81getModule=E6=97=B6design?=
 =?UTF-8?q?=E5=AD=90=E5=85=83=E7=B4=A0=E5=9B=9E=E5=8F=82=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/service/impl/GenerateServiceImpl.java  |  4 ++++
 .../impl/UserLikeGroupServiceImpl.java        | 23 ++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

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 838458b5..6df88ea5 100644
--- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
@@ -1445,6 +1445,10 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
                 Long parentId = userLikeGroupService.getParentIdByElementIdAndElementType(
                         productResult.getId(), CollectionType.TO_PRODUCT_IMAGE.getValue());
                 vo.setParentId(parentId);
+                vo.setId(poseTransformation.getId());
+                vo.setModelName(poseTransformation.getModelName());
+                vo.setRelationType(Module.poseTransfer.getValue());
+                vo.setProductImage(minioUtil.getPreSignedUrl(productResult.getUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
             }
         }
     }
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 1f52f78b..0cd58cd7 100644
--- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
@@ -472,7 +472,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                         sb.append(", (Children's face:1.3)");
                     }
                     pythonService.toProductImage(tDesignPythonOutfit.getDesignUrl(), taskId, sb.toString(), toProductImageDTO.getImageStrength(), productType);
-                    toProductImageResult.setModelName("local");
+//                    toProductImageResult.setModelName("local");
                 }
 
                 toProductImageResult.setElementId(tDesignPythonOutfit.getId());
@@ -528,7 +528,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                     }
                     // 走模型
                     pythonService.toProductImage(toProductElement.getUrl(), taskId, sb.toString(), toProductImageDTO.getImageStrength(), "overall");
-                    toProductImageResult.setModelName("local");
+//                    toProductImageResult.setModelName("local");
                 }
                 toProductImageResult.setElementId(toProductElement.getId());
                 toProductImageResult.setElementType("ProductElement");
@@ -1993,6 +1993,13 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                                 toProductImageResult.setUrl(getMinioUrl(toProductImageResult.getUrl()));
                                 ToProductImageResultVO toProductImageResultVO = CopyUtil.copyObject(toProductImageResult, ToProductImageResultVO.class);
 
+                                ToProductImageRecord toProductImageRecord = toProductImageRecordMapper.selectById(toProductImageResult.getToProductImageRecordId());
+                                if (Objects.isNull(toProductImageRecord)) {
+                                    log.warn("toProductRecord不存在，projectId:{}, toProductImageResultId:{}", projectDTO.getId(), toProductImageResult.getId());
+                                    continue;
+                                }
+                                toProductImageResultVO.setPrompt(toProductImageRecord.getPrompt());
+
                                 if (toProductImageResultVO.getElementType().equals("ProductElement")) {
                                     ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResultVO.getElementId());
                                     toProductImageResultVO.setSourceUrl(getMinioUrl(toProductElement.getUrl()));
@@ -2017,6 +2024,13 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                                 toProductImageResult.setUrl(getMinioUrl(toProductImageResult.getUrl()));
                                 ToProductImageResultVO toProductImageResultVO = CopyUtil.copyObject(toProductImageResult, ToProductImageResultVO.class);
 
+                                ToProductImageRecord toProductImageRecord = toProductImageRecordMapper.selectById(toProductImageResult.getToProductImageRecordId());
+                                if (Objects.isNull(toProductImageRecord)) {
+                                    log.warn("toProductRecord不存在，projectId:{}, toProductImageResultId:{}", projectDTO.getId(), toProductImageResult.getId());
+                                    continue;
+                                }
+                                toProductImageResultVO.setPrompt(toProductImageRecord.getPrompt());
+
                                 if (toProductImageResultVO.getElementType().equals("ProductElement")) {
                                     ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResultVO.getElementId());
                                     toProductImageResultVO.setSourceUrl(getMinioUrl(toProductElement.getUrl()));
@@ -2052,6 +2066,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                                 poseTransformationVO.setRelationType(userLikeSort.getRelationType());
                                 poseTransformationVO.setResultType(CollectionType.POSE_TRANSFORM.getValue());
                                 poseTransformationVO.setParentId(userLikeSort.getParentId());
+                                poseTransformationVO.setModelName(item.getModelName());
+                                poseTransformationVO.setPoseId(item.getPoseId());
                                 childList.add(poseTransformationVO);
                             }
                         }
@@ -2389,7 +2405,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
             Set<Long> old = collectionElements.stream().map(CollectionElement::getId).collect(Collectors.toSet());
 
             for (CollectionColorDTO board : colorBoards) {
-                if (old.contains(Long.valueOf(board.getId()))) {
+                if (Objects.nonNull(board.getId()) && old.contains(Long.valueOf(board.getId()))) {
+                    // ???
                     old.remove(Long.valueOf(board.getId()));
                 }else {
                     CollectionElement collectionElement = new CollectionElement();