TASK:aida;

src/main/java/com/ai/da/mapper/primary/entity/CollectionElement.java

@@ -75,7 +75,7 @@ public class CollectionElement implements Serializable {
      */
     private String md5;
 
-//    private String gradientString;
+    private String gradientString;
 
     /**
      * 创建时间

src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetail.java

@@ -64,7 +64,7 @@ public class DesignItemDetail implements Serializable {
      */
     private String color;
 
-//    private String gradientString;
+    private String gradientString;
 
     /**
      * 对应的print图片的绝对路径

src/main/java/com/ai/da/model/enums/PrintboardLevel2TypeEnum.java

@@ -3,9 +3,10 @@ package com.ai.da.model.enums;
 import com.fasterxml.jackson.annotation.JsonValue;
 
 public enum PrintboardLevel2TypeEnum implements IEnumDisplay {
-    SLOGAN("标语", "Slogan"),
+    PATTERN("图案", "Pattern"),
     LOGO("标志", "Logo"),
-    PATTERN("图案", "Pattern");
+    SLOGAN("标语", "Slogan")
+    ;
 
     private final String chinese;
     private final String english;

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

@@ -783,10 +783,10 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
             element.setColorRgb(color.getRgbValue());
             //按时区计算
             element.setCreateDate(DateUtil.getByTimeZone(timeZone));
-//            if (Objects.nonNull(color.getGradient())) {
+            if (Objects.nonNull(color.getGradient())) {
-//                color.getGradient().setColorImg(null);
+                color.getGradient().setColorImg(null);
-//            }
+            }
-//            element.setGradientString(JSON.toJSONString(color.getGradient()));
+            element.setGradientString(JSON.toJSONString(color.getGradient()));
             elements.add(element);
         });
         return elements;

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

@@ -999,7 +999,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
             d.setPath(minioUtil.getPresignedUrl(o.getPath(), 24 * 60));
             d.setMinIOPath(o.getPath());
             d.setLevel1Type(converTypeToLevel1(o.getType()));
-//            d.setGradient(JSONObject.parseObject(o.getGradientString(), Gradient.class));
+            d.setGradient(JSONObject.parseObject(o.getGradientString(), Gradient.class));
             // 根据designItemDetailId获取印花
             List<DesignItemDetailPrint> prints = designItemDetailPrintService.getByDesignItemDetailId(o.getId(), "print");
             // 判断有无印花

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

@@ -1,5 +1,6 @@
 package com.ai.da.service.impl;
 
+import com.ai.da.common.config.exception.BusinessException;
 import com.ai.da.common.context.UserContext;
 import com.ai.da.common.response.PageBaseResponse;
 import com.ai.da.common.response.Response;
@@ -20,6 +21,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.base.Function;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -165,6 +167,16 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
 //                        flag = true;
 //                    }
                     designPythonOutfit.setId(null);
+                    Long designItemIdOld = userLike.getDesignItemId();
+                    DesignItem designItemOld = designItemMapper.selectById(designItemIdOld);
+                    designItemOld.setId(null);
+                    designItemOld.setAccountId(-1L);
+                    designItemOld.setDesignId(-1L);
+                    designItemOld.setCollectionId(collectionIdNew);
+                    designItemMapper.insert(designItemOld);
+                    Long designItemIdNew = designItemOld.getId();
+
+                    designPythonOutfit.setDesignItemId(designItemIdNew);
                     designPythonOutfitMapper.insert(designPythonOutfit);
                     Long designOutfitIdNew = designPythonOutfit.getId();
                     userLike.setDesignOutfitId(designOutfitIdNew);
@@ -185,18 +197,7 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
 //                        portfolioMapper.updateById(portfolio);
 //                        flag = false;
 //                    }
-
+//                    designPythonOutfitMapper.updateById(designPythonOutfit);
-                    Long designItemIdOld = userLike.getDesignItemId();
-                    DesignItem designItemOld = designItemMapper.selectById(designItemIdOld);
-                    designItemOld.setId(null);
-                    designItemOld.setAccountId(-1L);
-                    designItemOld.setDesignId(-1L);
-                    designItemOld.setCollectionId(collectionIdNew);
-                    designItemMapper.insert(designItemOld);
-                    Long designItemIdNew = designItemOld.getDesignId();
-
-                    designPythonOutfit.setDesignItemId(designItemIdNew);
-                    designPythonOutfitMapper.updateById(designPythonOutfit);
 
                     userLike.setDesignItemId(designItemIdNew);
                     userLike.setId(null);
@@ -204,10 +205,11 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
                     userLike.setUserLikeGroupId(userLikeGroupNew.getId());
                     userLikeMapper.insert(userLike);
                     QueryWrapper<DesignItemDetail> designItemDetailQueryWrapper = new QueryWrapper<>();
-                    designItemDetailQueryWrapper.lambda().eq(DesignItemDetail::getDesignItemId, designItemOld);
+                    designItemDetailQueryWrapper.lambda().eq(DesignItemDetail::getDesignItemId, designItemIdOld);
                     List<DesignItemDetail> designItemDetailListOld = designItemDetailMapper.selectList(designItemDetailQueryWrapper);
                     for (DesignItemDetail designItemDetailOld : designItemDetailListOld) {
                         Long designItemDetailIdOld = designItemDetailOld.getId();
+                        designItemDetailOld.setId(null);
                         designItemDetailOld.setAccountId(-1L);
                         designItemDetailOld.setDesignId(-1L);
                         designItemDetailOld.setDesignItemId(designItemIdNew);
@@ -216,6 +218,7 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
                         QueryWrapper<DesignItemDetailPrint> designItemDetailPrintQueryWrapper = new QueryWrapper<>();
                         designItemDetailPrintQueryWrapper.lambda().eq(DesignItemDetailPrint::getDesignItemDetailId, designItemDetailIdOld);
                         DesignItemDetailPrint designItemDetailPrint = designItemDetailPrintMapper.selectOne(designItemDetailPrintQueryWrapper);
+                        designItemDetailPrint.setId(null);
                         designItemDetailPrint.setDesignItemDetailId(designItemDetailIdNew);
                         designItemDetailPrintMapper.insert(designItemDetailPrint);
                     }
@@ -431,9 +434,18 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public UserLikeChooseVO choose(PortfolioDTO portfolioDTO) {
         AuthPrincipalVo authPrincipalVo = UserContext.getUserHolder();
-        UserLikeGroup userLikeGroup = userLikeGroupMapper.selectById(portfolioDTO.getUserLikeGroupId());
+        Portfolio portfolio = portfolioMapper.selectById(portfolioDTO.getId());
+        QueryWrapper<UserLikeGroup> userLikeGroupQueryWrapper = new QueryWrapper<>();
+        userLikeGroupQueryWrapper.lambda().eq(UserLikeGroup::getCollectionId, portfolio.getCollectionId());
+        UserLikeGroup userLikeGroup = userLikeGroupMapper.selectOne(userLikeGroupQueryWrapper);
+        Long portfolioUserLikeGroupId = userLikeGroup.getId();
+        if (Objects.isNull(userLikeGroup)) {
+            throw new BusinessException("");
+        }
+//        UserLikeGroup userLikeGroup = userLikeGroupMapper.selectById();
         UserLikeGroup userLikeGroupNew = userLikeGroup.setId(null);
         userLikeGroupNew.setAccountId(authPrincipalVo.getId());
         Long collectionIdOld = userLikeGroup.getCollectionId();
@@ -479,7 +491,8 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
             collectionElementRelationMapper.insert(collectionElementRelationNew);
         }
 
-        List<UserLike> userLikeList = userLikeService.getUserLikeList(portfolioDTO.getUserLikeGroupId());
+
+        List<UserLike> userLikeList = userLikeService.getUserLikeList(portfolioUserLikeGroupId);
 
         for (UserLike userLike : userLikeList) {
             Long designOutfitIdOld = userLike.getDesignOutfitId();
@@ -498,7 +511,7 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
             for (TDesignPythonOutfitDetail tDesignPythonOutfitDetail : tDesignPythonOutfitDetails) {
 //                Long designPythonOutfitDetailIdOld = tDesignPythonOutfitDetail.getId();
                 tDesignPythonOutfitDetail.setId(null);
-                tDesignPythonOutfitDetail.setDesignId(-1L);
+                tDesignPythonOutfitDetail.setDesignId(design.getId());
                 tDesignPythonOutfitDetail.setDesignPythonOutfitId(designOutfitIdNew);
                 designPythonOutfitDetailMapper.insert(tDesignPythonOutfitDetail);
             }
@@ -506,11 +519,11 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
             Long designItemIdOld = userLike.getDesignItemId();
             DesignItem designItemOld = designItemMapper.selectById(designItemIdOld);
             designItemOld.setId(null);
-            designItemOld.setAccountId(-1L);
+            designItemOld.setAccountId(authPrincipalVo.getId());
-            designItemOld.setDesignId(-1L);
+            designItemOld.setDesignId(design.getId());
             designItemOld.setCollectionId(collectionIdNew);
             designItemMapper.insert(designItemOld);
-            Long designItemIdNew = designItemOld.getDesignId();
+            Long designItemIdNew = designItemOld.getId();
 
             designPythonOutfit.setDesignItemId(designItemIdNew);
             designPythonOutfitMapper.updateById(designPythonOutfit);
@@ -521,10 +534,11 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
             userLike.setUserLikeGroupId(userLikeGroupNew.getId());
             userLikeMapper.insert(userLike);
             QueryWrapper<DesignItemDetail> designItemDetailQueryWrapper = new QueryWrapper<>();
-            designItemDetailQueryWrapper.lambda().eq(DesignItemDetail::getDesignItemId, designItemOld);
+            designItemDetailQueryWrapper.lambda().eq(DesignItemDetail::getDesignItemId, designItemIdOld);
             List<DesignItemDetail> designItemDetailListOld = designItemDetailMapper.selectList(designItemDetailQueryWrapper);
             for (DesignItemDetail designItemDetailOld : designItemDetailListOld) {
                 Long designItemDetailIdOld = designItemDetailOld.getId();
+                designItemDetailOld.setId(null);
                 designItemDetailOld.setAccountId(authPrincipalVo.getId());
                 designItemDetailOld.setDesignId(design.getId());
                 designItemDetailOld.setDesignItemId(designItemIdNew);
@@ -534,6 +548,7 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
                 designItemDetailPrintQueryWrapper.lambda().eq(DesignItemDetailPrint::getDesignItemDetailId, designItemDetailIdOld);
                 DesignItemDetailPrint designItemDetailPrint = designItemDetailPrintMapper.selectOne(designItemDetailPrintQueryWrapper);
                 designItemDetailPrint.setDesignItemDetailId(designItemDetailIdNew);
+                designItemDetailPrint.setId(null);
                 designItemDetailPrintMapper.insert(designItemDetailPrint);
             }
         }

src/main/resources/application-dev.properties

@@ -45,7 +45,7 @@ spring.servlet.multipart.max-request-size= 10MB
 access.python.ip=http://18.167.251.121
 access.python.port=9992
 access.python.sr=http://18.167.251.121:9994
-access.python.address=http://18.167.251.121:9996
+access.python.address=http://18.167.251.121:9994
 
 minio.endpoint=https://www.minio.aida.com.hk:9000
 minio.accessKey=admin