From 6c98fa6643e00e6a31b87d58184b6470f990e76f Mon Sep 17 00:00:00 2001 From: Hentua <wangdoubleone@gmail.com> Date: Tue, 25 Apr 2023 23:08:17 +0800 Subject: [PATCH] fix --- src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 4 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java index 8e36c43..4b09b97 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java @@ -2,6 +2,7 @@ import cc.mrbird.febs.common.entity.FebsConstant; import cc.mrbird.febs.common.utils.FebsUtil; +import cc.mrbird.febs.mall.entity.MallNewsCategory; import cc.mrbird.febs.mall.entity.MallNewsInfo; import cc.mrbird.febs.mall.service.IMallNewsInfoService; import lombok.RequiredArgsConstructor; @@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; /** * @author wzy @@ -33,13 +35,21 @@ return FebsUtil.view("modules/news/newsInfoList"); } + + @GetMapping("knowledge") + @RequiresPermissions("newsInfoList:view") + public String knowledge() { + return FebsUtil.view("modules/news/knowledgeList"); + } + /** * 新闻中心-新增 * @return */ - @GetMapping("newsInfoAdd") + @GetMapping("newsInfoAdd/{code}") @RequiresPermissions("newsInfoAdd:add") - public String newsInfoAdd() { + public String newsInfoAdd(@PathVariable("code") String code, Model model) { + model.addAttribute("code", code); return FebsUtil.view("modules/news/newsInfoAdd"); } @@ -49,11 +59,38 @@ * @param model * @return */ - @GetMapping("newsInfoUpdate/{id}") + @GetMapping("newsInfoUpdate/{id}/{code}") @RequiresPermissions("newsInfoUpdate:update") - public String newsInfoUpdate(@PathVariable long id, Model model) { + public String newsInfoUpdate(@PathVariable("id") long id, @PathVariable("code") String code, Model model) { MallNewsInfo data = mallNewsInfoService.getNewsInfoById(id); + model.addAttribute("code", code); model.addAttribute("newsInfo", data); return FebsUtil.view("modules/news/newsInfoUpdate"); } + + @GetMapping("newsCategory") + @RequiresPermissions("news:category:view") + public String newsCategory() { + return FebsUtil.view("modules/news/newsCategory"); + } + + @GetMapping("addCategory") + @RequiresPermissions("news:category:add") + public String addCategory(Long id, Model model) { + if (id != null) { + MallNewsCategory obj = mallNewsInfoService.findNewsCategoryById(id); + model.addAttribute("obj", obj); + } + return FebsUtil.view("modules/news/newsCategoryAdd"); + } + + @GetMapping("updateCategory/{id}") + @RequiresPermissions("news:category:update") + public String updateCategory(@PathVariable Long id, Model model) { + if (id != null) { + MallNewsCategory obj = mallNewsInfoService.findNewsCategoryById(id); + model.addAttribute("obj", obj); + } + return FebsUtil.view("modules/news/newsCategoryAdd"); + } } -- Gitblit v1.9.1