diff --git a/src/main/java/com/ai/da/service/DesignService.java b/src/main/java/com/ai/da/service/DesignService.java index 3b55f1a4..0964685d 100644 --- a/src/main/java/com/ai/da/service/DesignService.java +++ b/src/main/java/com/ai/da/service/DesignService.java @@ -124,4 +124,6 @@ public interface DesignService extends IService { Boolean cloudTaskNameUpdate(CloudTaskDTO cloudTaskDTO); Boolean cloudTaskDelete(CloudTaskDTO cloudTaskDTO); + + String getAgeGroupByProjectOrCollectionId(Long projectId, Long collectionId); } diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java index a6f9b0f0..bd02a75a 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java @@ -358,6 +358,16 @@ public class CollectionElementServiceImpl extends ServiceImpl e, + (e1, e2) -> e1 // 冲突时保留第一个 + ), + map -> new ArrayList<>(map.values()) + )); //获取已存在相同的library List md5List = elements.stream().map(CollectionElement::getMd5).collect(Collectors.toList()); List existsLibrarys = libraryService.getByMD5List(md5List); 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 f1b87d72..733e98a4 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -1032,6 +1032,8 @@ public class DesignItemServiceImpl extends ServiceImpl impleme return requestId; } - private String getAgeGroupByProjectOrCollectionId(Long projectId, Long collectionId){ + public String getAgeGroupByProjectOrCollectionId(Long projectId, Long collectionId){ if (Objects.nonNull(projectId)){ Workspace workspace = workspaceService.getWSByProjectId(projectId); if (workspace != null && !StringUtil.isNullOrEmpty(workspace.getAgeGroup())){ diff --git a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java index 8fc315c4..8a9b55e5 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java @@ -789,7 +789,12 @@ public class LibraryServiceImpl extends ServiceImpl impl } else { library.setLevel3Type(uploadDTO.getModelSex()); } - library.setAgeGroup(uploadDTO.getAgeGroup()); + if (uploadDTO.getLevel1Type().equals(LibraryLevel1TypeEnum.SKETCH_BOARD.getRealName())&&StringUtils.isEmpty(uploadDTO.getAgeGroup())) { + log.error("前端未传ageGroup"); + library.setAgeGroup("Adult"); + } else { + library.setAgeGroup(uploadDTO.getAgeGroup()); + } libraryMapper.insert(library); return library; } else if (uploadDTO.getModelType().equals(ModelType.SYSTEM.getValue())) {