diff --git a/src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java b/src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java index de512ad9..60adac03 100644 --- a/src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java +++ b/src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java @@ -46,6 +46,9 @@ public class DesignPythonOutfitVO { */ @ApiModelProperty(value = "位置") private List position; + + @ApiModelProperty(value = "偏移量") + private List offset; /** * 图层缩放比例 */ diff --git a/src/main/java/com/ai/da/model/vo/DesignSingleVO.java b/src/main/java/com/ai/da/model/vo/DesignSingleVO.java index 058eac8c..3bae68ff 100644 --- a/src/main/java/com/ai/da/model/vo/DesignSingleVO.java +++ b/src/main/java/com/ai/da/model/vo/DesignSingleVO.java @@ -14,6 +14,8 @@ public class DesignSingleVO { @ApiModelProperty("全身图") private String designItemUrl; + @ApiModelProperty("当前全身图") + private String currentFullBodyView; @ApiModelProperty("clothes 数组") private List clothes; diff --git a/src/main/java/com/ai/da/service/ITDesignPythonOutfitDetailService.java b/src/main/java/com/ai/da/service/ITDesignPythonOutfitDetailService.java index 66053d60..0c7fccb6 100644 --- a/src/main/java/com/ai/da/service/ITDesignPythonOutfitDetailService.java +++ b/src/main/java/com/ai/da/service/ITDesignPythonOutfitDetailService.java @@ -33,7 +33,7 @@ public interface ITDesignPythonOutfitDetailService extends IService getDetailByDesignPythonOutfitId(Long designPythonOutfitId); - DesignPythonOutfitVO convertToDesignPythonOutfitVO(TDesignPythonOutfitDetail detail); + DesignPythonOutfitVO convertToDesignPythonOutfitVO(TDesignPythonOutfitDetail detail,List type); void deleteByDesignPythonOutfitId(Long designPythonOutfitId); 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 1d28cb44..b41a8f83 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -434,7 +434,10 @@ public class DesignItemServiceImpl extends ServiceImpl detailsVO = new ArrayList<>(); tDesignPythonOutfitDetails.forEach(detail -> { - detailsVO.add(designPythonOutfitDetailService.convertToDesignPythonOutfitVO(detail)); + Map> typeOffset = designSingleIncludeLayersDTO.getDesignSingleItemDTOList().stream() + .collect(Collectors.toMap(d -> d.getType().toLowerCase(), DesignSingleItemDTO::getOffset)); + String type = detail.getImageCategory().split("_")[0]; + detailsVO.add(designPythonOutfitDetailService.convertToDesignPythonOutfitVO(detail,typeOffset.get(type))); }); TDesignPythonOutfit designPythonOutfit = designPythonOutfitService.getByDesignItemId(designSingleIncludeLayersDTO.getDesignItemId()); @@ -442,7 +445,9 @@ public class DesignItemServiceImpl extends ServiceImpl designSingleItemDTOList, List layersObject){ @@ -522,6 +528,8 @@ public class DesignItemServiceImpl extends ServiceImpl { 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 273df5ef..4af1378d 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -987,7 +987,7 @@ public class DesignServiceImpl extends ServiceImpl impleme List details = designPythonOutfitDetailService.getDetailByDesignPythonOutfitId(designPythonOutfit.getId()); Assert.notEmpty(details, "Some errors occurred, please restart the design"); details.forEach(detail -> { - detailsVO.add(designPythonOutfitDetailService.convertToDesignPythonOutfitVO(detail)); + detailsVO.add(designPythonOutfitDetailService.convertToDesignPythonOutfitVO(detail,null)); }); // 2、将查询出的图层信息填充到designItemDetailVO中 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 2ea213d0..36c59193 100644 --- a/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java @@ -49,7 +49,7 @@ public class TDesignPythonOutfitDetailServiceImpl extends ServiceImpl offset){ if (Objects.isNull(detail)) { return null; } @@ -62,6 +62,7 @@ public class TDesignPythonOutfitDetailServiceImpl extends ServiceImpl size = Arrays.stream(detail.getImageSize().replaceAll("\\[|\\]", "").split(",")).map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());