修改印花允许同时single和overall

2024-07-05 18:47:12 +08:00
parent c6626b230a
commit 5ecebd5117
13 changed files with 214 additions and 114 deletions
--- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
@@ -261,7 +261,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
            }
        }
    }
-
+    // todo check这个方法是否还在用
    private DesignCollectionItemVO saveSingleDesignItemAndDetail(DesignPythonObjects pythonObjects
            , Long designId, Long designItemId, Long collectionId, AuthPrincipalVo userInfo, String timeZone) {
        DesignCollectionItemVO response = new DesignCollectionItemVO();
@@ -295,7 +295,8 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                designItemDetail.setBusinessId(0L);
            }
            designItemDetail.setIconPath(detail.getIcon());
-            DesignPythonItemPrint printObject = detail.getPrint();
+            // todo
+            DesignPythonItemPrint printObject = detail.getPrint().getSingle();
            designItemDetail.setPrintPath(Objects.isNull(printObject) ? "" : printObject.getPath());
            designItemDetail.setPrintJson(JSON.toJSONString(printObject));
            designItemDetails.add(designItemDetail);
@@ -312,7 +313,8 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI

    private List<TDesignPythonOutfitDetail> saveDesignSingleItemDetailAndLayers(DesignPythonObjects pythonObjects
            , Long designId, Long designItemId, Long userId
-            , JSONObject outfit, String timeZone, List<DesignSingleItemDTO> designSingleItemDTOList) {
+            , JSONObject outfit, String timeZone, List<DesignSingleItemDTO> designSingleItemDTOList
+            , Map<String, String> categoryAndUndividedLayer) {

        DesignItem designItem = new DesignItem();
 //        String url = pythonObjects.getObjects().get(0).getBasic().getSave_name();
@@ -343,8 +345,10 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                designItemDetail.setPriority(0);
            }
            designItemDetail.setIconPath(detail.getIcon());
-            DesignPythonItemPrint printObject = detail.getPrint();
-            designItemDetail.setPrintPath(Objects.isNull(printObject) ? "" : printObject.getPath());
+            designItemDetail.setUndividedLayer(categoryAndUndividedLayer.get(detail.getType().toLowerCase()));
+            // 印花存储在design_item_detail_print表中 这里还要存吗？
+//            DesignPythonItemPrint printObject = detail.getPrintToPython();
+//            designItemDetail.setPrintPath(Objects.isNull(printObject) ? "" : printObject.getPath());
 //            当有多个印花后，返回的printObject太长，导致存储到数据库时报错
 //            designItemDetail.setPrintJson(JSON.toJSONString(printObject));
            designItemDetails.add(designItemDetail);
@@ -506,14 +510,17 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
            throw new BusinessException("priority.cannot.be.repeated");
        }

+        JSONArray layers = outfit.getJSONArray("layers");
+        Map<String, String> categoryAndUndividedLayer = setTypeAndUndividedLayer(layers);
        if (!designSingleIncludeLayersDTO.getIsPreview()) {
            // 更新及保存图层信息
-            tDesignPythonOutfitDetails = saveDesignSingleItemDetailAndLayers(objects, design.getId(), designSingleIncludeLayersDTO.getDesignItemId(),
-                    userId, outfit, designSingleIncludeLayersDTO.getTimeZone(), designSingleIncludeLayersDTO.getDesignSingleItemDTOList());
+            tDesignPythonOutfitDetails = saveDesignSingleItemDetailAndLayers(objects, design.getId(), designSingleIncludeLayersDTO.getDesignItemId()
+                    , userId, outfit, designSingleIncludeLayersDTO.getTimeZone()
+                    , designSingleIncludeLayersDTO.getDesignSingleItemDTOList()
+                    , categoryAndUndividedLayer);

            saveCollectionElement(designSingleIncludeLayersDTO);
        } else {
-            JSONArray layers = outfit.getJSONArray("layers");
            tDesignPythonOutfitDetails = setTDesignPythonOutfitDetailList(layers, designItem.getDesignId(), null, userId, priorityOffset);
        }

@@ -537,7 +544,8 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                outfit.getString("synthesis_url"),
                designSingleIncludeLayersDTO.getDesignSingleItemDTOList(),
                detailsVO,
-                design.getSingleOverall());
+                design.getSingleOverall(),
+                categoryAndUndividedLayer);
    }

    private void sketchBase64ToPath(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO){
@@ -560,6 +568,16 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
        });
    }

