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

Merge remote-tracking branch 'origin/dev/3.1_release_merge' into dev/3.1_release_merge

Browse Source
This commit is contained in:
litianxiang
2025-10-16 11:00:36 +08:00
parent 59602540a3 cd74022d04
commit a76b9ba365
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/ai/da/model/dto/GenerateLikeDTO.java
View File

@@ -22,6 +22,9 @@ public class GenerateLikeDTO {
@ApiModelProperty("当一级类型为Sketchboard时，二级类型 Outwear Dress Blouse Skirt Trousers；当一级类型为Printboard时，二级类型 Slogan Logo Pattern") @ApiModelProperty("当一级类型为Sketchboard时，二级类型 Outwear Dress Blouse Skirt Trousers；当一级类型为Printboard时，二级类型 Slogan Logo Pattern")
private String level2Type; private String level2Type;
@ApiModelProperty("年龄段")
private String ageGroup;
@ApiModelProperty("性别") @ApiModelProperty("性别")
private String gender; private String gender;

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

@@ -227,8 +227,8 @@ public class CollectionSortServiceImpl extends ServiceImpl<CollectionSortMapper,
} }
child.setSort(collectionSort.getSort()); child.setSort(collectionSort.getSort());
// 原来排序的大于等于userLikeSortId的排序的，都要＋1 // 原来排序的大于等于userLikeSortId的排序的，都要＋1
// baseMapper.increaseGenerateSortAbove(parentId, /*relationType,*/ collectionSort.getSort() - 1); baseMapper.increaseGenerateSortAbove(parentId, /*relationType,*/ collectionSort.getSort() - 1);
resort(collectionSort.getProjectId(), parentId); // resort(collectionSort.getProjectId(), parentId);
// 当前的生成结果则填入userLikeSortId的排序位置 // 当前的生成结果则填入userLikeSortId的排序位置
child.setUpdateTime(LocalDateTime.now()); child.setUpdateTime(LocalDateTime.now());
baseMapper.updateById(child); baseMapper.updateById(child);

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

@@ -521,7 +521,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
// 2.2、添加到library // 2.2、添加到library
AuthPrincipalVo userInfo = UserContext.getUserHolder(); AuthPrincipalVo userInfo = UserContext.getUserHolder();
Long accountId = userInfo.getId(); Long accountId = userInfo.getId();
Library library = setLibrary(accountId, generateLikeDTO, generateDetail.getUrl()); Library library = setLibrary(accountId, generateLikeDTO, generateDetail.getUrl(), generateLikeDTO.getAgeGroup());
libraryService.save(library); libraryService.save(library);
// 3、更新generateDetail表的isLike列和libraryId列 // 3、更新generateDetail表的isLike列和libraryId列
@@ -555,12 +555,13 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
return Boolean.TRUE; 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 library = new Library();
library.setAccountId(accountId); library.setAccountId(accountId);
library.setLevel1Type(generateLikeDTO.getLevel1Type()); library.setLevel1Type(generateLikeDTO.getLevel1Type());
library.setLevel2Type(StringUtil.isNullOrEmpty(generateLikeDTO.getLevel2Type()) ? null : generateLikeDTO.getLevel2Type()); library.setLevel2Type(StringUtil.isNullOrEmpty(generateLikeDTO.getLevel2Type()) ? null : generateLikeDTO.getLevel2Type());
library.setLevel3Type(StringUtil.isNullOrEmpty(generateLikeDTO.getGender()) ? null : generateLikeDTO.getGender()); library.setLevel3Type(StringUtil.isNullOrEmpty(generateLikeDTO.getGender()) ? null : generateLikeDTO.getGender());
library.setAgeGroup(ageGroup);
library.setName(DateUtil.getTimeStamp(generateLikeDTO.getTimeZone()) + "_N_G"); library.setName(DateUtil.getTimeStamp(generateLikeDTO.getTimeZone()) + "_N_G");
library.setUrl(imageUrl); library.setUrl(imageUrl);
try { try {
@@ -2554,7 +2555,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
if (Objects.nonNull(poseTransformDTO.getParentId()) if (Objects.nonNull(poseTransformDTO.getParentId())
&& !poseTransformDTO.getParentId().equals(0L)) { && !poseTransformDTO.getParentId().equals(0L)) {
return disOrLikePose(poseTransformationId, "like", return disOrLikePose(poseTransformationId, "like",
poseTransformDTO.getProjectId(), poseTransformDTO.getParentId()); poseTransformDTO.getProjectId(), poseTransformDTO.getUserLikeSortId());
} }
return null; return null;
} }