From 965831ae6b531daf815bf937134d61ea312b3ded Mon Sep 17 00:00:00 2001 From: s2042968 Date: Mon, 3 Mar 2025 14:08:12 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/controller/EdTagLibraryController.java | 7 +++++++ .../software/manage/service/EdTagLibraryService.java | 7 +++++++ .../service/serviceimpl/EdTagLibraryServiceImpl.java | 12 ++++++++++++ 3 files changed, 26 insertions(+) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdTagLibraryController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdTagLibraryController.java index 9170e6d..eee28e2 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdTagLibraryController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdTagLibraryController.java @@ -76,5 +76,12 @@ public class EdTagLibraryController { public ElectromagneticResult listTagTree() { return ElectromagneticResultUtil.success(edTagLibraryService.listTagTree()); } + + // 查看所有标签 + @GetMapping ("/listAllTags") + @UserOperation(value="查看了所有标签", modelName = UserOperationModuleEnum.TAG) + public ElectromagneticResult listAllTags() { + return ElectromagneticResultUtil.success(edTagLibraryService.listAllTags()); + } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdTagLibraryService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdTagLibraryService.java index 0ba6a46..2760ae3 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdTagLibraryService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdTagLibraryService.java @@ -5,6 +5,7 @@ import com.electromagnetic.industry.software.common.pojo.TreeNode; import com.electromagnetic.industry.software.manage.pojo.models.EdTagLibrary; import com.electromagnetic.industry.software.manage.pojo.resp.TagListVO; +import javax.swing.text.html.HTML; import java.util.List; import java.util.Map; @@ -63,4 +64,10 @@ public interface EdTagLibraryService extends IService { * @return */ List listTagTree(); + + /** + * 获取所有标签 + * @return + */ + List listAllTags(); } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java index 0249c6e..2e7d95d 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java @@ -300,5 +300,17 @@ public class EdTagLibraryServiceImpl extends ServiceImpl listAllTags() { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(EdTagLibrary::getIsPublished, PublishEnum.PUBLISHED.getCode()) + .eq(EdTagLibrary::getType, TagTypeEnum.TAG.getCode()); + return this.list(queryWrapper); + } }