From 4ba5f63a62230c170e9057ebbc1473638b92c7bc Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Mon, 27 May 2024 15:05:46 +0800 Subject: [PATCH] TASK:workspace; --- .../common/enums/LibraryLevel1TypeEnum.java | 3 +- .../ai/da/model/enums/DesignElementsEnum.java | 48 +++++++++++++++++++ .../java/com/ai/da/model/enums/Language.java | 3 +- .../model/enums/PrintboardLevel2TypeEnum.java | 42 ++++++++++++++++ .../impl/ClassificationServiceImpl.java | 16 ++++++- .../da/service/impl/LibraryServiceImpl.java | 23 ++++----- 6 files changed, 121 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/ai/da/model/enums/DesignElementsEnum.java create mode 100644 src/main/java/com/ai/da/model/enums/PrintboardLevel2TypeEnum.java diff --git a/src/main/java/com/ai/da/common/enums/LibraryLevel1TypeEnum.java b/src/main/java/com/ai/da/common/enums/LibraryLevel1TypeEnum.java index bed5a60c..d3441eb7 100644 --- a/src/main/java/com/ai/da/common/enums/LibraryLevel1TypeEnum.java +++ b/src/main/java/com/ai/da/common/enums/LibraryLevel1TypeEnum.java @@ -27,7 +27,8 @@ public enum LibraryLevel1TypeEnum { /** * 模特 */ - MODELS("Models"); + MODELS("Models"), + DESIGN_ELEMENTS("DesignElements"); private String realName; diff --git a/src/main/java/com/ai/da/model/enums/DesignElementsEnum.java b/src/main/java/com/ai/da/model/enums/DesignElementsEnum.java new file mode 100644 index 00000000..ac58a75f --- /dev/null +++ b/src/main/java/com/ai/da/model/enums/DesignElementsEnum.java @@ -0,0 +1,48 @@ +package com.ai.da.model.enums; + +import com.fasterxml.jackson.annotation.JsonValue; + +public enum DesignElementsEnum { + EMBROIDERY("刺绣", "Embroidery"), + BEADING("钉珠", "Beading"), + PEARL("珍珠", "Pearl"), + RIVET("铆钉", "Rivet"), + BUTTON("纽扣", "Button"), + BELT("腰带", "Belt"), + CORSAGE("胸花", "Corsage"), + ZIPPER("拉链", "Zipper"), + POCKET("口袋", "Pocket"); + + private final String chinese; + private final String english; + + // 构造函数 + DesignElementsEnum(String chinese, String english) { + this.chinese = chinese; + this.english = english; + } + + // 获取中文描述 + public String getChinese() { + return chinese; + } + + // 获取英文描述 + public String getEnglish() { + return english; + } + + // 重写toString方法，返回格式化的描述 + @Override + public String toString() { + return chinese + " (" + english + ")"; + } + public static DesignElementsEnum fromName(String name) { + for (DesignElementsEnum designElement : DesignElementsEnum.values()) { + if (designElement.name().equals(name)) { + return designElement; + } + } + throw new IllegalArgumentException("No enum constant for name: " + name); + } +} diff --git a/src/main/java/com/ai/da/model/enums/Language.java b/src/main/java/com/ai/da/model/enums/Language.java index 776522ff..bbfcc0ad 100644 --- a/src/main/java/com/ai/da/model/enums/Language.java +++ b/src/main/java/com/ai/da/model/enums/Language.java @@ -8,6 +8,7 @@ import lombok.Getter; * @Date: 2023/10/31 14:16 * @Description: 语言 */ +@Getter public enum Language implements IEnumDisplay { ENGLISH("en", "US"), // 英文 @@ -29,7 +30,7 @@ public enum Language implements IEnumDisplay { ITALIAN("it", "IT"); // 意大利语 private String languageCode; - @Getter + private String countryCode; Language(String languageCode, String countryCode) { diff --git a/src/main/java/com/ai/da/model/enums/PrintboardLevel2TypeEnum.java b/src/main/java/com/ai/da/model/enums/PrintboardLevel2TypeEnum.java new file mode 100644 index 00000000..3dded896 --- /dev/null +++ b/src/main/java/com/ai/da/model/enums/PrintboardLevel2TypeEnum.java @@ -0,0 +1,42 @@ +package com.ai.da.model.enums; + +public enum PrintboardLevel2TypeEnum { + SLOGAN("标语", "Slogan"), + LOGO("标志", "Logo"), + PATTERN("图案", "Pattern"); + + private final String chinese; + private final String english; + + // 构造函数 + PrintboardLevel2TypeEnum(String chinese, String english) { + this.chinese = chinese; + this.english = english; + } + + // 获取中文描述 + public String getChinese() { + return chinese; + } + + // 获取英文描述 + public String getEnglish() { + return english; + } + + // 重写toString方法，返回格式化的描述 + @Override + public String toString() { + return chinese + " (" + english + ")"; + } + + // 根据名称获取枚举值 + public static PrintboardLevel2TypeEnum fromName(String name) { + for (PrintboardLevel2TypeEnum designElement : PrintboardLevel2TypeEnum.values()) { + if (designElement.name().equals(name)) { + return designElement; + } + } + throw new IllegalArgumentException("No enum constant for name: " + name); + } +} diff --git a/src/main/java/com/ai/da/service/impl/ClassificationServiceImpl.java b/src/main/java/com/ai/da/service/impl/ClassificationServiceImpl.java index 1cd31f03..940725c5 100644 --- a/src/main/java/com/ai/da/service/impl/ClassificationServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ClassificationServiceImpl.java @@ -13,6 +13,8 @@ import com.ai.da.mapper.primary.ClassificationRelLibraryMapper; import com.ai.da.mapper.primary.entity.Classification; import com.ai.da.mapper.primary.entity.ClassificationRelLibrary; import com.ai.da.model.dto.ClassificationDTO; +import com.ai.da.model.enums.DesignElementsEnum; +import com.ai.da.model.enums.Language; import com.ai.da.model.vo.AuthPrincipalVo; import com.ai.da.model.vo.ClassificationVO; import com.ai.da.service.ClassificationService; @@ -106,7 +108,19 @@ public class ClassificationServiceImpl implements ClassificationService { List classificationList = classificationMapper.selectList(qw); if (CollectionUtil.isNotEmpty(classificationList)) { // 获取结果集 - return getClassificationVOList(classificationList); + List classificationVOList = getClassificationVOList(classificationList); + if (classificationDTO.getType().equals("DesignElements")) { + for (ClassificationVO classificationVO : classificationVOList) { + String classificationName = classificationVO.getClassificationName(); + DesignElementsEnum designElementsEnum = DesignElementsEnum.fromName(classificationName); + if (userHolder.getLanguage().equals(Language.ENGLISH.name())) { + classificationVO.setClassificationName(designElementsEnum.getEnglish()); + }else { + classificationVO.setClassificationName(designElementsEnum.getChinese()); + } + } + } + return classificationVOList; } return new ArrayList<>(); } 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 bc09dd9c..990f5848 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java @@ -130,10 +130,10 @@ public class LibraryServiceImpl extends ServiceImpl impl queryWrapper.eq("level2_type", query.getModelSex()); } if (!StringUtils.isEmpty(query.getLevel2Type())) { - CollectionLevel2TypeEnum level2TypeEnum = CollectionLevel2TypeEnum.of(query.getLevel2Type()); - if (Objects.isNull(level2TypeEnum)) { - throw new BusinessException("unknown.parameter.level2Type"); - } +// CollectionLevel2TypeEnum level2TypeEnum = CollectionLevel2TypeEnum.of(query.getLevel2Type()); +// if (Objects.isNull(level2TypeEnum)) { +// throw new BusinessException("unknown.parameter.level2Type"); +// } queryWrapper.eq("level2_type", query.getLevel2Type()); } if (!StringUtils.isEmpty(query.getType())) { @@ -228,13 +228,13 @@ public class LibraryServiceImpl extends ServiceImpl impl if (Objects.isNull(level1TypeEnum)) { throw new BusinessException("unknown.parameter.level1Type"); } - if (!StringUtils.isEmpty(libraryUploadDTO.getLevel2Type())) { - CollectionLevel2TypeEnum level2TypeEnum = CollectionLevel2TypeEnum.of(libraryUploadDTO.getLevel2Type()); - if (Objects.isNull(level2TypeEnum)) { - throw new BusinessException("unknown.parameter.level2Type"); - } - } - if (level1TypeEnum.equals(LibraryLevel1TypeEnum.SKETCH_BOARD) && StringUtils.isEmpty(libraryUploadDTO.getLevel2Type())) { +// if (!StringUtils.isEmpty(libraryUploadDTO.getLevel2Type())) { +// CollectionLevel2TypeEnum level2TypeEnum = CollectionLevel2TypeEnum.of(libraryUploadDTO.getLevel2Type()); +// if (Objects.isNull(level2TypeEnum)) { +// throw new BusinessException("unknown.parameter.level2Type"); +// } +// } + if ((level1TypeEnum.equals(LibraryLevel1TypeEnum.SKETCH_BOARD) || level1TypeEnum.equals(LibraryLevel1TypeEnum.PRINT_BOARD) || level1TypeEnum.equals(LibraryLevel1TypeEnum.DESIGN_ELEMENTS)) && StringUtils.isEmpty(libraryUploadDTO.getLevel2Type())) { throw new BusinessException("level2Type.cannot.be.empty"); } String path = calculateFileUrl(level1TypeEnum, libraryUploadDTO.getLevel2Type(), libraryUploadDTO.getModelSex(), userInfo.getId()); @@ -244,6 +244,7 @@ public class LibraryServiceImpl extends ServiceImpl impl case MOOD_BOARD: case PRINT_BOARD: case SKETCH_BOARD: + case DESIGN_ELEMENTS: bucketName = users; break; case MARKETING_SKETCH: