diff --git a/src/main/java/com/ai/da/model/dto/ReDesignCollectionDTO.java b/src/main/java/com/ai/da/model/dto/ReDesignCollectionDTO.java index 63154c09..1011007e 100644 --- a/src/main/java/com/ai/da/model/dto/ReDesignCollectionDTO.java +++ b/src/main/java/com/ai/da/model/dto/ReDesignCollectionDTO.java @@ -43,6 +43,8 @@ public class ReDesignCollectionDTO { private String modelType; + private String modelSex; + @NotBlank(message = "singleOverall cannot be empty!") @ApiModelProperty("控制生成类型的参数,两个选项:outfit时候传 single , 另外一个传 overall") private String singleOverall; diff --git a/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java b/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java index 52152b89..4e5f5721 100644 --- a/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java +++ b/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java @@ -16,8 +16,8 @@ public class UserLikeCollectionVO { @ApiModelProperty("mood版本id 没有传null") private String moodTemplateId; - @ApiModelProperty("mood版本id 没有传null") private String moodTemplateUrl; + private String moodTemplateName; @ApiModelProperty("情绪板图片 数组") private List moodBoards; diff --git a/src/main/java/com/ai/da/model/vo/UserLikeVO.java b/src/main/java/com/ai/da/model/vo/UserLikeVO.java index ab1eaf71..3306e9da 100644 --- a/src/main/java/com/ai/da/model/vo/UserLikeVO.java +++ b/src/main/java/com/ai/da/model/vo/UserLikeVO.java @@ -22,5 +22,6 @@ public class UserLikeVO { private String url; @ApiModelProperty("图片路径") private String designOutfitUrl; + private String pictureName; } diff --git a/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java index d7adf712..3956a076 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java @@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -76,7 +77,11 @@ public class CollectionServiceImpl extends ServiceImpl> maps = collectionElements .stream() diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java index e0a80a6b..860aac1c 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -603,8 +603,8 @@ public class DesignServiceImpl extends ServiceImpl impleme Arrays.asList(CollectionLevel1TypeEnum.PRINT_BOARD.getRealName(), CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName())); //校验collection element - ValidateElementVO elementVO = collectionElementService.validateElement( - CopyUtil.copyObject(reDesignDTO, DesignCollectionDTO.class)); + DesignCollectionDTO designCollectionDTO = CopyUtil.copyObject(reDesignDTO, DesignCollectionDTO.class); + ValidateElementVO elementVO = collectionElementService.validateElement(designCollectionDTO); //计算并删除对应的未关联的element collectionElementService.batchDelete( calculateNoRelationElement(reDesignDTO.getCollectionId(), elementVO.getUsedElementIds())); 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 50ef52e7..34f836c1 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -107,6 +107,10 @@ public class UserLikeGroupServiceImpl extends ServiceImpl userLikeVOS = userLikeService.getGroupDetail(userGroupId); userLikeVOS.forEach(o -> { + if (o.getUrl().contains("/")) { + int index = o.getUrl().lastIndexOf("/"); + o.setPictureName(o.getUrl().substring(index + 1)); + } o.setDesignOutfitUrl(minioUtil.getPresignedUrl(o.getUrl(), 10)); QueryWrapper qw = new QueryWrapper<>(); qw.lambda().eq(TDesignPythonOutfit::getDesignItemId, o.getDesignItemId());