门户首页专题资源分页

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;
 
+
+
+
     /**
      * 查询目录-专题资源列表
      */

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<SysCatalogResourceVo> pageList(SysCatalogResourceBo bo, PageQuery pageQuery) {
+        return resourceService.queryPageList(bo, pageQuery);
+    }
+
 
     /**
      * 查询目录-专题资源

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;
+
 
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogResourceService.java

@@ -36,7 +36,7 @@ public interface ISysCatalogResourceService {
     List<SysCatalogResourceVo> queryList(SysCatalogResourceBo bo);
 
     /**
-     * 分页查询题资源列表
+     * 分页查询资源列表
      *
      * @param bo        查询条件
      * @param pageQuery 分页参数
@@ -44,6 +44,15 @@ public interface ISysCatalogResourceService {
      */
     TableDataInfo<SysCatalogResourceVo> queryPageList(SysCatalogResourceBo bo, PageQuery pageQuery);
 
+    /**
+     * 分页查询门户资源列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 门户Banner分页列表
+     */
+    TableDataInfo<SysCatalogResourceVo> queryProtalPageList(SysCatalogResourceBo bo, PageQuery pageQuery);
+
     /**
      * 新增目录-专题资源
      *

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<SysCatalogResourceVo> queryPageList(SysCatalogResourceBo bo, PageQuery pageQuery) {
         Page<SysCatalogResourceVo> result = baseMapper.selectPageUserList(pageQuery.build(), bo.getCatalogId());
         return TableDataInfo.build(result);
     }
 
+    /**
+     * 门户使用
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return
+     */
+    @Override
+    public TableDataInfo<SysCatalogResourceVo> queryProtalPageList(SysCatalogResourceBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysCatalogResource> lqw = buildQueryWrapper(bo);
+        IPage<SysCatalogResourceVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
     private LambdaQueryWrapper<SysCatalogResource> buildQueryWrapper(SysCatalogResourceBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<SysCatalogResource> 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;
     }