From 9b589eece6b503248b50f7c442e1fb801e0b5a7e Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Tue, 25 Jun 2024 10:59:58 +0800 Subject: [PATCH] TASK:aida; --- .../ai/da/common/config/MyTaskScheduler.java | 5 +++- .../ai/da/controller/PortfolioController.java | 6 +++++ .../ai/da/controller/WorkspaceController.java | 4 ++-- .../secondary/AttributeRetrievalMapper.java | 4 ++++ .../secondary/entity/AttributeRetrieval.java | 6 ++--- .../ai/da/model/enums/StyleKeywordMapper.java | 2 +- .../java/com/ai/da/model/vo/WorkspaceVO.java | 2 ++ .../com/ai/da/service/PortfolioService.java | 2 ++ .../com/ai/da/service/WorkspaceService.java | 2 +- .../da/service/impl/PortfolioServiceImpl.java | 24 +++++++++++++++++++ .../da/service/impl/WorkspaceServiceImpl.java | 9 +++++-- .../secondary/AttributeRetrievalMapper.xml | 14 +++++++++++ 12 files changed, 70 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java index 514797f8..6fb19b5a 100644 --- a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java +++ b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java @@ -217,7 +217,10 @@ public class MyTaskScheduler { String directoryPath = "C:\\Users\\10233\\Downloads\\blouse done\\blouse done\\废土风"; List fileNames = getFileNames(directoryPath); for (String fileName : fileNames) { - + String tableName = "female_top"; + String style = "feitufeng"; + Long idByFileName = attributeRetrievalMapper.getIdByFileName(fileName, tableName); + attributeRetrievalMapper.updateStyleById(idByFileName, style, tableName); } } diff --git a/src/main/java/com/ai/da/controller/PortfolioController.java b/src/main/java/com/ai/da/controller/PortfolioController.java index 725c178a..d2c2fcfd 100644 --- a/src/main/java/com/ai/da/controller/PortfolioController.java +++ b/src/main/java/com/ai/da/controller/PortfolioController.java @@ -105,4 +105,10 @@ public class PortfolioController { public Response viewsGet(@RequestParam("id") Long id) { return Response.success(portfolioService.viewsGet(id)); } + + @ApiOperation(value = "删除评论") + @PostMapping("/commentDelete") + public Response commentDelete(@Valid @RequestBody CommentDTO commentDTO) { + return Response.success(portfolioService.commentDelete(commentDTO)); + } } diff --git a/src/main/java/com/ai/da/controller/WorkspaceController.java b/src/main/java/com/ai/da/controller/WorkspaceController.java index 883239a2..436da3d8 100644 --- a/src/main/java/com/ai/da/controller/WorkspaceController.java +++ b/src/main/java/com/ai/da/controller/WorkspaceController.java @@ -95,8 +95,8 @@ public class WorkspaceController { @GetMapping("/getMannequins") @ApiOperationSupport(order = 6) @ApiOperation(value = "获取模特") - public Response> getMannequins(@RequestParam("sex") String sex) { - List modelsVO = workspaceService.getMannequins(sex); + public Response> getMannequins(@RequestParam("sex") String sex, @RequestParam("style") String style) { + List modelsVO = workspaceService.getMannequins(sex, style); return Response.success(modelsVO); } diff --git a/src/main/java/com/ai/da/mapper/secondary/AttributeRetrievalMapper.java b/src/main/java/com/ai/da/mapper/secondary/AttributeRetrievalMapper.java index cd657a7e..6b74dc9e 100644 --- a/src/main/java/com/ai/da/mapper/secondary/AttributeRetrievalMapper.java +++ b/src/main/java/com/ai/da/mapper/secondary/AttributeRetrievalMapper.java @@ -22,4 +22,8 @@ public interface AttributeRetrievalMapper { AttributeRetrieval getSystemRandom(String tableName); List getSystemSketchPoolBySameCategory(AttributeRetrieval attributeRetrievalAttrDict, String tableName); + + Long getIdByFileName(String fileName, String tableName); + + void updateStyleById(Long idByFileName, String style, String tableName); } diff --git a/src/main/java/com/ai/da/mapper/secondary/entity/AttributeRetrieval.java b/src/main/java/com/ai/da/mapper/secondary/entity/AttributeRetrieval.java index c8611586..84cc1b91 100644 --- a/src/main/java/com/ai/da/mapper/secondary/entity/AttributeRetrieval.java +++ b/src/main/java/com/ai/da/mapper/secondary/entity/AttributeRetrieval.java @@ -18,7 +18,7 @@ public class AttributeRetrieval { private String openingType; private String subtype; - private String sleeve; - private String sleeve1; - private String sleeve2; + private String style; + + private Integer deprecated; } diff --git a/src/main/java/com/ai/da/model/enums/StyleKeywordMapper.java b/src/main/java/com/ai/da/model/enums/StyleKeywordMapper.java index 29debd77..6f13dd6e 100644 --- a/src/main/java/com/ai/da/model/enums/StyleKeywordMapper.java +++ b/src/main/java/com/ai/da/model/enums/StyleKeywordMapper.java @@ -82,7 +82,7 @@ public class StyleKeywordMapper { wabiSabiKeywords.put("Printboard", Arrays.asList("natural materials such as wood", "stone", "hemp rope", "neutral tones and light colors")); wabiSabiKeywords.put("Sketchboard", Arrays.asList("a quiet and peaceful atmosphere")); - styleCategoryKeywords.put(StyleEnum.NEO_CHINESE, neoChineseKeywords); + styleCategoryKeywords.put(StyleEnum.NEW_CHINESE, neoChineseKeywords); styleCategoryKeywords.put(StyleEnum.COUNTRY_STYLE, countryStyleKeywords); styleCategoryKeywords.put(StyleEnum.FUTURISM, futurismKeywords); styleCategoryKeywords.put(StyleEnum.MINIMALISM, minimalistKeywords); diff --git a/src/main/java/com/ai/da/model/vo/WorkspaceVO.java b/src/main/java/com/ai/da/model/vo/WorkspaceVO.java index 71710978..fdc911da 100644 --- a/src/main/java/com/ai/da/model/vo/WorkspaceVO.java +++ b/src/main/java/com/ai/da/model/vo/WorkspaceVO.java @@ -38,6 +38,8 @@ public class WorkspaceVO extends Workspace { private String styleName; + private String style; + private Map> allKeywordsByStyle; } diff --git a/src/main/java/com/ai/da/service/PortfolioService.java b/src/main/java/com/ai/da/service/PortfolioService.java index aa6ca14b..bd7fcbb4 100644 --- a/src/main/java/com/ai/da/service/PortfolioService.java +++ b/src/main/java/com/ai/da/service/PortfolioService.java @@ -35,4 +35,6 @@ public interface PortfolioService extends IService { Boolean viewsIncrease(Long id); Long viewsGet(Long id); + + Boolean commentDelete(CommentDTO commentDTO); } diff --git a/src/main/java/com/ai/da/service/WorkspaceService.java b/src/main/java/com/ai/da/service/WorkspaceService.java index e74489e5..83fb4090 100644 --- a/src/main/java/com/ai/da/service/WorkspaceService.java +++ b/src/main/java/com/ai/da/service/WorkspaceService.java @@ -40,7 +40,7 @@ public interface WorkspaceService extends IService { WorkspaceVO getByIdNew(Long id); - List getMannequins(String sex); + List getMannequins(String sex, String style); void systemFileCopy(); diff --git a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java index 3d347b4f..8e29615c 100644 --- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java @@ -15,6 +15,7 @@ import com.ai.da.model.enums.Sex; import com.ai.da.model.vo.*; import com.ai.da.service.*; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -635,6 +636,29 @@ public class PortfolioServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(Comment::getParentLevel1Id, id) + .or() + .eq(Comment::getParentLevel2Id, id); + commentMapper.delete(lambdaQueryWrapper); + + return Boolean.TRUE; + } + private List getChildCommentVOList(Long id) { QueryWrapper qw = new QueryWrapper<>(); qw.lambda().eq(Comment::getParentLevel1Id, id); diff --git a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java index 05bd6a2d..c48995bd 100644 --- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java @@ -310,7 +310,7 @@ public class WorkspaceServiceImpl extends ServiceImpl> allKeywordsByStyle = StyleKeywordMapper.getAllKeywordsByStyle(styleEnum); vo.setAllKeywordsByStyle(allKeywordsByStyle); if (authPrincipalVo.getLanguage().equals(Language.ENGLISH.name())) { @@ -323,7 +323,7 @@ public class WorkspaceServiceImpl extends ServiceImpl getMannequins(String sex) { + public List getMannequins(String sex, String style) { AuthPrincipalVo userInfo = UserContext.getUserHolder(); List result = new ArrayList<>(); QueryWrapper libraryQueryWrapper = new QueryWrapper<>(); @@ -350,6 +350,11 @@ public class WorkspaceServiceImpl extends ServiceImpl sysFileList = sysFileMapper.selectList(sysFileQueryWrapper); if (!CollectionUtils.isEmpty(sysFileList)) { List modelVOList = new ArrayList<>(); diff --git a/src/main/resources/mapper/secondary/AttributeRetrievalMapper.xml b/src/main/resources/mapper/secondary/AttributeRetrievalMapper.xml index 434ab153..85113c9f 100644 --- a/src/main/resources/mapper/secondary/AttributeRetrievalMapper.xml +++ b/src/main/resources/mapper/secondary/AttributeRetrievalMapper.xml @@ -65,4 +65,18 @@ RAND() LIMIT 20 + + + + + update ${tableName} + set style = #{style} + where ID = #{id} +