From 891f6fb15fbd60c82c38432b857ccd4704ae3045 Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 4 Jun 2024 15:19:30 +0800 Subject: [PATCH] =?UTF-8?q?Printboard=20level2Type=20=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/model/enums/Position.java | 5 ++++- src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java | 3 ++- src/main/resources/messages_en.properties | 5 ++++- src/main/resources/messages_zh.properties | 5 ++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ai/da/model/enums/Position.java b/src/main/java/com/ai/da/model/enums/Position.java index 498ed2f7..93ca5b63 100644 --- a/src/main/java/com/ai/da/model/enums/Position.java +++ b/src/main/java/com/ai/da/model/enums/Position.java @@ -16,7 +16,10 @@ public enum Position implements IEnumDisplay { BLOUSE("Blouse"), DRESS("Dress"), TROUSERS("Trousers"), - SKIRT("Skirt"); + SKIRT("Skirt"), + SLOGAN("Slogan"), + LOGO("Logo"), + PATTERN("Pattern"); private String value; 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 990f5848..86843f30 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java @@ -209,7 +209,8 @@ public class LibraryServiceImpl extends ServiceImpl impl if (finalMap != null && finalMap.containsKey(library.getId())) { libraryPageVO.setLibraryModelPoint(finalMap.get(library.getId())); } - if (libraryPageVO.getLevel1Type().equals(LibraryLevel1TypeEnum.SKETCH_BOARD.getRealName())) { + if (libraryPageVO.getLevel1Type().equals(LibraryLevel1TypeEnum.SKETCH_BOARD.getRealName()) + || libraryPageVO.getLevel1Type().equals(LibraryLevel1TypeEnum.PRINT_BOARD.getRealName())) { if (!StringUtils.isEmpty(libraryPageVO.getLevel2Type())) { Position position = Position.getPosition(libraryPageVO.getLevel2Type()); libraryPageVO.setLevel2TypeEnum(new BizJson(position.getValue(), position.name(), BusinessException.getMessageFromResource(position.name()))); diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties index 6d79efa8..b2ea358f 100644 --- a/src/main/resources/messages_en.properties +++ b/src/main/resources/messages_en.properties @@ -184,4 +184,7 @@ DRESS=Dress TROUSERS=Trousers SKIRT=Skirt FEMALE=Women's wear -MALE=Men's wear \ No newline at end of file +MALE=Men's wear +SLOGAN=Slogan +LOGO=Logo +PATTERN=Pattern \ No newline at end of file diff --git a/src/main/resources/messages_zh.properties b/src/main/resources/messages_zh.properties index 8fecb5f9..c197c25c 100644 --- a/src/main/resources/messages_zh.properties +++ b/src/main/resources/messages_zh.properties @@ -178,4 +178,7 @@ DRESS=长裙 TROUSERS=裤子 SKIRT=短裙 FEMALE=女装 -MALE=男装 \ No newline at end of file +MALE=男装 +SLOGAN=标语 +LOGO=标志 +PATTERN=图案 \ No newline at end of file