diff --git a/src/main/java/com/ai/da/controller/SavedCollectionController.java b/src/main/java/com/ai/da/controller/SavedCollectionController.java index d636208e..adcaad06 100644 --- a/src/main/java/com/ai/da/controller/SavedCollectionController.java +++ b/src/main/java/com/ai/da/controller/SavedCollectionController.java @@ -246,6 +246,12 @@ public class SavedCollectionController { return Response.success(userLikeGroupService.relight(toProductImageDTO)); } + @ApiOperation(value = "转relight元素") + @PostMapping("/convertRelightElement") + public Response convertRelightElement(@RequestParam("id") Long id) { + return Response.success(userLikeGroupService.convertRelightElement(id)); + } + @ApiOperation(value = "获取relight结果") @PostMapping("/relightResult") public Response> getRelightResult(@Valid @RequestBody List taskIdList) { diff --git a/src/main/java/com/ai/da/service/UserLikeGroupService.java b/src/main/java/com/ai/da/service/UserLikeGroupService.java index e5b0e19b..11e246b3 100644 --- a/src/main/java/com/ai/da/service/UserLikeGroupService.java +++ b/src/main/java/com/ai/da/service/UserLikeGroupService.java @@ -117,4 +117,6 @@ public interface UserLikeGroupService extends IService { Boolean collectionLikeUpdate(CollectionLikeUpdateDTO collectionLikeUpdateDTO); Boolean toProductImageElementDelete(Long id); + + ToProductElementVO convertRelightElement(Long id); } 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 83ee3b1f..16c7c849 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -1645,6 +1645,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl userLikeSortQueryWrapper = new QueryWrapper<>(); userLikeSortQueryWrapper.lambda().eq(CollectionSort::getProjectId, projectDTO.getId()); userLikeSortQueryWrapper.lambda().isNull(CollectionSort::getParentId); + userLikeSortQueryWrapper.lambda().eq(CollectionSort::getRelationType, CollectionType.DESIGN.getValue()); userLikeSortQueryWrapper.lambda().orderByAsc(CollectionSort::getSort); List userLikeSortList = collectionSortMapper.selectList(userLikeSortQueryWrapper); @@ -1679,7 +1680,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl childCollectionQw = new QueryWrapper<>(); childCollectionQw.lambda().eq(CollectionSort::getParentId, collectionSort.getId()); childCollectionQw.lambda().orderByAsc(CollectionSort::getSort); - List childSortList = collectionSortMapper.selectList(userLikeSortQueryWrapper); + List childSortList = collectionSortMapper.selectList(childCollectionQw); List childList = new ArrayList<>(); for (CollectionSort userLikeSort : childSortList) { if (userLikeSort.getRelationType().equals(CollectionType.TO_PRODUCT_IMAGE.getValue())) { @@ -2532,6 +2533,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl