From 86ab0806fd998651d4b2c435c9ee2e78cd92c259 Mon Sep 17 00:00:00 2001 From: xupei Date: Thu, 14 Dec 2023 15:47:03 +0800 Subject: [PATCH] =?UTF-8?q?BUGFIX:=E8=A1=A3=E6=9C=8D=E5=9B=BE=E5=B1=82?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=98=E5=85=88=E7=BA=A7=E5=90=8E=E5=AF=B9?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/service/DesignItemDetailService.java | 2 ++ .../ITDesignPythonOutfitDetailService.java | 2 ++ .../impl/DesignItemDetailServiceImpl.java | 20 +++++++++++++++++++ .../ai/da/service/impl/DesignServiceImpl.java | 13 ++++++++---- .../TDesignPythonOutfitDetailServiceImpl.java | 13 ++++++++++++ 5 files changed, 46 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ai/da/service/DesignItemDetailService.java b/src/main/java/com/ai/da/service/DesignItemDetailService.java index 2ed66dd4..1f5663b5 100644 --- a/src/main/java/com/ai/da/service/DesignItemDetailService.java +++ b/src/main/java/com/ai/da/service/DesignItemDetailService.java @@ -19,4 +19,6 @@ public interface DesignItemDetailService extends IService { int deleteByDesignItemId(Long designItemId); List selectByDesignItemId(Long designItemId); + + void setDesignItemDetailPriority(List designItemDetailList); } diff --git a/src/main/java/com/ai/da/service/ITDesignPythonOutfitDetailService.java b/src/main/java/com/ai/da/service/ITDesignPythonOutfitDetailService.java index 56040bd2..e5296840 100644 --- a/src/main/java/com/ai/da/service/ITDesignPythonOutfitDetailService.java +++ b/src/main/java/com/ai/da/service/ITDesignPythonOutfitDetailService.java @@ -38,4 +38,6 @@ public interface ITDesignPythonOutfitDetailService extends IService details); + } diff --git a/src/main/java/com/ai/da/service/impl/DesignItemDetailServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignItemDetailServiceImpl.java index 07d5669d..30ff7c1b 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemDetailServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemDetailServiceImpl.java @@ -1,6 +1,7 @@ package com.ai.da.service.impl; import com.ai.da.common.config.exception.BusinessException; +import com.ai.da.common.enums.LayersPriorityEnum; import com.ai.da.mapper.DesignItemDetailMapper; import com.ai.da.mapper.entity.DesignItemDetail; import com.ai.da.service.DesignItemDetailService; @@ -13,6 +14,8 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; +import static com.ai.da.common.enums.LayersPriorityEnum.BODY; + /** * 服务实现类 * @@ -76,4 +79,21 @@ public class DesignItemDetailServiceImpl extends ServiceImpl designItemDetailList){ + for (DesignItemDetail detail:designItemDetailList){ + if (!detail.getType().equals(BODY.getType()) && detail.getPriority().equals(BODY.getValue())){ + detail.setPriority(LayersPriorityEnum.getValueByType(detail.getType()).getValue()); + } + } + } } 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 49000f4d..79db739c 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -5,10 +5,7 @@ import cn.hutool.core.exceptions.ExceptionUtil; import com.ai.da.common.config.FileProperties; import com.ai.da.common.config.exception.BusinessException; import com.ai.da.common.context.UserContext; -import com.ai.da.common.enums.CollectionLevel1TypeEnum; -import com.ai.da.common.enums.DesignTypeEnum; -import com.ai.da.common.enums.SingleOverallEnum; -import com.ai.da.common.enums.SysFileLevel2TypeEnum; +import com.ai.da.common.enums.*; import com.ai.da.common.utils.*; import com.ai.da.mapper.DesignMapper; import com.ai.da.mapper.GenerateDetailMapper; @@ -46,6 +43,7 @@ import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import static com.ai.da.common.enums.LayersPriorityEnum.BODY; import static com.ai.da.python.vo.DesignPythonItem.*; /** @@ -956,6 +954,9 @@ public class DesignServiceImpl extends ServiceImpl impleme flag = Boolean.TRUE; } + // 为没有优先级的衣服添加优先级 + designItemDetailService.setDesignItemDetailPriority(designItemDetails); + // 2、组装返回参数 DesignItemDetailVO response = new DesignItemDetailVO(); response.setSingleOverall(design.getSingleOverall()); @@ -1131,6 +1132,10 @@ public class DesignServiceImpl extends ServiceImpl impleme log.error("Layer information is empty! DesignPythonOutfitId is " + designPythonOutfit.getId()); throw new BusinessException("layer.information.not.found"); } + + // 为没有优先级的图层添加优先级 + designPythonOutfitDetailService.setDesignPythonOutfitDetailPriority(details); + details.forEach(detail -> { // List offset = new ArrayList<>(); // if (StringUtil.isNullOrEmpty(detail.getOffset()) || detail.getOffset().equals("null")) { 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 a72a2bcb..b24ba13e 100644 --- a/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java @@ -1,6 +1,7 @@ package com.ai.da.service.impl; import cn.hutool.core.collection.CollectionUtil; +import com.ai.da.common.enums.LayersPriorityEnum; import com.ai.da.common.utils.CopyUtil; import com.ai.da.common.utils.MinioUtil; import com.ai.da.mapper.TDesignPythonOutfitDetailMapper; @@ -21,6 +22,8 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; +import static com.ai.da.common.enums.LayersPriorityEnum.BODY; + /** * design item详情表 服务实现类 * @@ -88,4 +91,14 @@ public class TDesignPythonOutfitDetailServiceImpl extends ServiceImpl details){ + for (TDesignPythonOutfitDetail detail:details){ + if (!detail.getImageCategory().equals(BODY.getRealName()) && detail.getPriority().equals(BODY.getValue())){ + detail.setPriority(LayersPriorityEnum.getValueByLayerCategory(detail.getImageCategory()).getValue()); + } + } + } + }