+    private Map<String, String> setTypeAndUndividedLayer(JSONArray layers){
+        HashMap<String, String> categoryAndLayer = new HashMap<>();
+        for (int i = 0; i < layers.size(); i++) {
+            JSONObject jsonObject = layers.getJSONObject(i);
+            String category = jsonObject.getString("image_category").split("_")[0];
+            if (!category.equals("body") && !categoryAndLayer.containsKey(category)) categoryAndLayer.put(category, jsonObject.getString("pattern_image_url"));
+        }
+        return categoryAndLayer;
+    }
+
    @Override
    @Transactional(rollbackFor = Exception.class)
    public ComposeLayersVO editLayersPositionAndScale(EditLayersPositionAndScaleVO positionAndScaleVO) throws IOException {
@@ -650,7 +668,8 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                                                        String currentFullBodyView,
                                                        List<DesignSingleItemDTO> designSingleItemDTOList,
                                                        List<DesignPythonOutfitVO> layersObject,
-                                                        String singleOrOverall) {
+                                                        String singleOrOverall,
+                                                        Map<String, String> categoryAndUndividedLayer) {

        DesignSingleVO designSingleVO = new DesignSingleVO();
        ArrayList<DesignItemClothesDetailVO> clothes = new ArrayList<>();
@@ -684,6 +703,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                            && (flag ? Boolean.TRUE : singleItem.getPriority().equals(layers.getPriority())))
            ).collect(Collectors.toList()));
            designItemClothesDetailVO.setGradient(singleItem.getGradient());
