aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUGFIX: 1、允许存储没有潘通值的颜色

Browse Source 
2、getModule时design子元素回参增加
This commit is contained in:
xupei
2025-07-22 11:09:47 +08:00
parent 3bd9ff82d7
commit bb0a3bd1cd
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
View File

@@ -1445,6 +1445,10 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
Long parentId = userLikeGroupService.getParentIdByElementIdAndElementType( Long parentId = userLikeGroupService.getParentIdByElementIdAndElementType(
productResult.getId(), CollectionType.TO_PRODUCT_IMAGE.getValue()); productResult.getId(), CollectionType.TO_PRODUCT_IMAGE.getValue());
vo.setParentId(parentId); 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));
} }
} }
} }

23
src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
View File

@@ -472,7 +472,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
sb.append(", (Children's face:1.3)"); sb.append(", (Children's face:1.3)");
} }
pythonService.toProductImage(tDesignPythonOutfit.getDesignUrl(), taskId, sb.toString(), toProductImageDTO.getImageStrength(), productType); pythonService.toProductImage(tDesignPythonOutfit.getDesignUrl(), taskId, sb.toString(), toProductImageDTO.getImageStrength(), productType);
toProductImageResult.setModelName("local"); // toProductImageResult.setModelName("local");
} }
toProductImageResult.setElementId(tDesignPythonOutfit.getId()); 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"); pythonService.toProductImage(toProductElement.getUrl(), taskId, sb.toString(), toProductImageDTO.getImageStrength(), "overall");
toProductImageResult.setModelName("local"); // toProductImageResult.setModelName("local");
} }
toProductImageResult.setElementId(toProductElement.getId()); toProductImageResult.setElementId(toProductElement.getId());
toProductImageResult.setElementType("ProductElement"); toProductImageResult.setElementType("ProductElement");
@@ -1993,6 +1993,13 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
toProductImageResult.setUrl(getMinioUrl(toProductImageResult.getUrl())); toProductImageResult.setUrl(getMinioUrl(toProductImageResult.getUrl()));
ToProductImageResultVO toProductImageResultVO = CopyUtil.copyObject(toProductImageResult, ToProductImageResultVO.class); 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")) { if (toProductImageResultVO.getElementType().equals("ProductElement")) {
ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResultVO.getElementId()); ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResultVO.getElementId());
toProductImageResultVO.setSourceUrl(getMinioUrl(toProductElement.getUrl())); toProductImageResultVO.setSourceUrl(getMinioUrl(toProductElement.getUrl()));
@@ -2017,6 +2024,13 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
toProductImageResult.setUrl(getMinioUrl(toProductImageResult.getUrl())); toProductImageResult.setUrl(getMinioUrl(toProductImageResult.getUrl()));
ToProductImageResultVO toProductImageResultVO = CopyUtil.copyObject(toProductImageResult, ToProductImageResultVO.class); 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")) { if (toProductImageResultVO.getElementType().equals("ProductElement")) {
ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResultVO.getElementId()); ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResultVO.getElementId());
toProductImageResultVO.setSourceUrl(getMinioUrl(toProductElement.getUrl())); toProductImageResultVO.setSourceUrl(getMinioUrl(toProductElement.getUrl()));
@@ -2052,6 +2066,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
poseTransformationVO.setRelationType(userLikeSort.getRelationType()); poseTransformationVO.setRelationType(userLikeSort.getRelationType());
poseTransformationVO.setResultType(CollectionType.POSE_TRANSFORM.getValue()); poseTransformationVO.setResultType(CollectionType.POSE_TRANSFORM.getValue());
poseTransformationVO.setParentId(userLikeSort.getParentId()); poseTransformationVO.setParentId(userLikeSort.getParentId());
poseTransformationVO.setModelName(item.getModelName());
poseTransformationVO.setPoseId(item.getPoseId());
childList.add(poseTransformationVO); 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()); Set<Long> old = collectionElements.stream().map(CollectionElement::getId).collect(Collectors.toSet());
for (CollectionColorDTO board : colorBoards) { 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())); old.remove(Long.valueOf(board.getId()));
}else { }else {
CollectionElement collectionElement = new CollectionElement(); CollectionElement collectionElement = new CollectionElement();