TASK: 数据迁移；

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.*;
-import com.ai.da.service.UserLikeGroupService;
-import com.ai.da.service.UserLikeService;
-import com.ai.da.service.WorkspaceService;
 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字段数据
+        // ToProductElement更新project_id及type字段 不需要了
-        QueryWrapper<ToProductElement> toProductElementQueryWrapper = new QueryWrapper<>();
+//        QueryWrapper<ToProductImageResult> toProductImageResultQueryWrapper = new QueryWrapper<>();
-        List<ToProductElement> toProductElements = toProductELementMapper.selectList(toProductElementQueryWrapper);
+//        toProductImageResultQueryWrapper.lambda().eq(ToProductImageResult::getIsLike, 1);
-//        for (ToProductElement toProductElement : toProductElements) {
+//        toProductImageResultQueryWrapper.lambda().eq(ToProductImageResult::getElementType, "ProductElement");
-//            Long userLikeGroupId = toProductElement.getUserLikeGroupId();
+//        List<ToProductImageResult> toProductImageResultList = toProductImageResultMapper.selectList(toProductImageResultQueryWrapper);
-//            QueryWrapper<UserLikeGroup> userLikeGroupQueryWrapper = new QueryWrapper<>();
+//        for (ToProductImageResult toProductImageResult : toProductImageResultList) {
-//            userLikeGroupQueryWrapper.lambda().eq(UserLikeGroup::getId, userLikeGroupId);
+//            Long elementId = toProductImageResult.getElementId();
-//            UserLikeGroup userLikeGroup = userLikeGroupMapper.selectOne(userLikeGroupQueryWrapper);
+//            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());
+//                toProductElement.setType(toProductImageResult.getResultType());
-//                collectionSortMapper.updateById(collectionSort);
+//                toProductELementMapper.updateById(toProductElement);
 //            }
 //        }
 
+        // collection_sort表数据添加
         QueryWrapper<CollectionSort> qw = new QueryWrapper<>();
         List<CollectionSort> 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<ToProductImageResult> toProductImageResultQueryWrapper1 = new QueryWrapper<>();
+                toProductImageResultQueryWrapper1.lambda().eq(ToProductImageResult::getElementId, designOutfitId);
+                toProductImageResultQueryWrapper1.lambda().eq(ToProductImageResult::getIsLike, 1);
+                List<ToProductImageResult> 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<ToProductImageResult> relightResultQueryWrapper = new QueryWrapper<>();
+                        relightResultQueryWrapper.lambda().eq(ToProductImageResult::getElementId, toProductImageResult.getId());
+                        relightResultQueryWrapper.lambda().eq(ToProductImageResult::getIsLike, 1);
+                        List<ToProductImageResult> 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;

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;
 }

src/main/java/com/ai/da/model/vo/ModuleChooseVO.java

@@ -40,4 +40,6 @@ public class ModuleChooseVO {
     private List<CollectionElementVO> mannequin;
 
     private List<ToProductElement> uploadElement;
+
+//    private UploadElementVO uploadElement;
 }

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<ToProductElement> toProduct;
+    private List<ToProductElement> relight;
+    private List<ToProductElement> poseTransfer;
+}

src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java

@@ -613,6 +613,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
 //        toProductElement.setUserLikeGroupId(userLikeGroupId);
         toProductElement.setProjectId(projectId);
         toProductElement.setCreateTime(LocalDateTime.now());
+//        toProductElement.setType(type);
         toProductElementMapper.insert(toProductElement);
         ToProductElementVO toProductElementVO = CopyUtil.copyObject(toProductElement, ToProductElementVO.class);
         toProductElementVO.setMinioUrl(toProductElementVO.getUrl());