From 965ef50b86a0a5f95965c8820de3d49c8ec42b57 Mon Sep 17 00:00:00 2001 From: cjw Date: Thu, 20 Jun 2024 15:31:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E6=88=B7=E9=A6=96=E9=A1=B5=E4=B8=AD?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=99=E6=9D=90=E7=9B=AE=E5=BD=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/portal/PortalController.java | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) 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 8c14602..b6526fb 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 @@ -61,6 +61,7 @@ public class PortalController extends BaseController { public TableDataInfo showList(SysHomeShowBo bo, PageQuery pageQuery) { return sysHomeShowService.queryPageList(bo, pageQuery); } + /** * 获取学校名师详细信息 * @@ -69,7 +70,7 @@ public class PortalController extends BaseController { @SaCheckPermission("home:show:query") @GetMapping("/show/{showId}") public R getShowInfo(@NotNull(message = "主键不能为空") - @PathVariable Long showId) { + @PathVariable Long showId) { return R.ok(sysHomeShowService.queryById(showId)); } @@ -81,6 +82,7 @@ public class PortalController extends BaseController { public TableDataInfo trendList(SysHomeTrendBo bo, PageQuery pageQuery) { return sysHomeTrendService.queryPageList(bo, pageQuery); } + /** * 获取学校动态详细信息 * @@ -89,7 +91,7 @@ public class PortalController extends BaseController { @SaIgnore @GetMapping("/trend/{trendId}") public R getTrendInfo(@NotNull(message = "主键不能为空") - @PathVariable Long trendId) { + @PathVariable Long trendId) { return R.ok(sysHomeTrendService.queryById(trendId)); } @@ -108,7 +110,7 @@ public class PortalController extends BaseController { */ @SaIgnore @GetMapping("/resource/catalog/list") - public R> list(SysCatalogResourceBo bo) { + public R> resourceCatalogList(SysCatalogResourceBo bo) { List list = resourceService.queryList(bo); return R.ok(list); } @@ -118,7 +120,7 @@ public class PortalController extends BaseController { */ @SaIgnore @GetMapping("/resource/list") - public TableDataInfo list(SysOssResourceBo bo, PageQuery pageQuery) { + public TableDataInfo resourceList(SysOssResourceBo bo, PageQuery pageQuery) { return sysOssResourceService.queryPageList(bo, pageQuery); } @@ -126,18 +128,28 @@ public class PortalController extends BaseController { * 查询目录-同步教材 */ @SaIgnore - @GetMapping("/textbook/catalog/list") - public R>> list(SysCatalogTextbookBo bo) { + @GetMapping("/textbook/catalog/tree") + public R>> treeList(SysCatalogTextbookBo bo) { List> trees = textbookService.buildTreeSelect(bo); return R.ok(trees); } + /** + * 查询目录-同步教材 + */ + @SaIgnore + @GetMapping("/textbook/catalog/list") + public R> textbookCatalogList(SysCatalogTextbookBo bo) { + List list = textbookService.queryList(bo); + return R.ok(list); + } + /** * 查询同步教材列表 */ @SaIgnore @GetMapping("/textbook/list") - public TableDataInfo list(SysOssTextbookBo bo, PageQuery pageQuery) { + public TableDataInfo textbookList(SysOssTextbookBo bo, PageQuery pageQuery) { return sysOssTextbookService.queryPageList(bo, pageQuery); } }