diff --git a/src/main/java/com/ai/da/model/dto/GenerateLikeDTO.java b/src/main/java/com/ai/da/model/dto/GenerateLikeDTO.java index 58734272..9e76dae3 100644 --- a/src/main/java/com/ai/da/model/dto/GenerateLikeDTO.java +++ b/src/main/java/com/ai/da/model/dto/GenerateLikeDTO.java @@ -22,6 +22,9 @@ public class GenerateLikeDTO { @ApiModelProperty("当一级类型为Sketchboard时,二级类型 Outwear Dress Blouse Skirt Trousers;当一级类型为Printboard时,二级类型 Slogan Logo Pattern") private String level2Type; + @ApiModelProperty("年龄段") + private String ageGroup; + @ApiModelProperty("性别") private String gender; diff --git a/src/main/java/com/ai/da/service/impl/CollectionSortServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionSortServiceImpl.java index afb355bf..727cbb72 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionSortServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionSortServiceImpl.java @@ -227,8 +227,8 @@ public class CollectionSortServiceImpl extends ServiceImpl i // 2.2、添加到library AuthPrincipalVo userInfo = UserContext.getUserHolder(); Long accountId = userInfo.getId(); - Library library = setLibrary(accountId, generateLikeDTO, generateDetail.getUrl()); + Library library = setLibrary(accountId, generateLikeDTO, generateDetail.getUrl(), generateLikeDTO.getAgeGroup()); libraryService.save(library); // 3、更新generateDetail表的isLike列和libraryId列 @@ -555,12 +555,13 @@ public class GenerateServiceImpl extends ServiceImpl i return Boolean.TRUE; } - public Library setLibrary(Long accountId, GenerateLikeDTO generateLikeDTO, String imageUrl) { + public Library setLibrary(Long accountId, GenerateLikeDTO generateLikeDTO, String imageUrl, String ageGroup) { Library library = new Library(); library.setAccountId(accountId); library.setLevel1Type(generateLikeDTO.getLevel1Type()); library.setLevel2Type(StringUtil.isNullOrEmpty(generateLikeDTO.getLevel2Type()) ? null : generateLikeDTO.getLevel2Type()); library.setLevel3Type(StringUtil.isNullOrEmpty(generateLikeDTO.getGender()) ? null : generateLikeDTO.getGender()); + library.setAgeGroup(ageGroup); library.setName(DateUtil.getTimeStamp(generateLikeDTO.getTimeZone()) + "_N_G"); library.setUrl(imageUrl); try { @@ -2554,7 +2555,7 @@ public class GenerateServiceImpl extends ServiceImpl i if (Objects.nonNull(poseTransformDTO.getParentId()) && !poseTransformDTO.getParentId().equals(0L)) { return disOrLikePose(poseTransformationId, "like", - poseTransformDTO.getProjectId(), poseTransformDTO.getParentId()); + poseTransformDTO.getProjectId(), poseTransformDTO.getUserLikeSortId()); } return null; }