From 39d8c7efcf7919869cf3d6018c7c9fcf120eb209 Mon Sep 17 00:00:00 2001 From: xupei Date: Thu, 15 Jan 2026 17:35:55 +0800 Subject: [PATCH] =?UTF-8?q?TASK:=E5=8F=96=E6=B6=88=E5=AD=98=E5=82=A8/?= =?UTF-8?q?=E8=BF=94=E5=9B=9EUndividedLayer=E5=92=8CUndividedLayerWithSing?= =?UTF-8?q?lePrint=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/da/model/dto/DesignSingleItemDTO.java | 4 +-- .../model/vo/DesignItemClothesDetailVO.java | 8 ++--- .../com/ai/da/service/DesignItemService.java | 2 +- .../service/impl/DesignItemServiceImpl.java | 33 +++++++++++-------- .../ai/da/service/impl/DesignServiceImpl.java | 29 ++++++++-------- 5 files changed, 41 insertions(+), 35 deletions(-) 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 e6cfcbad..37e4d25f 100644 --- a/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java @@ -73,10 +73,10 @@ public class DesignSingleItemDTO implements Serializable { @Schema(description = "45") private double rotate; - @Schema(description = "带overall印花未分割图片") + /*@Schema(description = "带overall印花未分割图片") private String undividedLayerBase64; @Schema(description = "带overall/single印花未分割图片") - private String undividedLayerWithSinglePrintBase64; + private String undividedLayerWithSinglePrintBase64;*/ } diff --git a/src/main/java/com/ai/da/model/vo/DesignItemClothesDetailVO.java b/src/main/java/com/ai/da/model/vo/DesignItemClothesDetailVO.java index 76e088fd..e7a4a401 100644 --- a/src/main/java/com/ai/da/model/vo/DesignItemClothesDetailVO.java +++ b/src/main/java/com/ai/da/model/vo/DesignItemClothesDetailVO.java @@ -1,5 +1,5 @@ -package com.ai.da.model.vo; - +package com.ai.da.model.vo; + import io.swagger.v3.oas.annotations.media.Schema; import com.ai.da.mapper.primary.entity.Gradient; @@ -62,11 +62,11 @@ public class DesignItemClothesDetailVO { @Schema(description = "渐变色信息") private Gradient gradient; - @Schema(description = "未分割的图层") +/* @Schema(description = "未分割的图层") private String undividedLayer; @Schema(description = "添加single印花的未分割的图层") - private String undividedLayerWithSinglePrint; + private String undividedLayerWithSinglePrint;*/ @Schema(description = "局部design") private PartialDesignDTO partialDesign; diff --git a/src/main/java/com/ai/da/service/DesignItemService.java b/src/main/java/com/ai/da/service/DesignItemService.java index 77488d87..43fa7c86 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 afd1137d..4a5f5841 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -363,7 +363,7 @@ public class DesignItemServiceImpl extends ServiceImpl saveDesignSingleItemDetailAndLayers(DesignPythonObjects pythonObjects , Long designId, Long designItemId, Long userId , JSONObject outfit, String timeZone, List designSingleItemDTOList - , Map> priorityAndUndividedLayer + /*, Map> priorityAndUndividedLayer*/ , boolean changeModelFlag , Long modelId, String modelType, boolean isSingleCollectionFlag, String designType) { @@ -424,6 +424,7 @@ public class DesignItemServiceImpl extends ServiceImpl " + JSONObject.toJSONString(clone)); @@ -835,13 +836,13 @@ public class DesignItemServiceImpl extends ServiceImpl> priorityAndUndividedLayer = setPriorityAndUndividedLayer(layers, designSingleIncludeLayersDTO); +// Map> priorityAndUndividedLayer = setPriorityAndUndividedLayer(layers, designSingleIncludeLayersDTO); if (!designSingleIncludeLayersDTO.getIsPreview()) { // 更新及保存图层信息 tDesignPythonOutfitDetails = saveDesignSingleItemDetailAndLayers(objects, design.getId(), designSingleIncludeLayersDTO.getDesignItemId() , userId, outfit, designSingleIncludeLayersDTO.getTimeZone() , designSingleIncludeLayersDTO.getDesignSingleItemDTOList() - , priorityAndUndividedLayer, changeModelFlag, modelId, modelType, isSingleCollectionFlag, designSingleIncludeLayersDTO.getDesignType()); + /*, priorityAndUndividedLayer*/, changeModelFlag, modelId, modelType, isSingleCollectionFlag, designSingleIncludeLayersDTO.getDesignType()); saveCollectionElement(designSingleIncludeLayersDTO); } else { @@ -875,8 +876,8 @@ public class DesignItemServiceImpl extends ServiceImpl designSingleItemDTOS) { designSingleItemDTOS.forEach(item -> { if (!StringUtil.isNullOrEmpty(item.getUndividedLayerBase64())) { @@ -1006,9 +1009,10 @@ public class DesignItemServiceImpl extends ServiceImpl> setPriorityAndUndividedLayer(JSONArray layers, DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO) { String designType = "default"; if (Objects.nonNull(designSingleIncludeLayersDTO)) { @@ -1037,7 +1041,7 @@ public class DesignItemServiceImpl extends ServiceImpl designSingleItemDTOList, List layersObject, - String singleOrOverall, - Map> priorityAndUndividedLayer) { + String singleOrOverall/*, + Map> priorityAndUndividedLayer*/) { DesignSingleVO designSingleVO = new DesignSingleVO(); ArrayList clothes = new ArrayList<>(); @@ -1191,6 +1195,7 @@ public class DesignItemServiceImpl extends ServiceImpl layers.getImageCategory().equals("body")).collect(Collectors.toList())); clothes.add(designItemClothesDetailVO); 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 246cc306..1d688f1e 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -713,9 +713,9 @@ 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 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())) { @@ -853,7 +853,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 typeAndUndividedLayer = designItemService.setTypeAndUndividedLayer(layers); +// Map typeAndUndividedLayer = designItemService.setTypeAndUndividedLayer(layers); for (DesignPythonItem detail : item.getItems()) { if (null == detail) { continue; @@ -864,9 +864,9 @@ public class DesignServiceImpl extends ServiceImpl impleme designItemDetail.setDesignItemId(designItemId); designItemDetail.setCollectionElementId(detail.getElementId()); designItemDetail.setCreateDate(DateUtil.getByTimeZone(timeZone)); - if (!detail.getType().equals("Body")) { + /*if (!detail.getType().equals("Body")) { designItemDetail.setUndividedLayer(typeAndUndividedLayer.get(designItemDetail.getType())); - } + }*/ if (SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())) { designItemDetail.setPath(detail.getBody_path()); @@ -1326,12 +1326,13 @@ public class DesignServiceImpl extends ServiceImpl impleme d.setScope(o.getPath().startsWith("aida-sys-image") ? "sys" : "user"); d.setLevel1Type(converTypeToLevel1(o.getType())); d.setGradient(JSONObject.parseObject(o.getGradientString(), Gradient.class)); + /*// 取消存储/返回UndividedLayer和UndividedLayerWithSinglePrint字段 if (!StringUtil.isNullOrEmpty(o.getUndividedLayer())) { d.setUndividedLayer(minioUtil.getPreSignedUrl(o.getUndividedLayer(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME)); } if (!StringUtil.isNullOrEmpty(o.getUndividedLayerWithSinglePrint())) { d.setUndividedLayerWithSinglePrint(minioUtil.getPreSignedUrl(o.getUndividedLayerWithSinglePrint(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME)); - } + }*/ // 根据designItemDetailId获取印花 List prints = designItemDetailPrintService.getByDesignItemDetailId(o.getId(), "print"); prints.removeIf(print -> !minioUtil.doesObjectExist(print.getPath())); @@ -2539,7 +2540,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 typeAndUndividedLayer = designItemService.setTypeAndUndividedLayer(layers); +// Map typeAndUndividedLayer = designItemService.setTypeAndUndividedLayer(layers); for (DesignPythonItem detail : item.getItems()) { if (null == detail) { continue; @@ -2550,9 +2551,9 @@ public class DesignServiceImpl extends ServiceImpl impleme designItemDetail.setDesignItemId(designItemId); designItemDetail.setCollectionElementId(detail.getElementId()); designItemDetail.setCreateDate(DateUtil.getByTimeZone(timeZone)); - if (!detail.getType().equals("Body")) { + /*if (!detail.getType().equals("Body")) { designItemDetail.setUndividedLayer(typeAndUndividedLayer.get(designItemDetail.getType())); - } + }*/ if (SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())) { designItemDetail.setPath(detail.getBody_path()); //BODY不关联businessId