案例搜索接口修改4

servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java

@@ -2,7 +2,6 @@ package com.xboe.module.boecase.api;
 
 import java.io.OutputStream;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
@@ -32,8 +31,6 @@ import com.xboe.common.Pagination;
 import com.xboe.common.utils.StringUtil;
 import com.xboe.core.JsonResponse;
 import com.xboe.core.api.ApiBaseController;
-import com.xboe.core.cache.IXaskCache;
-import com.xboe.core.cache.XaskCacheProvider;
 import com.xboe.core.log.AutoLog;
 import com.xboe.module.boecase.entity.Cases;
 import com.xboe.module.boecase.service.ICasesService;
@@ -41,14 +38,12 @@ import com.xboe.module.boecase.service.ICasesService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
 
 /**
  * 案例
- *
  */
 @Slf4j
 @RestController
@@ -70,6 +65,7 @@ public class CasesApi extends ApiBaseController {
 
     /**
      * 用于后台管理
+     *
      * @param pager
      * @param caseVo
      * @return
@@ -102,7 +98,7 @@ public class CasesApi extends ApiBaseController {
     /**
      * 案例分页搜索查询    orders 状态 1代表时间最近，2代表热度最高
      * 是否推荐
-     * */
+     */
     @PostMapping("/queryList")
     public JsonResponse<PageList<Cases>> queryCaseBre(Pagination pager, CaseVo caseVo) {
         PageList<Cases> views = casesService.queryPageCases(pager.getPageIndex(), pager.getPageSize(), caseVo);
@@ -131,14 +127,26 @@ public class CasesApi extends ApiBaseController {
     @PostMapping("/queryListV2")
     public JsonResponse<PageList<Cases>> queryCaseBreV2(@Validated @RequestBody CasePageVo req) {
         String type = req.getType();
-        PageList<Cases> views;
+        PageList<Cases> subViews1;
+        PageList<Cases> subViews2;
+        PageList<Cases> views = null;
         req.setUserId(getCurrent().getAccountId());
-        if (type.equals("recommend")) {
+        if (StringUtils.isNotEmpty(type)) {
-            log.info("queryListV2 recommend userId:{}", getCurrent().getAccountId());
+            if ("recommend".equals(type)) {
                 views = casesService.queryRecommendPageCasesV2(req);
             } else {
                 views = casesService.queryPageCasesV2(req);
             }
+        } else {
+            PageDto pageDto = new PageDto();
+            pageDto.setPageIndex(req.getPageIndex());
+            pageDto.setPageSize(req.getPageSize());
+            req.setPageSize(1000000);
+            req.setPageIndex(1);
+            subViews1 = casesService.queryRecommendPageCasesV2(req);
+            subViews2 = casesService.queryPageCasesV2(req);
+            views = merge(subViews1, subViews2, pageDto);
+        }
 
         if (views != null) {
             List<Cases> cases = views.getList();
@@ -156,7 +164,6 @@ public class CasesApi extends ApiBaseController {
                         stringBuffer.deleteCharAt(stringBuffer.length() - 1);
                         c.setMajorType(stringBuffer.toString());
                     }
-
                 }
             }
         } else {
@@ -168,6 +175,24 @@ public class CasesApi extends ApiBaseController {
         return success(views);
     }
 
+    public static PageList<Cases> merge(PageList<Cases> pageList1, PageList<Cases> pageList2, PageDto pageDto) {
+        List<Cases> mergedCaseList = new ArrayList<>();
+        mergedCaseList.addAll(pageList1.getList());
+        mergedCaseList.addAll(pageList2.getList());
+        List<Cases> pageCaseList = mergedCaseList.stream()
+                .skip((long) (pageDto.getPageIndex() - 1) * pageDto.getPageSize())
+                .limit(pageDto.getPageSize())
+                .collect(Collectors.toList());
+        int totalCount = pageList1.getCount() + pageList2.getCount();
+        int pageSize = pageDto.getPageSize();
+
+        PageList<Cases> mergePageList = new PageList<>();
+        mergePageList.setList(pageCaseList);
+        mergePageList.setCount(totalCount);
+        mergePageList.setPageSize(pageSize);
+        return mergePageList;
+    }
+
     @PostMapping("/caseYears")
     public JsonResponse<List<String>> caseYears() {
         List<String> result = casesService.getCaseYears();
@@ -176,7 +201,7 @@ public class CasesApi extends ApiBaseController {
 
     /**
      * 案例分页搜索  是否置顶
-     * */
+     */
     @PostMapping("/isTopList")
     public JsonResponse<PageList<Cases>> queryCaseTop(Pagination pager, CaseVo caseVo) {
         PageList<Cases> casesPageList = casesService.managerList(pager.getPageIndex(), pager.getPageSize(), caseVo);
@@ -185,7 +210,7 @@ public class CasesApi extends ApiBaseController {
 
     /**
      * 案例分页
-     * */
+     */
     @PostMapping("/pagelist")
     public JsonResponse<PageList<CasesFiledVo>> pageList(Pagination pager, CaseVo caseVo) {
         PageList<CasesFiledVo> pageList = casesService.queryList(pager.getPageIndex(), pager.getPageSize(), caseVo);
@@ -194,7 +219,7 @@ public class CasesApi extends ApiBaseController {
 
     /**
      * 我的案例
-     * */
+     */
     @PostMapping("/mylist")
     public JsonResponse<PageList<Cases>> mylist(Pagination pager, CaseVo caseVo) {
         String aid = this.getCurrent().getAccountId();
@@ -204,7 +229,7 @@ public class CasesApi extends ApiBaseController {
 
     /**
      * 导出案例数据
-     * */
+     */
     @PostMapping("/exportCase")
     public void exportCase(Pagination pager, CaseVo caseVo, HttpServletResponse response) {
         OutputStream OutputStream = null;
@@ -254,7 +279,7 @@ public class CasesApi extends ApiBaseController {
 
     /**
      * 导出案例标题数据
-     * */
+     */
     @PostMapping("/exportCaseTitle")
     public void exportCaseTitle(CaseVo caseVo, HttpServletResponse response) {
         OutputStream outputStream;
@@ -296,7 +321,7 @@ public class CasesApi extends ApiBaseController {
 
     /**
      * 导出我的案例
-     * */
+     */
     @PostMapping("/export")
     public void export(CaseVo caseVo, HttpServletResponse response) {
         String aid = this.getCurrent().getAccountId();
@@ -347,7 +372,7 @@ public class CasesApi extends ApiBaseController {
 
     /**
      * 设置置顶
-     * */
+     */
     @GetMapping("/updateTop")
     @AutoLog(module = "案例", action = "设置案例置顶", info = "设置案例置顶")
     public JsonResponse<Boolean> updateTop(String id, Integer isTop) {
@@ -365,7 +390,7 @@ public class CasesApi extends ApiBaseController {
 
     /**
      * 删除
-     * */
+     */
     @GetMapping("/delete")
     @AutoLog(module = "案例", action = "删除案例", info = "删除案例")
     public JsonResponse<Boolean> deleteTop(String id) {
@@ -380,9 +405,10 @@ public class CasesApi extends ApiBaseController {
             return error("删除失败", e.getMessage());
         }
     }
+
     /**
      * 案例详情
-     * */
+     */
     @GetMapping("/detail")
     public JsonResponse<Cases> selectById(String id, Boolean addView) {
         if (StringUtil.isBlank(id)) {
@@ -404,10 +430,11 @@ public class CasesApi extends ApiBaseController {
             return error("查看失败", e.getMessage());
         }
     }
+
     /**
      * 贡献度排行榜
      * 每个作者发布案例的数量
-     * */
+     */
     @GetMapping("/usernamelist")
     public JsonResponse<List<UsernameDto>> usernameList(Integer pageSize) {
         if (pageSize == null) {
@@ -416,9 +443,10 @@ public class CasesApi extends ApiBaseController {
         List<UsernameDto> casesPageList = casesService.usernameList(pageSize);
         return success(casesPageList);
     }
+
     /**
      * 首页案例
-     * */
+     */
     @PostMapping("/case-random")
     public JsonResponse<List<CaseDto>> caseRandom(Integer pageSize, String orderField, Boolean orderAsc) {
         if (pageSize == null) {
@@ -430,7 +458,7 @@ public class CasesApi extends ApiBaseController {
 
     /**
      * 人气榜  浏览数
-     * */
+     */
     @SuppressWarnings("unchecked")
     @GetMapping("/query-praises")
     public JsonResponse<List<CaseRankingDto>> queryPraises(Integer pageSize) {
@@ -456,7 +484,7 @@ public class CasesApi extends ApiBaseController {
 
     /**
      * 好评榜  点赞数
-     * */
+     */
     @SuppressWarnings("unchecked")
     @GetMapping("/query-comments")
     public JsonResponse<List<CaseRankingDto>> queryComments(Integer pageSize) {
@@ -481,7 +509,7 @@ public class CasesApi extends ApiBaseController {
 
     /**
      * 添加
-     * */
+     */
     @PostMapping("/save")
     public JsonResponse<Boolean> save(@RequestBody Cases cases) {
         if (StringUtil.isBlank(cases.getTitle())) {
@@ -513,7 +541,7 @@ public class CasesApi extends ApiBaseController {
 
     /**
      * 修改案例
-     * */
+     */
     @PostMapping("/update")
     public JsonResponse<Boolean> update(@RequestBody Cases cases) {
         if (StringUtil.isBlank(cases.getTitle())) {
@@ -554,7 +582,7 @@ public class CasesApi extends ApiBaseController {
 
     /**
      * 专业分类
-     * */
+     */
     @GetMapping("/majorTypes")
     public JsonResponse<List<DictItem>> majorTypes() {
         List<DictItem> dictItems = casesService.majorTypes();
@@ -564,7 +592,7 @@ public class CasesApi extends ApiBaseController {
 
     /**
      * 案例详情
-     * */
+     */
     @GetMapping("/details")
     public JsonResponse<Map<String, Object>> details(String id, Boolean addView) {
         if (StringUtil.isBlank(id)) {
@@ -612,7 +640,7 @@ public class CasesApi extends ApiBaseController {
 
     /**
      * 用于二次查询
-     * */
+     */
     @PostMapping("/ids")
     public JsonResponse<List<Cases>> ids(@RequestBody List<String> ids) {
         if (ids.isEmpty()) {
@@ -624,7 +652,7 @@ public class CasesApi extends ApiBaseController {
 
     /**
      * 设置/取消优秀案例
-     * */
+     */
     @PostMapping("/excellent")
     public JsonResponse<Boolean> excellent(String id, Boolean excellent) {
         if (StringUtil.isBlank(id)) {