Merge branch 'feature/listAdviserBook4Erp' into 'release'

Feature/list adviser book4 erp

See merge request rays/pcloud-book!1700

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookAdviserBizImpl.java

@@ -3641,7 +3641,13 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 		bookSearchDto.setCurrentPage(Optional.ofNullable(currentPage).orElse(0) + 1);
 		bookSearchDto.setPageSize(numPerPage);
 
-		Pagination<Es7Book> data = bookElasticSearchConsr.getAdviserBooks4Erp(bookSearchDto);
+		Pagination<Es7Book> data = new Pagination<>();
+		Future<Pagination<Es7Book>> esSubmit = ThreadPoolUtils.OTHER_POOL.submit(() -> bookElasticSearchConsr.getAdviserBooks4Erp(bookSearchDto));
+		try {
+			data = esSubmit.get(ThreadPoolUtils.REMOTE_TIME_OUT, TimeUnit.SECONDS);
+		} catch (InterruptedException | ExecutionException | TimeoutException e) {
+			LOGGER.error("es：getAdviserBooks4Erp失败: {}==", e);
+		}
 		LOGGER.info(data.toString());
 
 		PageBeanNew<ErpAdviserBookVO> pageBeanNew = convertData(data);