diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogResourceController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogResourceController.java index 983c504..dddbdc4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogResourceController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogResourceController.java @@ -36,6 +36,9 @@ public class SysCatalogResourceController extends BaseController { private final ISysCatalogResourceService resourceService; + + + /** * 查询目录-专题资源列表 */ 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 fb0a797..c107dea 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 @@ -93,6 +93,15 @@ public class PortalController extends BaseController { return R.ok(sysHomeTrendService.queryById(trendId)); } + /** + * 查询【请填写功能名称】列表 + */ + @SaIgnore + @GetMapping("/resource/catalog/pageList") + public TableDataInfo pageList(SysCatalogResourceBo bo, PageQuery pageQuery) { + return resourceService.queryPageList(bo, pageQuery); + } + /** * 查询目录-专题资源 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 924e4c3..7ebd710 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 @@ -6,7 +6,7 @@ import org.dromara.system.domain.SysCatalogTextbook; import java.io.Serial; import java.io.Serializable; - +import java.util.Date; /** @@ -63,5 +63,7 @@ public class SysCatalogTextbookVo implements Serializable { */ private Long resourceNum; + private Date createTime; + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogResourceService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogResourceService.java index cc3eab3..144c519 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogResourceService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogResourceService.java @@ -36,7 +36,7 @@ public interface ISysCatalogResourceService { List queryList(SysCatalogResourceBo bo); /** - * 分页查询题资源列表 + * 分页查询资源列表 * * @param bo 查询条件 * @param pageQuery 分页参数 @@ -44,6 +44,15 @@ public interface ISysCatalogResourceService { */ TableDataInfo queryPageList(SysCatalogResourceBo bo, PageQuery pageQuery); + /** + * 分页查询门户资源列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 门户Banner分页列表 + */ + TableDataInfo queryProtalPageList(SysCatalogResourceBo bo, PageQuery pageQuery); + /** * 新增目录-专题资源 * 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 a55d66b..2d452ea 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 @@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; @@ -68,12 +69,31 @@ public class SysCatalogResourceServiceImpl implements ISysCatalogResourceService return baseMapper.selectVoList(lqw); } + /** + * 管理使用 + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return + */ @Override public TableDataInfo queryPageList(SysCatalogResourceBo bo, PageQuery pageQuery) { Page result = baseMapper.selectPageUserList(pageQuery.build(), bo.getCatalogId()); return TableDataInfo.build(result); } + /** + * 门户使用 + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return + */ + @Override + public TableDataInfo queryProtalPageList(SysCatalogResourceBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + IPage result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + private LambdaQueryWrapper buildQueryWrapper(SysCatalogResourceBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); @@ -82,7 +102,7 @@ public class SysCatalogResourceServiceImpl implements ISysCatalogResourceService lqw.like(StringUtils.isNotBlank(bo.getCatalogName()), SysCatalogResource::getCatalogName, bo.getCatalogName()); lqw.eq(bo.getOrderNum() != null, SysCatalogResource::getOrderNum, bo.getOrderNum()); lqw.eq(bo.getCover() != null, SysCatalogResource::getCover, bo.getCover()); - lqw.le(bo.getType() != null, SysCatalogResource::getType, bo.getType()); + lqw.eq(bo.getType() != null, SysCatalogResource::getType, bo.getType()); return lqw; }