Merge branch 'feat-1002587' into 'master'

优化接口1002587

See merge request rays/pcloud-book!556

pcloud-facade-book/src/main/java/com/pcloud/book/book/constant/BookConstant.java

@@ -55,6 +55,11 @@ public class BookConstant {
     public static final String BOOK_RESOURCE_CACHE = CacheConstant.BOOK + "BOOK_RESOURCE:";
 
     /**
+     * 图书资源关联缓存前缀名称
+     */
+    public static final String ADVISER_BOOK_CACHE = CacheConstant.BOOK + "ADVISER_BOOK_CACHE:";
+
+    /**
      * 图书缓存时间1天
      */
     public static final Integer BOOK_CACHE_ONE_DAY = 60 * 60 * 24;

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

@@ -3,9 +3,9 @@
  */
 package com.pcloud.book.book.biz.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import com.pcloud.analysisengine.qrcode.dto.BookTimeSourceDto;
 import com.pcloud.appcenter.assist.dto.AssistTempletDTO;
 import com.pcloud.appcenter.base.exception.AppBizException;
@@ -13,30 +13,12 @@ import com.pcloud.book.base.enums.BookFreezeEnum;
 import com.pcloud.book.base.enums.BookStatusEnum;
 import com.pcloud.book.base.enums.BookTypeEnum;
 import com.pcloud.book.base.exception.BookBizException;
-import com.pcloud.book.book.biz.BookAdviserBiz;
-import com.pcloud.book.book.biz.BookAppBiz;
-import com.pcloud.book.book.biz.BookBiz;
-import com.pcloud.book.book.biz.BookFreezeBiz;
-import com.pcloud.book.book.biz.BookFundBiz;
-import com.pcloud.book.book.biz.BookProductBiz;
-import com.pcloud.book.book.biz.BookResourceBiz;
+import com.pcloud.book.book.biz.*;
 import com.pcloud.book.book.cache.BookCache;
 import com.pcloud.book.book.constant.BookConstant;
 import com.pcloud.book.book.dao.BookDao;
 import com.pcloud.book.book.dao.BookLabelDao;
-import com.pcloud.book.book.dto.AdviserBookInfoDTO;
-import com.pcloud.book.book.dto.BookAdviserDto;
-import com.pcloud.book.book.dto.BookAdviserUpdateTimeDTO;
-import com.pcloud.book.book.dto.BookAssocCount;
-import com.pcloud.book.book.dto.BookCoverImgUpdateDTO;
-import com.pcloud.book.book.dto.BookDetialDTO;
-import com.pcloud.book.book.dto.BookDto;
-import com.pcloud.book.book.dto.BookFreezeDto;
-import com.pcloud.book.book.dto.BookFundDto;
-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.BookNameUpdateDTO;
+import com.pcloud.book.book.dto.*;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.entity.BookAdviser;
 import com.pcloud.book.book.entity.BookLabel;
@@ -66,7 +48,6 @@ import com.pcloud.book.util.common.ThreadPoolUtils;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.core.constant.AgentTypeEnum;
 import com.pcloud.common.core.constant.SystemCode;
-import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.exceptions.ExportException;
 import com.pcloud.common.page.PageBean;
@@ -74,13 +55,9 @@ import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
 import com.pcloud.common.utils.DateUtils;
 import com.pcloud.common.utils.ListUtils;
-import com.pcloud.common.utils.ResponseHandleUtil;
 import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.string.StringUtil;
-
-import com.pcloud.commoncenter.export.dto.ExportDto;
 import com.pcloud.commoncenter.export.service.ExportService;
-import com.pcloud.settlementcenter.record.exceptions.RecordException;
 import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -88,21 +65,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
@@ -1944,6 +1912,15 @@ public class BookBizImpl implements BookBiz {
     @ParamLog("获取编辑书刊H5")
     @Override
     public PageBeanNew<BookDto> getAdviserBooks4H5(String keyword, Long templetId, Long secondTempletId, Integer currentPage, Integer numPerPage) {
+        String redisKey=BookConstant.ADVISER_BOOK_CACHE+"_"+keyword+"_"+templetId+"_"+secondTempletId+"_"+currentPage+"_"+numPerPage;
+        String data = JedisClusterUtils.get(redisKey);
+        //加缓存
+        if(StringUtil.isNotBlank(data)){
+            PageBeanNew pageBeanNew = JSONObject.parseObject(data, PageBeanNew.class);
+            if(null!=pageBeanNew) {
+                return pageBeanNew;
+            }
+        }
         Map<String,Object> map=new HashMap<>();
         map.put("keyword",keyword);
         map.put("templetId",templetId);
@@ -1951,6 +1928,9 @@ public class BookBizImpl implements BookBiz {
 
         PageBeanNew<BookDto> page = bookDao.listPageNew(new PageParam(currentPage, numPerPage), map, "getAdviserBooks4H5");
         fillBookInfo(page.getRecordList());
+        if(!ListUtils.isEmpty(page.getRecordList())) {
+            JedisClusterUtils.set(redisKey, JSONObject.toJSONString(page), 3600);
+        }
         return page;
     }