官网列表查询加筛选功能

service-website/service-website-biz/src/main/java/com/usky/website/controller/web/SiteArticleController.java

@@ -33,11 +33,12 @@ public class SiteArticleController {
      * @return
      */
     @GetMapping("siteArticleList")
-    public ApiResult<CommonPage<SiteArticle>> siteArticleList(@RequestParam(value = "categoryid") Integer categoryid,
+    public ApiResult<CommonPage<SiteArticle>> siteArticleList(@RequestParam(value = "categoryid", required = false) Integer categoryid,
                                                               @RequestParam(value = "id", required = false) Integer id,
+                                                              @RequestParam(value = "title", required = false) String title,
                                                               @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
                                                               @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-        return ApiResult.success(siteArticleService.siteArticleList(categoryid, id, pageNum, pageSize));
+        return ApiResult.success(siteArticleService.siteArticleList(categoryid, id, title, pageNum, pageSize));
     }
 
     /**

service-website/service-website-biz/src/main/java/com/usky/website/controller/web/SiteCategoryController.java

@@ -30,8 +30,8 @@ public class SiteCategoryController {
      * @return
      */
     @GetMapping("siteCategoryList")
-    public ApiResult<List<SiteCategory>> siteCategoryList() {
-        return ApiResult.success(siteCategoryService.siteCategoryList());
+    public ApiResult<List<SiteCategory>> siteCategoryList(@RequestParam(value = "categoryName", required = false) String categoryName) {
+        return ApiResult.success(siteCategoryService.siteCategoryList(categoryName));
     }
 
     /**

service-website/service-website-biz/src/main/java/com/usky/website/domain/SiteArticle.java

@@ -2,6 +2,8 @@ package com.usky.website.domain;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -81,5 +83,11 @@ public class SiteArticle implements Serializable {
      */
     private LocalDateTime modifydate;
 
+    /**
+     * 栏目名称
+     */
+    @TableField(exist = false)
+    private String categoryName;
+
 
 }

service-website/service-website-biz/src/main/java/com/usky/website/service/SiteArticleService.java

@@ -23,7 +23,7 @@ public interface SiteArticleService extends CrudService<SiteArticle> {
      * @param pageSize   每页条数
      * @return
      */
-    CommonPage<SiteArticle> siteArticleList(Integer categoryid, Integer id, Integer pageNum, Integer pageSize);
+    CommonPage<SiteArticle> siteArticleList(Integer categoryid, Integer id, String title, Integer pageNum, Integer pageSize);
 
     /**
      * 官网-内容的新增

service-website/service-website-biz/src/main/java/com/usky/website/service/SiteCategoryService.java

@@ -20,7 +20,7 @@ public interface SiteCategoryService extends CrudService<SiteCategory> {
      *
      * @return
      */
-    List<SiteCategory> siteCategoryList();
+    List<SiteCategory> siteCategoryList(String categoryName);
 
     /**
      * 官网-子级栏目查询

service-website/service-website-biz/src/main/java/com/usky/website/service/impl/SiteArticleServiceImpl.java

@@ -3,6 +3,7 @@ package com.usky.website.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
@@ -12,7 +13,6 @@ import com.usky.website.domain.SiteCategory;
 import com.usky.website.mapper.SiteArticleMapper;
 import com.usky.website.mapper.SiteCategoryMapper;
 import com.usky.website.service.SiteArticleService;
-import com.usky.website.service.SiteCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,27 +35,42 @@ public class SiteArticleServiceImpl extends AbstractCrudService<SiteArticleMappe
     private SiteCategoryMapper siteCategoryMapper;
 
     @Override
-    public CommonPage<SiteArticle> siteArticleList(Integer categoryid, Integer id, Integer pageNum, Integer pageSize) {
+    public CommonPage<SiteArticle> siteArticleList(Integer categoryid, Integer id, String title, Integer pageNum, Integer pageSize) {
         IPage<SiteArticle> page = new Page<>(pageNum, pageSize);
         List<Integer> categoryidList = new ArrayList<>();
-        if (categoryid == 18) {
-            LambdaQueryWrapper<SiteCategory> queryWrapper1 = Wrappers.lambdaQuery();
-            queryWrapper1.select(SiteCategory::getId)
-                    .eq(SiteCategory::getPid, categoryid)
-                    .eq(SiteCategory::getStatus, 1);
-            List<SiteCategory> list = siteCategoryMapper.selectList(queryWrapper1);
-            for (int i = 0; i < list.size(); i++) {
-                categoryidList.add(list.get(i).getId());
+        if (categoryid != null && categoryid != 0) {
+            if (categoryid == 18) {
+                LambdaQueryWrapper<SiteCategory> queryWrapper1 = Wrappers.lambdaQuery();
+                queryWrapper1.select(SiteCategory::getId)
+                        .eq(SiteCategory::getPid, categoryid)
+                        .eq(SiteCategory::getStatus, 1);
+                List<SiteCategory> list = siteCategoryMapper.selectList(queryWrapper1);
+                for (int i = 0; i < list.size(); i++) {
+                    categoryidList.add(list.get(i).getId());
+                }
+            } else {
+                categoryidList.add(categoryid);
             }
-        } else {
-            categoryidList.add(categoryid);
         }
-        if (CollectionUtil.isNotEmpty(categoryidList)) {
-            LambdaQueryWrapper<SiteArticle> queryWrapper = Wrappers.lambdaQuery();
-            queryWrapper.in(SiteArticle::getCategoryid, categoryidList)
-                    .eq(id != null, SiteArticle::getId, id)
-                    .orderByDesc(SiteArticle::getIstop, SiteArticle::getId);
-            page = this.page(page, queryWrapper);
+
+        LambdaQueryWrapper<SiteCategory> queryWrapper1 = Wrappers.lambdaQuery();
+        queryWrapper1.eq(SiteCategory::getStatus, 1)
+                .in(CollectionUtil.isNotEmpty(categoryidList), SiteCategory::getId, categoryidList);
+        List<SiteCategory> list = siteCategoryMapper.selectList(queryWrapper1);
+
+        LambdaQueryWrapper<SiteArticle> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.in(CollectionUtil.isNotEmpty(categoryidList), SiteArticle::getCategoryid, categoryidList)
+                .eq(id != null, SiteArticle::getId, id)
+                .like(StringUtils.isNotBlank(title), SiteArticle::getTitle, title)
+                .orderByDesc(SiteArticle::getIstop, SiteArticle::getId);
+        page = this.page(page, queryWrapper);
+
+        for (int i = 0; i < page.getRecords().size(); i++) {
+            for (int j = 0; j < list.size(); j++) {
+                if (page.getRecords().get(i).getCategoryid() == list.get(j).getId()) {
+                    page.getRecords().get(i).setCategoryName(list.get(j).getCategoryName());
+                }
+            }
         }
         return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
     }

service-website/service-website-biz/src/main/java/com/usky/website/service/impl/SiteCategoryServiceImpl.java

@@ -1,6 +1,7 @@
 package com.usky.website.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.mybatis.core.AbstractCrudService;
@@ -31,9 +32,10 @@ public class SiteCategoryServiceImpl extends AbstractCrudService<SiteCategoryMap
     private SiteArticleService siteArticleService;
 
     @Override
-    public List<SiteCategory> siteCategoryList() {
+    public List<SiteCategory> siteCategoryList(String categoryName) {
         LambdaQueryWrapper<SiteCategory> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(SiteCategory::getStatus, 1)
+                .like(StringUtils.isNotBlank(categoryName),SiteCategory::getCategoryName,categoryName)
                 .orderByAsc(SiteCategory::getSortindex);
         List<SiteCategory> list = this.list(queryWrapper);
         //取得所有parentId为0的数据，也就是一级目录