From f0aa041c1e53bb800404573cffd0f7de93c0a151 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Thu, 23 Nov 2023 14:05:04 +0800 Subject: [PATCH] =?UTF-8?q?TASK:=20=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=A4=9A?= =?UTF-8?q?=E8=AF=AD=E8=A8=80;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/model/vo/QueryLibraryPageVO.java | 3 +++ .../com/ai/da/service/impl/LibraryServiceImpl.java | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ai/da/model/vo/QueryLibraryPageVO.java b/src/main/java/com/ai/da/model/vo/QueryLibraryPageVO.java index 6e55d31c..eca67503 100644 --- a/src/main/java/com/ai/da/model/vo/QueryLibraryPageVO.java +++ b/src/main/java/com/ai/da/model/vo/QueryLibraryPageVO.java @@ -1,5 +1,6 @@ package com.ai.da.model.vo; +import com.ai.da.model.enums.BizJson; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -36,4 +37,6 @@ public class QueryLibraryPageVO { @ApiModelProperty("template 打点内容 level1Type为Models才传") private LibraryModelPointVO libraryModelPoint; + + private BizJson level2TypeEnum; } 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 942167bf..832d5794 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java @@ -15,9 +15,7 @@ import com.ai.da.mapper.LibraryMapper; import com.ai.da.mapper.SysFileMapper; import com.ai.da.mapper.entity.*; import com.ai.da.model.dto.*; -import com.ai.da.model.enums.MannequinType; -import com.ai.da.model.enums.ModelType; -import com.ai.da.model.enums.Sex; +import com.ai.da.model.enums.*; import com.ai.da.model.vo.*; import com.ai.da.python.vo.ModelPathObject; import com.ai.da.service.*; @@ -192,6 +190,12 @@ 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 (!StringUtils.isEmpty(libraryPageVO.getLevel2Type())) { + Position position = Position.getPosition(libraryPageVO.getLevel2Type()); + libraryPageVO.setLevel2TypeEnum(new BizJson(position.getValue(), position.name(), BusinessException.getMessageFromResource(position.name()))); + } + } return libraryPageVO; }); return PageBaseResponse.success(convert);