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 ac8b4f6..fb0a797 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 @@ -1,7 +1,9 @@ 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.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.mybatis.core.page.PageQuery; @@ -11,6 +13,7 @@ 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; @@ -58,6 +61,17 @@ public class PortalController extends BaseController { public TableDataInfo showList(SysHomeShowBo bo, PageQuery pageQuery) { return sysHomeShowService.queryPageList(bo, pageQuery); } + /** + * 获取学校名师详细信息 + * + * @param showId 主键 + */ + @SaCheckPermission("home:show:query") + @GetMapping("/show/{showId}") + public R getShowInfo(@NotNull(message = "主键不能为空") + @PathVariable Long showId) { + return R.ok(sysHomeShowService.queryById(showId)); + } /** * 查询学校动态列表 @@ -67,6 +81,17 @@ public class PortalController extends BaseController { public TableDataInfo trendList(SysHomeTrendBo bo, PageQuery pageQuery) { return sysHomeTrendService.queryPageList(bo, pageQuery); } + /** + * 获取学校动态详细信息 + * + * @param trendId 主键 + */ + @SaIgnore + @GetMapping("/trend/{trendId}") + public R getTrendInfo(@NotNull(message = "主键不能为空") + @PathVariable Long trendId) { + return R.ok(sysHomeTrendService.queryById(trendId)); + } /** @@ -93,8 +118,8 @@ public class PortalController extends BaseController { */ @SaIgnore @GetMapping("/textbook/catalog/list") - public R>> list() { - List> trees = textbookService.buildTreeSelect(); + public R>> list(SysCatalogTextbookBo bo) { + List> trees = textbookService.buildTreeSelect(bo); return R.ok(trees); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogResource.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogResource.java index 8b39aab..0d5654e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogResource.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogResource.java @@ -47,6 +47,11 @@ public class SysCatalogResource extends TenantEntity { */ private Long orderNum; + /** + * 1主目录,2资源,3目录 + */ + private Integer type; + /** * 封面 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysCatalogResourceBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysCatalogResourceBo.java index 9a09dee..454654e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysCatalogResourceBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysCatalogResourceBo.java @@ -47,6 +47,11 @@ public class SysCatalogResourceBo extends BaseEntity { */ private Long orderNum; + /** + * 1主目录,2资源,3目录 + */ + private Integer type; + /** * 封面 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysCatalogTextbookBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysCatalogTextbookBo.java index e25a836..0ea5ba0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysCatalogTextbookBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysCatalogTextbookBo.java @@ -50,7 +50,6 @@ public class SysCatalogTextbookBo extends BaseEntity { /** * 1暂定,2学段,3年级,4学科,5版本,6教材,7目录 */ - @NotNull(message = "1暂定,2学段,3年级,4学科,5版本,6教材,7目录不能为空", groups = { AddGroup.class, EditGroup.class }) private Integer type; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogResourceVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogResourceVo.java index 440b181..8eed435 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogResourceVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogResourceVo.java @@ -24,37 +24,36 @@ public class SysCatalogResourceVo implements Serializable { /** * 目录id */ - //@ExcelProperty(value = "目录id") private Long catalogId; /** * 父目录id */ - //@ExcelProperty(value = "父目录id") private Long parentId; /** * 祖级列表 */ - //@ExcelProperty(value = "祖级列表") private String ancestors; /** * 目录名称 */ - //@ExcelProperty(value = "目录名称") private String catalogName; /** * 显示顺序 */ - //@ExcelProperty(value = "显示顺序") private Long orderNum; + /** + * 1主目录,2资源,3目录 + */ + private Integer type; + /** * 封面 */ - //@ExcelProperty(value = "封面") private Long cover; /** * 资源数量 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogTextbookVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogTextbookVo.java index 2a3ac5a..924e4c3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogTextbookVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogTextbookVo.java @@ -53,7 +53,7 @@ public class SysCatalogTextbookVo implements Serializable { private Long orderNum; /** - * 1暂定,2学段,3年级,4学科,5版本,6教材,7目录 + * 1主目录,2学段,3年级,4学科,5版本,6教材,7目录 */ //@ExcelProperty(value = "1暂定,2学段,3年级,4学科,5版本,6教材,7目录") private Integer type; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogTextbookService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogTextbookService.java index 0821ba6..6b0ad98 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogTextbookService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogTextbookService.java @@ -119,5 +119,5 @@ public interface ISysCatalogTextbookService { */ //List> buildCatalogTreeSelect(List catalogs); - List> buildTreeSelect(); + List> buildTreeSelect(SysCatalogTextbookBo bo); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java index 0ca8a75..fdf2b4d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java @@ -96,6 +96,12 @@ public class SysCatalogResourceServiceImpl implements ISysCatalogResourceService SysCatalogResource info = baseMapper.selectById(bo.getParentId()); SysCatalogResource add = MapstructUtils.convert(bo, SysCatalogResource.class); add.setAncestors(info.getAncestors() + StringUtils.SEPARATOR + add.getParentId()); + String[] split = StringUtils.split(add.getAncestors(), StringUtils.SEPARATOR); + if (split.length < 3) { + add.setType(split.length); + } else { + add.setType(3); + } return baseMapper.insert(add) > 0; } @@ -159,6 +165,7 @@ public class SysCatalogResourceServiceImpl implements ISysCatalogResourceService return ossResourceMapper.exists(new LambdaQueryWrapper() .eq(SysOssResource::getCatalogId, catalogId)); } + @Cacheable(cacheNames = CacheNames.SYS_CATALOG_RESOURCE, key = "#catalogId") @Override public SysCatalogResourceVo selectCatalogById(Long catalogId) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogTextbookServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogTextbookServiceImpl.java index d13c33c..85d8164 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogTextbookServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogTextbookServiceImpl.java @@ -21,6 +21,7 @@ import org.dromara.common.redis.utils.CacheUtils; import org.dromara.system.domain.SysCatalogTextbook; import org.dromara.system.domain.SysOssTextbook; import org.dromara.system.domain.bo.SysCatalogTextbookBo; +import org.dromara.system.domain.bo.SysOssResourceBo; import org.dromara.system.domain.vo.SysCatalogTextbookVo; import org.dromara.system.mapper.SysCatalogTextbookMapper; import org.dromara.system.mapper.SysOssTextbookMapper; @@ -197,9 +198,7 @@ public class SysCatalogTextbookServiceImpl implements ISysCatalogTextbookService } @Override - public List> buildTreeSelect() { - SysCatalogTextbookBo bo = new SysCatalogTextbookBo(); - bo.setType(4); + public List> buildTreeSelect(SysCatalogTextbookBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); List voList = baseMapper.selectVoList(lqw); return buildCatalogTreeSelect(voList);