diff --git a/src/main/java/com/ai/da/model/dto/DesignLikeDTO.java b/src/main/java/com/ai/da/model/dto/DesignLikeDTO.java index ef6a3230..26ed7f18 100644 --- a/src/main/java/com/ai/da/model/dto/DesignLikeDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignLikeDTO.java @@ -26,4 +26,6 @@ public class DesignLikeDTO { @NotBlank(message = "timeZone.cannot.be.empty") @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") private String timeZone; + + private Long projectId; } diff --git a/src/main/java/com/ai/da/service/UserLikeGroupService.java b/src/main/java/com/ai/da/service/UserLikeGroupService.java index 7030c13e..de9b7f9d 100644 --- a/src/main/java/com/ai/da/service/UserLikeGroupService.java +++ b/src/main/java/com/ai/da/service/UserLikeGroupService.java @@ -1,13 +1,11 @@ package com.ai.da.service; -import com.ai.da.common.response.PageBaseResponse; import com.ai.da.mapper.primary.entity.*; import com.ai.da.model.dto.*; import com.ai.da.model.vo.*; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; @@ -25,7 +23,7 @@ public interface UserLikeGroupService extends IService { HistoryUpdateVO updateUserGroupName(Long userGroupId, String userGroupName, String timeZone); - Long insertUserGroup(Long userId, Long collectionId, String timeZone); + Long insertUserGroup(Long userId, Long collectionId, String timeZone, Long projectId); /** * choose diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java index 3ab50de2..fbd7ede3 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -1129,16 +1129,16 @@ public class DesignServiceImpl extends ServiceImpl impleme // if (CollectionUtil.isEmpty(oldElements)) { // throw new BusinessException("old.elements.not.found"); // } - List designItemDetails = designItemDetailService.selectByDesignItemId(designLikeDTO.getDesignItemId()); - if (CollectionUtil.isEmpty(designItemDetails)) { - throw new BusinessException("new.designItemDetails.not.found"); - } +// List designItemDetails = designItemDetailService.selectByDesignItemId(designLikeDTO.getDesignItemId()); +// if (CollectionUtil.isEmpty(designItemDetails)) { +// throw new BusinessException("new.designItemDetails.not.found"); +// } //判断老的element合并到新的是否满足 数量不超过15 - List newElementIds = validateMergeElement(oldElements, designItemDetails); +// List newElementIds = validateMergeElement(oldElements, designItemDetails); //合并,关联新的element到collection - collectionElementService.relationCollection(newElementIds, userLikeGroup.getCollectionId()); +// collectionElementService.relationCollection(newElementIds, userLikeGroup.getCollectionId()); //处理关联关系,修复element覆盖得情况 - handleCollectionElementRelation(userLikeGroup.getCollectionId(), false, newElementIds); +// handleCollectionElementRelation(userLikeGroup.getCollectionId(), false, newElementIds); QueryWrapper qw = new QueryWrapper<>(); qw.lambda().eq(TDesignPythonOutfit::getDesignItemId, designLikeDTO.getDesignItemId()); @@ -1151,7 +1151,7 @@ public class DesignServiceImpl extends ServiceImpl impleme } else { //第一次like - userGroupId = userLikeGroupService.insertUserGroup(userInfo.getId(), designItem.getCollectionId(), designLikeDTO.getTimeZone()); + userGroupId = userLikeGroupService.insertUserGroup(userInfo.getId(), designItem.getCollectionId(), designLikeDTO.getTimeZone(), designLikeDTO.getProjectId()); QueryWrapper qw = new QueryWrapper<>(); qw.lambda().eq(TDesignPythonOutfit::getDesignItemId, designLikeDTO.getDesignItemId()); List tDesignPythonOutfits = designPythonOutfitMapper.selectList(qw); 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 5456e39d..74c06109 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -157,7 +157,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl