From 060db899cf448e238e658fbe43a95c784c13d80c Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 8 Jul 2025 10:21:28 +0800 Subject: [PATCH] =?UTF-8?q?TASK:product/pose=20transfer=E7=9A=84=E5=9B=9E?= =?UTF-8?q?=E5=8F=82=E6=B7=BB=E5=8A=A0sort=E5=92=8Cid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ai/da/controller/GenerateController.java | 9 ++------- .../ai/da/controller/SavedCollectionController.java | 4 ++-- .../java/com/ai/da/service/GenerateService.java | 3 ++- .../com/ai/da/service/impl/GenerateServiceImpl.java | 13 ++++--------- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/ai/da/controller/GenerateController.java b/src/main/java/com/ai/da/controller/GenerateController.java index 0e4958df..064e3c4e 100644 --- a/src/main/java/com/ai/da/controller/GenerateController.java +++ b/src/main/java/com/ai/da/controller/GenerateController.java @@ -115,13 +115,8 @@ public class GenerateController { @ApiOperation("喜欢或取消喜欢姿势变换生成的图片") @PostMapping("/likeOrDislike") - public Response likeOrDislike(@ApiParam("id") @RequestParam Long transformedId, @ApiParam("like || dislike") @RequestParam String likeOrDislike, @RequestParam("projectId") Long projectId, @RequestParam(value = "collectionSortParentId", required = false) Long collectionSortParentId) { - Object obj = generateService.disOrLikePose(transformedId, likeOrDislike, projectId, collectionSortParentId); - if (obj instanceof CollectionSort){ - return Response.success(((CollectionSort) obj).getId()); - }else { - return Response.success(obj); - } + public Response likeOrDislike(@ApiParam("id") @RequestParam Long transformedId, @ApiParam("like || dislike") @RequestParam String likeOrDislike, @RequestParam("projectId") Long projectId, @RequestParam(value = "collectionSortParentId", required = false) Long collectionSortParentId) { + return Response.success(generateService.disOrLikePose(transformedId, likeOrDislike, projectId, collectionSortParentId)); } @ApiOperation(value = "修改模特比例") diff --git a/src/main/java/com/ai/da/controller/SavedCollectionController.java b/src/main/java/com/ai/da/controller/SavedCollectionController.java index 8573ccd8..530acb21 100644 --- a/src/main/java/com/ai/da/controller/SavedCollectionController.java +++ b/src/main/java/com/ai/da/controller/SavedCollectionController.java @@ -205,9 +205,9 @@ public class SavedCollectionController { @ApiOperation(value = "productImageLike") @PostMapping("/productImageLike") - public Response productImageLike(@Valid @RequestBody ProductImageLikeDTO productImageLikeDTO) { + public Response productImageLike(@Valid @RequestBody ProductImageLikeDTO productImageLikeDTO) { CollectionSort collectionSort = userLikeGroupService.productImageLike(productImageLikeDTO); - return Response.success(Objects.nonNull(collectionSort) ? collectionSort.getId() : null); + return Response.success(collectionSort); } @ApiOperation(value = "collectionLikeUpdate") diff --git a/src/main/java/com/ai/da/service/GenerateService.java b/src/main/java/com/ai/da/service/GenerateService.java index 64781993..e01bd8c1 100644 --- a/src/main/java/com/ai/da/service/GenerateService.java +++ b/src/main/java/com/ai/da/service/GenerateService.java @@ -1,6 +1,7 @@ package com.ai.da.service; import com.ai.da.common.enums.CreditsEventsEnum; +import com.ai.da.mapper.primary.entity.CollectionSort; import com.ai.da.mapper.primary.entity.Generate; import com.ai.da.mapper.primary.entity.GenerateDetail; import com.ai.da.model.dto.*; @@ -57,7 +58,7 @@ public interface GenerateService extends IService { List getPoseTransformationResultList(Long projectId, boolean like); - Object disOrLikePose(Long transformedId, String likeOrDislike, Long projectId, Long sortLikeParentId); + CollectionSort disOrLikePose(Long transformedId, String likeOrDislike, Long projectId, Long sortLikeParentId); String modifyModelProportion(ModifyModelProportionDTO proportionDTO); diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index de265173..b3f962b7 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -1189,11 +1189,9 @@ public class GenerateServiceImpl extends ServiceImpl i private Integer addPoseTransferLike(PoseTransformDTO poseTransformDTO, Long poseTransformationId){ if (Objects.nonNull(poseTransformDTO.getParentId()) && !poseTransformDTO.getParentId().equals(0L)){ - Object object = disOrLikePose(poseTransformationId, "like", + CollectionSort collectionSort = disOrLikePose(poseTransformationId, "like", poseTransformDTO.getProjectId(), poseTransformDTO.getParentId()); - if (object instanceof CollectionSort){ - return ((CollectionSort) object).getSort(); - } + return collectionSort.getSort(); } return null; } @@ -1335,7 +1333,7 @@ public class GenerateServiceImpl extends ServiceImpl i } } - public Object disOrLikePose(Long transformedId, String likeOrDislike, Long projectId, Long collectionSortParentId){ + public CollectionSort disOrLikePose(Long transformedId, String likeOrDislike, Long projectId, Long collectionSortParentId){ PoseTransformation poseTransformation = poseTransformationMapper.selectById(transformedId); CollectionSort collectionSort = null; if (Objects.nonNull(poseTransformation)){ @@ -1352,14 +1350,11 @@ public class GenerateServiceImpl extends ServiceImpl i } poseTransformation.setUpdateTime(LocalDateTime.now()); poseTransformationMapper.updateById(poseTransformation); - }else { - return false; } if (Objects.nonNull(collectionSort)) { projectService.modifyProjectUpdateTime(projectId); - return collectionSort; } - return true; + return collectionSort; } @Resource