feat:[none] 平台书刊查询删除切换开关

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookBiz.java

@@ -3,31 +3,11 @@
  */
 package com.pcloud.book.book.biz;
 
-import com.pcloud.book.book.dto.AdviserBookInfoDTO;
-import com.pcloud.book.book.dto.BookAdviserUpdateTimeDTO;
-import com.pcloud.book.book.dto.BookAssocCount;
-import com.pcloud.book.book.dto.BookDetialDTO;
-import com.pcloud.book.book.dto.BookDto;
-import com.pcloud.book.book.dto.BookInfo4AnlysicsDTO;
-import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
-import com.pcloud.book.book.dto.BookInfoAndAuthStatusDTO;
-import com.pcloud.book.book.dto.BookUniqueNumberDTO;
-import com.pcloud.book.book.dto.CreateBookResultVO;
-import com.pcloud.book.book.dto.CreateBookVO;
-import com.pcloud.book.book.dto.MapResourceTotalCountDTO;
-import com.pcloud.book.book.dto.EditionAnalysisResultVO;
-import com.pcloud.book.book.dto.QrcodeServeDto;
-import com.pcloud.book.book.dto.RelateAdviserVO;
+import com.pcloud.book.book.dto.*;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.entity.BookLabel;
 import com.pcloud.book.book.entity.SeriesBookRecord;
-import com.pcloud.book.book.vo.BookInfo4ScanCount;
-import com.pcloud.book.book.vo.BookLabelVO;
-import com.pcloud.book.book.vo.BookQualifyVO;
-import com.pcloud.book.book.vo.BookSaleVO;
-import com.pcloud.book.book.vo.ListNoAuthBookParam;
-import com.pcloud.book.book.vo.ListNoAuthGroupBookParam;
-import com.pcloud.book.book.vo.SearchBookVO;
+import com.pcloud.book.book.vo.*;
 import com.pcloud.book.book.vo.request.BookInfo4ScanCountRequestVO;
 import com.pcloud.book.book.vo.request.BookQualifyInfoVO;
 import com.pcloud.book.book.vo.request.BookSearchParamVO;
@@ -194,31 +174,6 @@ public interface BookBiz {
 	Map<String,BookDto> listDetailByIds(BookDetialDTO bookDetialDTO)throws BizException;
 
 	/**
-	 * 获取书籍列表
-	 * 
-	 * @param isbn
-	 * @param bookName
-	 *            图书名称
-	 * @param publish
-	 *            出版社
-	 * @param fundName
-	 *            基金名称
-	 * @param serialNumber
-	 *            序列号
-	 * @param isCurrentMonth
-	 *            是否当前月
-	 * @param currentPage
-	 *            当前页
-	 * @param numPerPage
-	 *            每页条数
-	 * 
-	 * @return
-	 * @throws BizException
-	 */
-	PageBeanNew<BookDto> getListPage(String isbn, String bookName, String publish, String fundName, String serialNumber,
-			Integer isCurrentMonth, Integer currentPage, Integer numPerPage) throws BizException;
-
-	/**
 	 * 获取书籍列表(编辑)
 	 * 
 	 * @param paramMap

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookFacadeImpl.java

@@ -5,32 +5,19 @@ package com.pcloud.book.book.facade.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.google.common.collect.Lists;
-
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.book.biz.BookBiz;
 import com.pcloud.book.book.biz.BookLabelBiz;
 import com.pcloud.book.book.biz.impl.BookElasticSearchBizImpl;
-import com.pcloud.book.book.dto.AdviserBookInfoDTO;
-import com.pcloud.book.book.dto.BookAssocCount;
-import com.pcloud.book.book.dto.BookDetialDTO;
-import com.pcloud.book.book.dto.BookDto;
-import com.pcloud.book.book.dto.CreateBookVO;
-import com.pcloud.book.book.dto.MapResourceTotalCountDTO;
-import com.pcloud.book.book.dto.RelateAdviserVO;
+import com.pcloud.book.book.dto.*;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.entity.SeriesBookRecord;
 import com.pcloud.book.book.facade.BookFacade;
-import com.pcloud.book.book.vo.BookInfo4ScanCount;
-import com.pcloud.book.book.vo.BookQualifyVO;
-import com.pcloud.book.book.vo.ListNoAuthBookParam;
-import com.pcloud.book.book.vo.ListNoAuthGroupBookParam;
-import com.pcloud.book.book.vo.SearchBookVO;
+import com.pcloud.book.book.vo.*;
 import com.pcloud.book.book.vo.request.BookInfo4ScanCountRequestVO;
 import com.pcloud.book.book.vo.request.BookQualifyInfoVO;
 import com.pcloud.book.book.vo.request.BookSearchParamVO;
-import com.pcloud.book.book.dto.BookUniqueNumberDTO;
 import com.pcloud.book.book.vo.request.UpdateBookRobotProcessDto;
-import com.pcloud.book.elasticsearch7.constants.SwitchKey;
 import com.pcloud.book.elasticsearch7.search.domain.dto.param.PlatformSearchDto;
 import com.pcloud.common.core.constant.SystemCode;
 import com.pcloud.common.dto.ResponseDto;
@@ -43,33 +30,17 @@ import com.pcloud.common.permission.PermissionCode.ServerPermissionCode;
 import com.pcloud.common.permission.PermissionException;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.SessionUtil;
-import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.cookie.Cookie;
 import com.pcloud.common.utils.string.StringUtil;
-
 import com.pcloud.wechatgroup.message.enums.IsSystem;
-
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-
 import org.codehaus.jackson.JsonParseException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.CookieValue;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
 
 /**
  * @描述：书籍接口实现类
@@ -267,23 +238,18 @@ public class BookFacadeImpl implements BookFacade {
             throw BookBizException.PAGE_PARAM_DELETION;
         }
 
-        if (JedisClusterUtils.exists(SwitchKey.PLATFORM_SEARCH_ELASTICSEARCH)) {
-            PlatformSearchDto param = new PlatformSearchDto();
-            param.setPublish(publish);
-            param.setFundName(fundName);
-            param.setBookName(bookName);
-            param.setIsbn(isbn);
-            param.setSerialNumber(serialNumber);
-            param.setIsCurrentMonth(isCurrentMonth);
-            // 页面起始为0，故+1
-            param.setCurrentPage(currentPage + 1);
-            param.setPageSize(numPerPage);
-
-            return new ResponseDto<>(bookElasticSearchBiz.getListPage(param));
-        } else {
-            return new ResponseDto<>(bookBiz.getListPage(isbn, bookName, publish, fundName,
-                    serialNumber, isCurrentMonth, currentPage, numPerPage));
-        }
+        PlatformSearchDto param = new PlatformSearchDto();
+        param.setPublish(publish);
+        param.setFundName(fundName);
+        param.setBookName(bookName);
+        param.setIsbn(isbn);
+        param.setSerialNumber(serialNumber);
+        param.setIsCurrentMonth(isCurrentMonth);
+        // 页面起始为0，故+1
+        param.setCurrentPage(currentPage + 1);
+        param.setPageSize(numPerPage);
+
+        return new ResponseDto<>(bookElasticSearchBiz.getListPage(param));
     }
 
     /**