From 63890e5fb3a793782f10166259ab82c155c4fc87 Mon Sep 17 00:00:00 2001 From: wangxy <1481820854@qq.com> Date: Mon, 31 Mar 2025 14:46:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E4=B8=93=E9=A2=98?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/home/ColumnTreeController.java | 15 +++++++++++++++ .../ruoyi/web/controller/home/HomeController.java | 15 +++++++++++++++ .../com/ruoyi/framework/config/ShiroConfig.java | 1 + 3 files changed, 31 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/ColumnTreeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/ColumnTreeController.java index dd80f78..2267e6e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/ColumnTreeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/ColumnTreeController.java @@ -66,6 +66,21 @@ public class ColumnTreeController extends BaseController { return R.ok(tagTreeVOList); } + + @ApiOperation("专题活动树") + @GetMapping("/getSpecialTree") + public R> getSpecialTree(@RequestParam(required = false) String columnId) { + LambdaQueryWrapper tagWrapper = new LambdaQueryWrapper<>(); + tagWrapper.eq(SysColumn::getColumnId, columnId) + .eq(SysColumn::getColumnGrade, COLUMN_GRADE) + .eq(SysColumn::getStatus,STATUS) + .orderByAsc(SysColumn::getOrderNum); + List datas = columnService.list(tagWrapper); + List tagTreeVOList = new ArrayList<>(Convert.toList(SysColumnVO.class, datas)); + tagTreeVOList.forEach(this::buildChildren); + return R.ok(tagTreeVOList); + } + /** * 构建子节点 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java index 0d81569..cc11fde 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java @@ -328,6 +328,21 @@ public class HomeController { } + @ApiOperation("专题活动列表") + @GetMapping("/special_list.html") + public String specialList(ModelMap mmap, + @RequestParam(required = false, defaultValue = "2") String columnType) { + LambdaQueryWrapper queryWrapper= new LambdaQueryWrapper<>(); + queryWrapper.eq(SysColumn::getColumnType, columnType); + queryWrapper.eq(SysColumn::getColumnGrade, COLUMN_GRADE); + queryWrapper.eq(SysColumn::getStatus,STATUS); + queryWrapper.orderByAsc(SysColumn::getOrderNum); + List columnList = columnService.list(queryWrapper); + mmap.put("columnList", columnList); + return "home/special_list"; + } + + @ApiOperation("详情") @GetMapping("/public_view.html") public String notice(ModelMap mmap,@RequestParam(required = false) String type, @RequestParam String id) { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java index 60e24e5..908ea13 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java @@ -312,6 +312,7 @@ public class ShiroConfig filterChainDefinitionMap.put("/business_view.html", "anon"); filterChainDefinitionMap.put("/special_view.html", "anon"); filterChainDefinitionMap.put("/public_view.html", "anon"); + filterChainDefinitionMap.put("/special_list.html", "anon"); filterChainDefinitionMap.put("/profile/**", "anon"); filterChainDefinitionMap.put("/search", "anon"); filterChainDefinitionMap.put("/columnTree/**", "anon");