From 0c79739867935e267b7a32faa77699d279baf8be Mon Sep 17 00:00:00 2001 From: xupei Date: Thu, 8 May 2025 15:26:06 +0800 Subject: [PATCH] =?UTF-8?q?BUGFIX:=20design=E4=B9=8B=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E6=9C=AA=E5=88=86=E5=89=B2=E5=9B=BE=E7=89=87=E7=9A=84=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ai/da/service/DesignItemService.java | 2 ++ .../service/impl/DesignItemServiceImpl.java | 13 +++++++++- .../ai/da/service/impl/DesignServiceImpl.java | 24 +++++-------------- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/ai/da/service/DesignItemService.java b/src/main/java/com/ai/da/service/DesignItemService.java index 09e4adc9..6702ad52 100644 --- a/src/main/java/com/ai/da/service/DesignItemService.java +++ b/src/main/java/com/ai/da/service/DesignItemService.java @@ -55,6 +55,8 @@ public interface DesignItemService extends IService { Map setPriorityAndUndividedLayer(JSONArray layers); + Map setTypeAndUndividedLayer(JSONArray layers); + ComposeLayersVO editLayersPositionAndScale(EditLayersPositionAndScaleVO positionAndScaleVO) throws IOException; List selectDesignIdById(List designItemIdList); 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 2d8413aa..92ae196b 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -631,12 +631,23 @@ public class DesignItemServiceImpl extends ServiceImpl setTypeAndUndividedLayer(JSONArray layers){ + HashMap typeAndLayer = 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") && !typeAndLayer.containsKey(category)) typeAndLayer.put(category, jsonObject.getString("pattern_image_url")); + } + return typeAndLayer; + } + @Override @Transactional(rollbackFor = Exception.class) public ComposeLayersVO editLayersPositionAndScale(EditLayersPositionAndScaleVO positionAndScaleVO) throws IOException { 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 8a8599b3..9b49b211 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -786,7 +786,7 @@ public class DesignServiceImpl extends ServiceImpl impleme Map typePriority = list.stream().collect(Collectors.toMap(d -> d.getImageCategory().split("_")[0], d -> Math.abs(d.getPriority()), (existing, replacement) -> replacement)); - Map priorityAndUndividedLayer = designItemService.setPriorityAndUndividedLayer(layers); + Map typeAndUndividedLayer = designItemService.setTypeAndUndividedLayer(layers); for (DesignPythonItem detail : item.getItems()) { if (null == detail) { continue; @@ -797,12 +797,8 @@ public class DesignServiceImpl extends ServiceImpl impleme designItemDetail.setDesignItemId(designItemId); designItemDetail.setCollectionElementId(detail.getElementId()); designItemDetail.setCreateDate(DateUtil.getByTimeZone(timeZone)); - log.info("detail.getType: {}", detail.getType()); if (!detail.getType().equals("Body")){ - log.info("designItemDetail.getPriority(): {}", designItemDetail.getPriority()); - if (Objects.nonNull(designItemDetail.getPriority())){ - designItemDetail.setUndividedLayer(priorityAndUndividedLayer.get(designItemDetail.getPriority().toString())); - } + designItemDetail.setUndividedLayer(typeAndUndividedLayer.get(designItemDetail.getType())); } if (SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())) { designItemDetail.setPath(detail.getBody_path()); @@ -923,7 +919,7 @@ public class DesignServiceImpl extends ServiceImpl impleme Map typePriority = list.stream().collect(Collectors.toMap(d -> d.getImageCategory().split("_")[0], d -> Math.abs(d.getPriority()), (existing, replacement) -> replacement)); - Map priorityAndUndividedLayer = designItemService.setPriorityAndUndividedLayer(layers); + Map typeAndUndividedLayer = designItemService.setTypeAndUndividedLayer(layers); for (DesignPythonItem detail : item.getItems()) { if (null == detail) { continue; @@ -934,12 +930,8 @@ public class DesignServiceImpl extends ServiceImpl impleme designItemDetail.setDesignItemId(designItemId); designItemDetail.setCollectionElementId(detail.getElementId()); designItemDetail.setCreateDate(DateUtil.getByTimeZone(timeZone)); - log.info("detail.getType: {}", detail.getType()); if (!detail.getType().equals("Body")){ - log.info("designItemDetail.getPriority(): {}", designItemDetail.getPriority()); - if (Objects.nonNull(designItemDetail.getPriority())){ - designItemDetail.setUndividedLayer(priorityAndUndividedLayer.get(designItemDetail.getPriority().toString())); - } + designItemDetail.setUndividedLayer(typeAndUndividedLayer.get(designItemDetail.getType())); } if (SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())) { @@ -1990,7 +1982,7 @@ public class DesignServiceImpl extends ServiceImpl impleme Map typePriority = list.stream().collect(Collectors.toMap(d -> d.getImageCategory().split("_")[0], d -> Math.abs(d.getPriority()), (existing, replacement) -> replacement)); - Map priorityAndUndividedLayer = designItemService.setPriorityAndUndividedLayer(layers); + Map typeAndUndividedLayer = designItemService.setTypeAndUndividedLayer(layers); for (DesignPythonItem detail : item.getItems()) { if (null == detail) { continue; @@ -2001,12 +1993,8 @@ public class DesignServiceImpl extends ServiceImpl impleme designItemDetail.setDesignItemId(designItemId); designItemDetail.setCollectionElementId(detail.getElementId()); designItemDetail.setCreateDate(DateUtil.getByTimeZone(timeZone)); - log.info("detail.getType: {}", detail.getType()); if (!detail.getType().equals("Body")){ - log.info("designItemDetail.getPriority(): {}", designItemDetail.getPriority()); - if (Objects.nonNull(designItemDetail.getPriority())){ - designItemDetail.setUndividedLayer(priorityAndUndividedLayer.get(designItemDetail.getPriority().toString())); - } + designItemDetail.setUndividedLayer(typeAndUndividedLayer.get(designItemDetail.getType())); } if (SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())) { designItemDetail.setPath(detail.getBody_path());