+            if (categoryAndUndividedLayer.containsKey(singleItem.getType().toLowerCase())) designItemClothesDetailVO.setUndividedLayer(minioUtil.getPreSignedUrl(categoryAndUndividedLayer.get(singleItem.getType().toLowerCase()), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
            body.setLayersObject(layersObject.stream().filter(layers -> layers.getImageCategory().equals("body")).collect(Collectors.toList()));

            clothes.add(designItemClothesDetailVO);
@@ -715,20 +735,16 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                                              String printType,
                                              Map<Integer, Long> designItemDetailTypeIdMap,
                                              String timeZone){
+
+        // todo 这边这样做对吗
        DesignSinglePrintDTO printObject;
        if (printType.equals("print")){
            printObject = designSingleItem.getPrintObject();
        }else {
            printObject = designSingleItem.getTrims();
-            if (Objects.isNull(printObject.getIfSingle())){
-                printObject.setIfSingle(Boolean.FALSE);
-            }
        }

-        if (printObject.getIfSingle().equals(Boolean.FALSE)
-                && CollectionUtil.isEmpty(printObject.getPrints())) {
-            return;
-        } else {
+        if (!CollectionUtil.isEmpty(printObject.getPrints())) {
            // 2、有印花，添加到list
            printObject.getPrints().forEach(print -> {
                // 2.1 判断是否第一次添加印花，是：直接添加
@@ -743,7 +759,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                designItemDetailPrint.setLevel2Type(print.getLevel2Type());
                designItemDetailPrint.setPath(print.getMinIOPath());
                designItemDetailPrint.setScale(print.getScale());
-                designItemDetailPrint.setSingleOrOverall(printType.equals("print") ? printObject.getIfSingle() ? "single" : "overall" : "single");
+                designItemDetailPrint.setSingleOrOverall(printType.equals("print") ? print.getIfSingle() ? "single" : "overall" : "single");
                designItemDetailPrint.setCreateDate(LocalDateTime.now(ZoneId.of(timeZone)));
                // single、overall模式下都有position、angle和priority
                designItemDetailPrint.setPosition(print.getLocation().toString());
--- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.exceptions.ExceptionUtil;
 import com.ai.da.common.config.FileProperties;
 import com.ai.da.common.config.exception.BusinessException;
+import com.ai.da.common.constant.CommonConstant;
 import com.ai.da.common.context.UserContext;
 import com.ai.da.common.enums.*;
 import com.ai.da.common.utils.*;
@@ -623,10 +624,13 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
                }
                designItemDetail.setIconPath(detail.getIcon());
                designItemDetail.setPriority(typePriority.get(detail.getType().toLowerCase()));
-                DesignPythonItemPrint printObject = detail.getPrint();
-                designItemDetail.setPrintPath(Objects.isNull(printObject) ? "" : printObject.getPath());
+                if (!detail.getType().equals("Body")){
+                    DesignPythonItemPrint printObject = detail.getPrint().getOverall();
+//                designItemDetail.setPrintPath(Objects.isNull(printObject) ? "" : printObject.getPath());
+                    designItemDetail.setPrintPath(CollectionUtils.isEmpty(printObject.getPrint_path_list()) ? "" : printObject.getPrint_path_list().get(0));
+                }
                designItemDetailService.save(designItemDetail);
-                if (!SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType()) && designItemDetail.getPrintPath() != null) {
+                if (!SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType()) && !StringUtil.isNullOrEmpty(designItemDetail.getPrintPath())) {
                    DesignItemDetailPrint print = new DesignItemDetailPrint();
                    print.setDesignItemDetailId(designItemDetail.getId());
                    print.setPrintType("print");
@@ -686,7 +690,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
                    designItemDetail.setBusinessId(0L);
                }
                designItemDetail.setIconPath(detail.getIcon());
-                DesignPythonItemPrint printObject = detail.getPrint();
+                DesignPythonItemPrint printObject = detail.getPrint().getOverall();
                designItemDetail.setPrintPath(Objects.isNull(printObject) ? "" : printObject.getPath());
                designItemDetails.add(designItemDetail);
            });
@@ -1001,6 +1005,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
            d.setMinIOPath(o.getPath());
            d.setLevel1Type(converTypeToLevel1(o.getType()));
            d.setGradient(JSONObject.parseObject(o.getGradientString(), Gradient.class));
+            if (!StringUtil.isNullOrEmpty(o.getUndividedLayer())) d.setUndividedLayer(minioUtil.getPreSignedUrl(o.getUndividedLayer(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
            // 根据designItemDetailId获取印花
            List<DesignItemDetailPrint> prints = designItemDetailPrintService.getByDesignItemDetailId(o.getId(), "print");
            // 判断有无印花
@@ -1204,7 +1209,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
        if (designItemDetailPrints.size() == 1) {
            DesignItemDetailPrint detailPrint = designItemDetailPrints.get(0);
            DesignSinglePrint designSinglePrint = new DesignSinglePrint();
-            designSinglePrintDTO.setIfSingle(detailPrint.getSingleOrOverall().equals("single") ? Boolean.TRUE : Boolean.FALSE);
+//            designSinglePrintDTO.setIfSingle(detailPrint.getSingleOrOverall().equals("single") ? Boolean.TRUE : Boolean.FALSE);
            designSinglePrint.setLevel2Type(detailPrint.getLevel2Type());
            designSinglePrint.setLocation(JSONArray.parseArray(detailPrint.getPosition(), Double.class));
            designSinglePrint.setAngle(detailPrint.getAngle());
@@ -1212,21 +1217,23 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
            designSinglePrint.setPath(minioUtil.getPreSignedUrl(detailPrint.getPath(), 24 * 60));
            designSinglePrint.setMinIOPath(detailPrint.getPath());
            designSinglePrint.setScale(detailPrint.getScale());
+            designSinglePrint.setIfSingle(detailPrint.getSingleOrOverall().equals("single") ? Boolean.TRUE : Boolean.FALSE);
            prints.add(designSinglePrint);
        } else {
            // single模式下多个印花
-            designSinglePrintDTO.setIfSingle(Boolean.TRUE);
+//            designSinglePrintDTO.setIfSingle(Boolean.TRUE);
            designItemDetailPrints.forEach(print -> {
-                if (print.getSingleOrOverall().equals("single")) {
-                    prints.add(new DesignSinglePrint(
-                            print.getLevel2Type(),
-                            minioUtil.getPreSignedUrl(print.getPath(), 24 * 60),
-                            print.getPath(),
-                            JSONArray.parseArray(print.getPosition(), Double.class),
-                            print.getScale(),
-                            print.getAngle(),
-                            print.getPriority()));
-                }
+//                if (print.getSingleOrOverall().equals("single")) {
+                prints.add(new DesignSinglePrint(
+                        print.getLevel2Type(),
+                        minioUtil.getPreSignedUrl(print.getPath(), 24 * 60),
+                        print.getPath(),
+                        JSONArray.parseArray(print.getPosition(), Double.class),
+                        print.getScale(),
+                        print.getAngle(),
+                        print.getPriority(),
+                        print.getSingleOrOverall().equals("single") ? Boolean.TRUE : Boolean.FALSE));
+//                }
            });
        }
        designSinglePrintDTO.setPrints(prints);
--- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
@@ -432,13 +432,13 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
        for (ToProductImageResultVO toProductImageResultVO : toProductImageResultVOS) {
            if (toProductImageResultVO.getElementType().equals("ProductElement")) {
                ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResultVO.getElementId());
-                toProductImageResultVO.setSourceUrl(minioUtil.getPresignedUrl(toProductElement.getUrl(), 24 * 60));
+                toProductImageResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductElement.getUrl(), 24 * 60));
            }else if ((toProductImageResultVO.getElementType().equals("DesignOutfit"))) {
                TDesignPythonOutfit tDesignPythonOutfit = designPythonOutfitMapper.selectById(toProductImageResultVO.getElementId());
-                toProductImageResultVO.setSourceUrl(minioUtil.getPresignedUrl(tDesignPythonOutfit.getDesignUrl(), 24 * 60));
+                toProductImageResultVO.setSourceUrl(minioUtil.getPreSignedUrl(tDesignPythonOutfit.getDesignUrl(), 24 * 60));
            }else {
                ToProductImageResult toProductImageResult1 = toProductImageResultMapper.selectById(toProductImageResultVO.getElementId());
-                toProductImageResultVO.setSourceUrl(minioUtil.getPresignedUrl(toProductImageResult1.getUrl(), 24 * 60));
+                toProductImageResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductImageResult1.getUrl(), 24 * 60));
            }
        }
        return toProductImageResultVOS;