diff --git a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java index 75812d8a..4ac99d4e 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -354,7 +354,7 @@ public class DesignItemServiceImpl extends ServiceImpl { @@ -452,9 +454,17 @@ public class DesignItemServiceImpl extends ServiceImpl details = new ArrayList<>(); designItemLayer.getLayers().forEach(layer -> { TDesignPythonOutfitDetail layerDetail = new TDesignPythonOutfitDetail(); @@ -465,7 +475,7 @@ public class DesignItemServiceImpl extends ServiceImpl { ArrayList imageSize = new ArrayList<>(); for (int i = 0; i < layer.getImageSize().size(); i++) { @@ -490,6 +500,7 @@ public class DesignItemServiceImpl extends ServiceImpl clothes = new ArrayList<>(); DesignItemClothesDetailVO body = new DesignItemClothesDetailVO("body"); designSingleVO.setDesignItemId(designItemId); + // 图片用于修改前后的一键对比 designSingleVO.setDesignItemUrl(designItemUrl); designSingleVO.setClothes(clothes); diff --git a/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java b/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java index fd6bae6d..a8912f59 100644 --- a/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java @@ -18,8 +18,11 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * design item详情表 服务实现类 @@ -53,9 +56,19 @@ public class TDesignPythonOutfitDetailServiceImpl extends ServiceImpl) JSON.parse(detail.getPosition())); - designPythonOutfitVO.setImageSize(StringUtil.isNullOrEmpty(detail.getImageSize()) ? null : (List) JSON.parse(detail.getImageSize())); +// designPythonOutfitVO.setImageSize(StringUtil.isNullOrEmpty(detail.getImageSize()) ? null : (List) JSON.parse(detail.getImageSize())); designPythonOutfitVO.setImageUrl(StringUtil.isNullOrEmpty(detail.getImageUrl()) ? null : minIoUtil.splitThenGetPreviewUrl(detail.getImageUrl(),480)); designPythonOutfitVO.setMaskUrl(StringUtil.isNullOrEmpty(detail.getMaskUrl()) ? null : minIoUtil.splitThenGetPreviewUrl(detail.getMaskUrl(),480)); + designPythonOutfitVO.setScale(Float.parseFloat(detail.getScale())); + + if (!StringUtil.isNullOrEmpty(detail.getImageSize())){ + List size = Arrays.stream(detail.getImageSize().replaceAll("\\[|\\]", "").split(",")).map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); + ArrayList imageSize = new ArrayList<>(); + for (Long aLong : size) { + imageSize.add((long) (aLong * Float.parseFloat(detail.getScale()))); + } + designPythonOutfitVO.setImageSize(imageSize); + } return designPythonOutfitVO; }