diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PortalController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PortalController.java index b74194c..e23823f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PortalController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PortalController.java @@ -3,6 +3,7 @@ package org.dromara.system.controller.portal; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.lang.tree.Tree; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; @@ -12,10 +13,7 @@ import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.*; import org.dromara.system.domain.vo.*; import org.dromara.system.service.*; -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.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -31,17 +29,17 @@ import java.util.List; @RequestMapping("/portal") public class PortalController extends BaseController { - private final ISysHomeBannerService sysHomeBannerService; + private final ISysHomeBannerService bannerService; - private final ISysHomeShowService sysHomeShowService; + private final ISysHomeShowService showService; - private final ISysHomeTrendService sysHomeTrendService; + private final ISysHomeTrendService trendService; private final ISysCatalogResourceService resourceService; - private final ISysOssResourceService sysOssResourceService; + private final ISysOssResourceService ossResourceService; private final ISysCatalogTextbookService textbookService; - private final ISysOssTextbookService sysOssTextbookService; + private final ISysOssTextbookService ossTextbookService; /** @@ -50,7 +48,7 @@ public class PortalController extends BaseController { @SaIgnore @GetMapping("/banner/list") public TableDataInfo bannerList(SysHomeBannerBo bo, PageQuery pageQuery) { - return sysHomeBannerService.queryPageList(bo, pageQuery); + return bannerService.queryPageList(bo, pageQuery); } /** @@ -59,7 +57,7 @@ public class PortalController extends BaseController { @SaIgnore @GetMapping("/show/list") public TableDataInfo showList(SysHomeShowBo bo, PageQuery pageQuery) { - return sysHomeShowService.queryPageList(bo, pageQuery); + return showService.queryPageList(bo, pageQuery); } /** @@ -71,7 +69,7 @@ public class PortalController extends BaseController { @GetMapping("/show/{showId}") public R getShowInfo(@NotNull(message = "主键不能为空") @PathVariable Long showId) { - return R.ok(sysHomeShowService.queryById(showId)); + return R.ok(showService.queryById(showId)); } /** @@ -80,7 +78,7 @@ public class PortalController extends BaseController { @SaIgnore @GetMapping("/trend/list") public TableDataInfo trendList(SysHomeTrendBo bo, PageQuery pageQuery) { - return sysHomeTrendService.queryPageList(bo, pageQuery); + return trendService.queryPageList(bo, pageQuery); } /** @@ -92,7 +90,7 @@ public class PortalController extends BaseController { @GetMapping("/trend/{trendId}") public R getTrendInfo(@NotNull(message = "主键不能为空") @PathVariable Long trendId) { - return R.ok(sysHomeTrendService.queryById(trendId)); + return R.ok(trendService.queryById(trendId)); } /** @@ -131,7 +129,12 @@ public class PortalController extends BaseController { @SaIgnore @GetMapping("/resource/list") public TableDataInfo resourceList(SysOssResourceBo bo, PageQuery pageQuery) { - return sysOssResourceService.queryPageList(bo, pageQuery); + return ossResourceService.queryPageList(bo, pageQuery); + } + @SaIgnore + @PostMapping("/resource/preview/{id}") + public void resourcePreview(@PathVariable Long id, HttpServletResponse response) throws Exception { + ossResourceService.preview(id, response); } /** @@ -160,6 +163,12 @@ public class PortalController extends BaseController { @SaIgnore @GetMapping("/textbook/list") public TableDataInfo textbookList(SysOssTextbookBo bo, PageQuery pageQuery) { - return sysOssTextbookService.queryPageList(bo, pageQuery); + return ossTextbookService.queryPageList(bo, pageQuery); + } + + @SaIgnore + @PostMapping("/textbook/preview/{id}") + public void textbookPreview(@PathVariable Long id, HttpServletResponse response) throws Exception { + ossTextbookService.preview(id, response); } }