diff --git a/src/main/java/com/ai/da/model/dto/LibraryModelPointDTO.java b/src/main/java/com/ai/da/model/dto/LibraryModelPointDTO.java index b77a54ea..b623a148 100644 --- a/src/main/java/com/ai/da/model/dto/LibraryModelPointDTO.java +++ b/src/main/java/com/ai/da/model/dto/LibraryModelPointDTO.java @@ -29,6 +29,8 @@ public class LibraryModelPointDTO implements Serializable { private String modelType; + private String modelSex; + @ApiModelProperty("templateId") private Long templateId; diff --git a/src/main/java/com/ai/da/service/LibraryService.java b/src/main/java/com/ai/da/service/LibraryService.java index d9e6a389..7ae5fc4a 100644 --- a/src/main/java/com/ai/da/service/LibraryService.java +++ b/src/main/java/com/ai/da/service/LibraryService.java @@ -46,6 +46,8 @@ public interface LibraryService extends IService { */ LibraryUpdateVo upload(LibraryUploadDTO libraryUploadDTO); + void checkModel(String value, List modelIds, Integer deleteModelConfirm); + /** * 编辑library 文件名 * diff --git a/src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java b/src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java index d3473898..f8a33ca1 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java @@ -10,6 +10,7 @@ import com.ai.da.mapper.entity.*; import com.ai.da.model.dto.LibraryModelPointDTO; import com.ai.da.model.dto.ModelsDotDTO; import com.ai.da.model.enums.ModelType; +import com.ai.da.model.enums.Sex; import com.ai.da.model.vo.LibraryModelPointVO; import com.ai.da.python.PythonService; import com.ai.da.python.vo.DesignPythonObjects; @@ -21,11 +22,13 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; +import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import javax.annotation.Resource; +import java.util.Collections; import java.util.List; import java.util.Objects; @@ -60,6 +63,18 @@ public class LibraryModelPointServiceImpl extends ServiceImpl impl libraryMapper.delete(qw); } - private void checkModel(String value, List modelIds, Integer deleteModelConfirm) { + + @Override + public void checkModel(String value, List modelIds, Integer deleteModelConfirm) { AuthPrincipalVo authPrincipalVo = UserContext.getUserHolder(); QueryWrapper qw = new QueryWrapper<>(); qw.lambda().eq(Workspace::getUserName, authPrincipalVo.getUsername()); diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties index 25febc3e..b727ac0d 100644 --- a/src/main/resources/messages_en.properties +++ b/src/main/resources/messages_en.properties @@ -172,5 +172,5 @@ BLOUSE=Blouse DRESS=Dress TROUSERS=Trousers SKIRT=Skirt -FEMALE=Female -MALE=Male \ No newline at end of file +FEMALE=Women's wear +MALE=Men's wear \ No newline at end of file diff --git a/src/main/resources/messages_zh.properties b/src/main/resources/messages_zh.properties index e153af8f..d4a51746 100644 --- a/src/main/resources/messages_zh.properties +++ b/src/main/resources/messages_zh.properties @@ -131,4 +131,17 @@ level1Type.cannot.be.empty=级别1类型不能为空! regionNum.cannot.be.empty=区域号不能为空! phone.cannot.be.empty=电话不能为空! printId.cannot.be.empty=印花ID不能为空! -path.cannot.be.empty=路径不能为空! \ No newline at end of file +path.cannot.be.empty=路径不能为空! + + +# 多语言返回 +OVERALL=整体 +TOPS=上装 +BOTTOMS=下装 +OUTWEAR=外套 +BLOUSE=衬衫 +DRESS=长裙 +TROUSERS=裤子 +SKIRT=短裙 +FEMALE=女装 +MALE=男装 \ No newline at end of file