From a5e743ce848236ee57cdf74296b6063cc842cbdb Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Thu, 19 Jun 2025 14:29:44 +0800 Subject: [PATCH] =?UTF-8?q?TASK:=20=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/da/common/config/MyTaskScheduler.java | 56 ++++++++++++++----- .../primary/entity/ToProductElement.java | 2 +- .../com/ai/da/model/vo/ModuleChooseVO.java | 2 + .../com/ai/da/model/vo/UploadElementVO.java | 14 +++++ .../impl/UserLikeGroupServiceImpl.java | 1 + 5 files changed, 60 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/ai/da/model/vo/UploadElementVO.java diff --git a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java index b7af40f6..8bece294 100644 --- a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java +++ b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java @@ -13,10 +13,7 @@ import com.ai.da.model.enums.Sex; import com.ai.da.model.vo.ValidateElementVO; import com.ai.da.python.PythonService; import com.ai.da.python.vo.DesignPythonObjects; -import com.ai.da.service.CollectionElementService; -import com.ai.da.service.UserLikeGroupService; -import com.ai.da.service.UserLikeService; -import com.ai.da.service.WorkspaceService; +import com.ai.da.service.*; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -68,21 +65,24 @@ public class MyTaskScheduler { } private void collectionSortData() { - // ToProductElement更新project_id字段数据 - QueryWrapper toProductElementQueryWrapper = new QueryWrapper<>(); - List toProductElements = toProductELementMapper.selectList(toProductElementQueryWrapper); -// for (ToProductElement toProductElement : toProductElements) { -// Long userLikeGroupId = toProductElement.getUserLikeGroupId(); -// QueryWrapper userLikeGroupQueryWrapper = new QueryWrapper<>(); -// userLikeGroupQueryWrapper.lambda().eq(UserLikeGroup::getId, userLikeGroupId); -// UserLikeGroup userLikeGroup = userLikeGroupMapper.selectOne(userLikeGroupQueryWrapper); + // ToProductElement更新project_id及type字段 不需要了 +// QueryWrapper toProductImageResultQueryWrapper = new QueryWrapper<>(); +// toProductImageResultQueryWrapper.lambda().eq(ToProductImageResult::getIsLike, 1); +// toProductImageResultQueryWrapper.lambda().eq(ToProductImageResult::getElementType, "ProductElement"); +// List toProductImageResultList = toProductImageResultMapper.selectList(toProductImageResultQueryWrapper); +// for (ToProductImageResult toProductImageResult : toProductImageResultList) { +// Long elementId = toProductImageResult.getElementId(); +// Long userLikeGroupId = toProductImageResult.getUserLikeGroupId(); +// ToProductElement toProductElement = toProductELementMapper.selectById(elementId); +// UserLikeGroup userLikeGroup = userLikeGroupMapper.selectById(userLikeGroupId); // if (Objects.nonNull(userLikeGroup)) { // toProductElement.setProjectId(userLikeGroup.getProjectId()); -// toProductElement.setType(CollectionType.DESIGN.getValue()); -// collectionSortMapper.updateById(collectionSort); +// toProductElement.setType(toProductImageResult.getResultType()); +// toProductELementMapper.updateById(toProductElement); // } // } + // collection_sort表数据添加 QueryWrapper qw = new QueryWrapper<>(); List collectionSortList = collectionSortMapper.selectList(qw); for (CollectionSort collectionSort : collectionSortList) { @@ -96,11 +96,39 @@ public class MyTaskScheduler { collectionSort.setRelationType(CollectionType.DESIGN.getValue()); collectionSortMapper.updateById(collectionSort); } + // 根据关联查询是否有相关的喜欢的toproduct及relight结果 + UserLike userLike = userLikeMapper.selectById(collectionSort.getRelationId()); + if (Objects.nonNull(userLike)) { + Long designOutfitId = userLike.getDesignOutfitId(); + QueryWrapper toProductImageResultQueryWrapper1 = new QueryWrapper<>(); + toProductImageResultQueryWrapper1.lambda().eq(ToProductImageResult::getElementId, designOutfitId); + toProductImageResultQueryWrapper1.lambda().eq(ToProductImageResult::getIsLike, 1); + List toProductImageResultList1 = toProductImageResultMapper.selectList(toProductImageResultQueryWrapper1); + if (!CollectionUtils.isEmpty(toProductImageResultList1)) { + for (ToProductImageResult toProductImageResult : toProductImageResultList1) { + designService.addCollectionSort(toProductImageResult.getId(), CollectionType.TO_PRODUCT_IMAGE.getValue(), collectionSort.getProjectId(), collectionSort.getId()); + + QueryWrapper relightResultQueryWrapper = new QueryWrapper<>(); + relightResultQueryWrapper.lambda().eq(ToProductImageResult::getElementId, toProductImageResult.getId()); + relightResultQueryWrapper.lambda().eq(ToProductImageResult::getIsLike, 1); + List toProductImageResultList2 = toProductImageResultMapper.selectList(relightResultQueryWrapper); + + if (!CollectionUtils.isEmpty(toProductImageResultList2)) { + for (ToProductImageResult relight : toProductImageResultList2) { + designService.addCollectionSort(relight.getId(), CollectionType.RELIGHT.getValue(), collectionSort.getProjectId(), collectionSort.getId()); + } + } + + } + } + } } } @Resource private CollectionSortMapper collectionSortMapper; + @Resource + private DesignService designService; @Resource private ToProductElementMapper toProductELementMapper; diff --git a/src/main/java/com/ai/da/mapper/primary/entity/ToProductElement.java b/src/main/java/com/ai/da/mapper/primary/entity/ToProductElement.java index 79e9b4d5..1c48b589 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/ToProductElement.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/ToProductElement.java @@ -24,7 +24,7 @@ public class ToProductElement implements Serializable { @ApiModelProperty(value = "url") private String url; - private String type; +// private String type; @ApiModelProperty(value = "createTime") private LocalDateTime createTime; } diff --git a/src/main/java/com/ai/da/model/vo/ModuleChooseVO.java b/src/main/java/com/ai/da/model/vo/ModuleChooseVO.java index 9abee37f..6d70169b 100644 --- a/src/main/java/com/ai/da/model/vo/ModuleChooseVO.java +++ b/src/main/java/com/ai/da/model/vo/ModuleChooseVO.java @@ -40,4 +40,6 @@ public class ModuleChooseVO { private List mannequin; private List uploadElement; + +// private UploadElementVO uploadElement; } diff --git a/src/main/java/com/ai/da/model/vo/UploadElementVO.java b/src/main/java/com/ai/da/model/vo/UploadElementVO.java new file mode 100644 index 00000000..5fa982fe --- /dev/null +++ b/src/main/java/com/ai/da/model/vo/UploadElementVO.java @@ -0,0 +1,14 @@ +package com.ai.da.model.vo; + +import com.ai.da.mapper.primary.entity.ToProductElement; +import lombok.Data; + +import java.util.List; + +@Data +public class UploadElementVO { + + private List toProduct; + private List relight; + private List poseTransfer; +} 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 82815406..478db716 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -613,6 +613,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl