From 7d8c3ca8f32cbec071cd886a53d3f9a5c95231bc Mon Sep 17 00:00:00 2001 From: xupei <1779019091@qq.com> Date: Mon, 9 Oct 2023 16:40:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9:=20des?= =?UTF-8?q?ignSingle=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=8F=82=E6=95=B0?= =?UTF-8?q?=20offset,currentFullBodyView?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ai/da/model/vo/DesignPythonOutfitVO.java | 3 +++ src/main/java/com/ai/da/model/vo/DesignSingleVO.java | 2 ++ .../service/ITDesignPythonOutfitDetailService.java | 2 +- .../ai/da/service/impl/DesignItemServiceImpl.java | 12 ++++++++++-- .../com/ai/da/service/impl/DesignServiceImpl.java | 2 +- .../impl/TDesignPythonOutfitDetailServiceImpl.java | 3 ++- 6 files changed, 19 insertions(+), 5 deletions(-) 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()); From 0f4a51af18b77550a3989c90543334bb29bb06f2 Mon Sep 17 00:00:00 2001 From: xupei <1779019091@qq.com> Date: Mon, 9 Oct 2023 16:53:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?test=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E7=AB=AF=E5=8F=A3=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA5567?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-test.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index d23d5046..1d99016b 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -1,4 +1,4 @@ -server.port=10086 +server.port=5567 #datasource spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver From 555c3cf0dd1e0bdb7eabbaeeb04d85f2decff392 Mon Sep 17 00:00:00 2001 From: xupei <1779019091@qq.com> Date: Mon, 9 Oct 2023 17:09:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9Adesign=20=E4=BF=9D=E5=AD=98=E5=8D=B0=E8=8A=B1=E7=9A=84?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E3=80=81=E8=A7=92=E5=BA=A6=E3=80=81=E4=BC=98?= =?UTF-8?q?=E5=85=88=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/service/impl/DesignServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 4af1378d..4d20bb40 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -511,7 +511,10 @@ public class DesignServiceImpl extends ServiceImpl impleme print.setDesignItemDetailId(designItemDetail.getId()); print.setPath(designItemDetail.getPrintPath()); print.setSingleOrOverall("overall"); + print.setPosition("[0.0,0.0]"); print.setScale(1d); + print.setAngle(0.0); + print.setPriority(1); print.setCreateDate(LocalDateTime.now()); designItemDetailPrintService.save(print); }