From e7fbaf892498c6c6ab95d42ed2a26207ba0331ea Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 2 Apr 2024 12:11:04 +0800 Subject: [PATCH] =?UTF-8?q?generate=20=E5=85=81=E8=AE=B8=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BB=8Elibrary=E4=B8=AD=E9=80=89=E6=8B=A9=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/da/mapper/primary/entity/Generate.java | 7 +++- .../da/service/CollectionElementService.java | 2 +- .../impl/CollectionElementServiceImpl.java | 32 +++++++++++++++---- .../da/service/impl/GenerateServiceImpl.java | 9 +++--- 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/ai/da/mapper/primary/entity/Generate.java b/src/main/java/com/ai/da/mapper/primary/entity/Generate.java index 8da4dbcb..d58d72ec 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/Generate.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Generate.java @@ -37,10 +37,15 @@ public class Generate { */ private String level1Type; + /** + * 图片来源 collection | library + */ + private String elementSource; + /** * 关联collection element id */ - private Long collectionElementId; + private Long elementId; /** * caption的内容 diff --git a/src/main/java/com/ai/da/service/CollectionElementService.java b/src/main/java/com/ai/da/service/CollectionElementService.java index 489e08f8..7f015d3b 100644 --- a/src/main/java/com/ai/da/service/CollectionElementService.java +++ b/src/main/java/com/ai/da/service/CollectionElementService.java @@ -134,6 +134,6 @@ public interface CollectionElementService extends IService { * @param level2Type * @return */ - CollectionElement editLevel2Type(Long elementId, String level2Type); + CollectionElement editLevel2Type(Long elementId, String level2Type, String designType); } diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java index 82146f3b..1a9a2357 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java @@ -26,6 +26,7 @@ import com.google.common.collect.Lists; import io.minio.errors.MinioException; import io.netty.util.internal.StringUtil; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -806,15 +807,32 @@ public class CollectionElementServiceImpl extends ServiceImpl i generateType); generate.setModelName(StringUtil.isNullOrEmpty(generateThroughImageTextDTO.getVersion()) ? ModelNameEnum.MODEL_0.getCode() : generateThroughImageTextDTO.getVersion()); generate.setCreateDate(DateUtil.getByTimeZone(generateThroughImageTextDTO.getTimeZone())); + generate.setElementSource(StringUtil.isNullOrEmpty(generateThroughImageTextDTO.getDesignType()) ? null : generateThroughImageTextDTO.getDesignType()); String text = generateThroughImageTextDTO.getText(); Long elementId = generateThroughImageTextDTO.getCollectionElementId(); validateGeneraType(generate, text, elementId, generateType); - // 2.1 sketch或print在t_collection_element表中的信息是否需要更新 如 level2Type - CollectionElement collectionElement = collectionElementService.editLevel2Type(elementId, generateThroughImageTextDTO.getLevel2Type()); + // 2.1 sketch或print在t_collection_element表/t_library表中的信息是否需要更新 如 level2Type + CollectionElement collectionElement = collectionElementService.editLevel2Type(elementId, generateThroughImageTextDTO.getLevel2Type(), generateThroughImageTextDTO.getDesignType()); // 3、向模型发起请求 int mode = GenerateModeEnum.TEXT.getValue().equals(generateType) ? @@ -180,14 +181,14 @@ public class GenerateServiceImpl extends ServiceImpl i if (Objects.isNull(elementId)) { throw new BusinessException("please.choose.an.image"); } - generate.setCollectionElementId(elementId); + generate.setElementId(elementId); break; case "text-image": if (StringUtil.isNullOrEmpty(text) || Objects.isNull(elementId)) { throw new BusinessException("please.input.the.caption.and.choose.an.image"); } generate.setText(text); - generate.setCollectionElementId(elementId); + generate.setElementId(elementId); default: } }