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

TASK: 1、默认不like的元素，如有parentId，需要回传

Browse Source 
2、project查询 需要按id查
This commit is contained in:
xupei
2025-07-08 13:54:27 +08:00
parent 1f77500d61
commit ec44c2a6b5
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java
View File

@@ -20,6 +20,8 @@ import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class ProjectQueryDTO extends PageQueryBaseVo { public class ProjectQueryDTO extends PageQueryBaseVo {
@ApiModelProperty("项目id")
private Long id;
@ApiModelProperty("项目名称") @ApiModelProperty("项目名称")
private String projectName; private String projectName;

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

@@ -1174,6 +1174,8 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
Integer reSort = userLikeGroupService.rearrangeChildSort(poseTransformation.getId(), CollectionType.POSE_TRANSFORM.getValue(), Integer reSort = userLikeGroupService.rearrangeChildSort(poseTransformation.getId(), CollectionType.POSE_TRANSFORM.getValue(),
poseTransformDTO.getParentId(), poseTransformDTO.getUserLikeSortId()); poseTransformDTO.getParentId(), poseTransformDTO.getUserLikeSortId());
toProductImageResultVO.setSort(Objects.isNull(reSort) ? sort : reSort); toProductImageResultVO.setSort(Objects.isNull(reSort) ? sort : reSort);
}else if (Objects.nonNull(poseTransformDTO.getIsDefaultLike()) && Objects.nonNull(poseTransformDTO.getParentId())){
toProductImageResultVO.setParentId(poseTransformDTO.getParentId());
} }
if (flag){ if (flag){

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

@@ -498,6 +498,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
toProductImageVO.getParentId(), toProductImageVO.getUserLikeSortId()); toProductImageVO.getParentId(), toProductImageVO.getUserLikeSortId());
// 将生成结果的排序返回 // 将生成结果的排序返回
toProductImageResult.setSort(Objects.isNull(reSort) ? sort : reSort); toProductImageResult.setSort(Objects.isNull(reSort) ? sort : reSort);
}else if (Objects.nonNull(toProductImageDTO.getIsDefaultLike()) && Objects.nonNull(toProductImageVO.getParentId())){
toProductImageResult.setParentId(toProductImageVO.getParentId());
} }
result.add(toProductImageResult); result.add(toProductImageResult);
}else { }else {
@@ -548,6 +550,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
toProductImageVO.getParentId(), toProductImageVO.getUserLikeSortId()); toProductImageVO.getParentId(), toProductImageVO.getUserLikeSortId());
// 将生成结果的排序返回 // 将生成结果的排序返回
toProductImageResult.setSort(Objects.isNull(reSort) ? sort : reSort); toProductImageResult.setSort(Objects.isNull(reSort) ? sort : reSort);
}else if (Objects.nonNull(toProductImageDTO.getIsDefaultLike()) && Objects.nonNull(toProductImageVO.getParentId())){
toProductImageResult.setParentId(toProductImageVO.getParentId());
} }
result.add(toProductImageResult); result.add(toProductImageResult);
} }
@@ -1145,6 +1149,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
toProductImageVO.getParentId(), toProductImageVO.getUserLikeSortId()); toProductImageVO.getParentId(), toProductImageVO.getUserLikeSortId());
// 将生成结果的排序返回 // 将生成结果的排序返回
toProductImageResult.setSort(Objects.isNull(reSort) ? sort : reSort); toProductImageResult.setSort(Objects.isNull(reSort) ? sort : reSort);
}else if (Objects.nonNull(toProductImageDTO.getIsDefaultLike()) && Objects.nonNull(toProductImageVO.getParentId())){
toProductImageResult.setParentId(toProductImageVO.getParentId());
} }
result.add(toProductImageResult); result.add(toProductImageResult);
}else { }else {
@@ -1185,6 +1191,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
toProductImageVO.getParentId(), toProductImageVO.getUserLikeSortId()); toProductImageVO.getParentId(), toProductImageVO.getUserLikeSortId());
// 将生成结果的排序返回 // 将生成结果的排序返回
toProductImageResult.setSort(Objects.isNull(reSort) ? sort : reSort); toProductImageResult.setSort(Objects.isNull(reSort) ? sort : reSort);
}else if (Objects.nonNull(toProductImageDTO.getIsDefaultLike()) && Objects.nonNull(toProductImageVO.getParentId())){
toProductImageResult.setParentId(toProductImageVO.getParentId());
} }
result.add(toProductImageResult); result.add(toProductImageResult);
} }
@@ -1586,6 +1594,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
QueryWrapper<Project> queryWrapper = new QueryWrapper<>(); QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("account_id", authPrincipalVo.getId()); queryWrapper.eq("account_id", authPrincipalVo.getId());
queryWrapper.eq("id", query.getId());
// queryWrapper.isNull("parent_id"); // queryWrapper.isNull("parent_id");
if (!StringUtils.isEmpty(query.getProjectName())) { if (!StringUtils.isEmpty(query.getProjectName())) {
queryWrapper.like("name", query.getProjectName()); queryWrapper.like("name", query.getProjectName());