diff --git a/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java b/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java index 37e4d25f..ddf08663 100644 --- a/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java @@ -1,5 +1,6 @@ package com.ai.da.model.dto; +import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.media.Schema; import com.ai.da.mapper.primary.entity.Gradient; @@ -73,10 +74,12 @@ public class DesignSingleItemDTO implements Serializable { @Schema(description = "45") private double rotate; - /*@Schema(description = "带overall印花未分割图片") + @Hidden + @Schema(description = "带overall印花未分割图片") private String undividedLayerBase64; + @Hidden @Schema(description = "带overall/single印花未分割图片") - private String undividedLayerWithSinglePrintBase64;*/ + private String undividedLayerWithSinglePrintBase64; } diff --git a/src/main/java/com/ai/da/service/DesignItemService.java b/src/main/java/com/ai/da/service/DesignItemService.java index 43fa7c86..e32fb5e8 100644 --- a/src/main/java/com/ai/da/service/DesignItemService.java +++ b/src/main/java/com/ai/da/service/DesignItemService.java @@ -53,7 +53,7 @@ public interface DesignItemService extends IService { DesignSingleVO designSingleIncludeLayers(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO); - // Map> setPriorityAndUndividedLayer(JSONArray layers, DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO); + Map> setPriorityAndUndividedLayer(JSONArray layers, DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO); Map setTypeAndUndividedLayer(JSONArray layers); 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 c1ddd30d..b970b23c 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -989,8 +989,6 @@ public class DesignItemServiceImpl extends ServiceImpl designSingleItemDTOS) { designSingleItemDTOS.forEach(item -> { if (!StringUtil.isNullOrEmpty(item.getUndividedLayerBase64())) { @@ -1025,10 +1023,9 @@ public class DesignItemServiceImpl extends ServiceImpl> setPriorityAndUndividedLayer(JSONArray layers, DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO) { String designType = "default"; if (Objects.nonNull(designSingleIncludeLayersDTO)) { @@ -1057,7 +1054,7 @@ public class DesignItemServiceImpl extends ServiceImpl impleme Map typePriority = list.stream().collect(Collectors.toMap(d -> d.getImageCategory().split("_")[0], d -> Math.abs(d.getPriority()), (existing, replacement) -> replacement)); -// Map typeAndUndividedLayer = designItemService.setTypeAndUndividedLayer(layers); -// log.info("all typeLayers Map:{}", typeAndUndividedLayer); -// Map> priorityAndUndividedLayer = designItemService.setPriorityAndUndividedLayer(layers, null); + Map typeAndUndividedLayer = designItemService.setTypeAndUndividedLayer(layers); + log.info("all typeLayers Map:{}", typeAndUndividedLayer); + Map> priorityAndUndividedLayer = designItemService.setPriorityAndUndividedLayer(layers, null); for (DesignPythonItem detail : item.getItems()) { if (null == detail) { continue; @@ -727,10 +727,10 @@ public class DesignServiceImpl extends ServiceImpl impleme designItemDetail.setCollectionElementId(detail.getElementId()); designItemDetail.setCreateDate(DateUtil.getByTimeZone(timeZone)); log.info("detail.getType():{}", detail.getType()); -/* if (!detail.getType().equals("Body")) { + if (!detail.getType().equals("Body")) { log.info("layer : {}", typeAndUndividedLayer.get(designItemDetail.getType())); designItemDetail.setUndividedLayer(typeAndUndividedLayer.get(designItemDetail.getType())); - }*/ + } if (SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())) { designItemDetail.setPath(detail.getBody_path()); //BODY不关联businessId @@ -742,8 +742,8 @@ public class DesignServiceImpl extends ServiceImpl impleme 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)); - /*designItemDetail.setUndividedLayer(priorityAndUndividedLayer.get(designItemDetail.getPriority().toString()).get(0)); - designItemDetail.setUndividedLayerWithSinglePrint(priorityAndUndividedLayer.get(designItemDetail.getPriority().toString()).get(1));*/ + designItemDetail.setUndividedLayer(priorityAndUndividedLayer.get(designItemDetail.getPriority().toString()).get(0)); + designItemDetail.setUndividedLayerWithSinglePrint(priorityAndUndividedLayer.get(designItemDetail.getPriority().toString()).get(1)); } designItemDetailService.save(designItemDetail); if (!SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType()) && !StringUtil.isNullOrEmpty(designItemDetail.getPrintPath())) {