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 41565f5b..dd57d216 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -330,7 +330,7 @@ public class DesignItemServiceImpl extends ServiceImpl designSingleItemDTOList , Map categoryAndUndividedLayer , boolean changeModelFlag - , Long modelId, String modelType) { + , Long modelId, String modelType, boolean isSingleCollectionFlag) { DesignItem designItem = new DesignItem(); // String url = pythonObjects.getObjects().get(0).getBasic().getSave_name(); @@ -389,8 +389,11 @@ public class DesignItemServiceImpl extends ServiceImpl> priorityOffset = designSingleItemDTOList.stream() - .collect(Collectors.toMap(DesignSingleItemDTO::getPriority, DesignSingleItemDTO::getOffset)); + Map> priorityOffset = null; + if (!isSingleCollectionFlag){ + priorityOffset = designSingleItemDTOList.stream() + .collect(Collectors.toMap(DesignSingleItemDTO::getPriority, DesignSingleItemDTO::getOffset)); + } List list = setTDesignPythonOutfitDetailList(layers, designId, designPythonOutfit.getId(), userId, priorityOffset); designPythonOutfitDetailService.saveBatch(list); @@ -415,7 +418,9 @@ public class DesignItemServiceImpl extends ServiceImpl> priorityOffset = new HashMap<>(); + // 单品设计标志 + boolean isSingleCollectionFlag = true; if (design.getSingleOverall().equals("overall")){ + isSingleCollectionFlag = false; // 优先级 1、判断当前入参中是否有model数据 无 -> 2、判断design item 中是否有model数据 无 -> 3、从design表中拿model数据 仍然没有 报错 if (!Objects.isNull(designSingleIncludeLayersDTO.getModelId()) && !StringUtil.isNullOrEmpty(designSingleIncludeLayersDTO.getModelType())){ modelId = designSingleIncludeLayersDTO.getModelId(); @@ -524,6 +533,15 @@ public class DesignItemServiceImpl extends ServiceImpl> priorityOffset = new HashMap<>(); - try{ - priorityOffset = designSingleIncludeLayersDTO.getDesignSingleItemDTOList().stream() - .collect(Collectors.toMap(DesignSingleItemDTO::getPriority, DesignSingleItemDTO::getOffset)); - }catch (IllegalStateException e){ - // priority重复 - log.info("服装的priority重复"); - throw new BusinessException("priority.cannot.be.repeated"); - } JSONArray layers = outfit.getJSONArray("layers"); Map categoryAndUndividedLayer = setTypeAndUndividedLayer(layers); @@ -576,7 +584,7 @@ public class DesignItemServiceImpl extends ServiceImpl