接口优化

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

@@ -1891,12 +1891,22 @@ public class BookBizImpl implements BookBiz {
     @ParamLog("平台端获取编辑书刊")
     @Override
     public PageBeanNew<BookDto> getAdviserBooks4Pcloud(String keyword, Long agentId, Long templetId, Long secondTempletId, String typeCode, Integer currentPage, Integer numPerPage) {
+        String redisKey=BookConstant.ADVISER_BOOK_CACHE + "_" + keyword + "_" + agentId + "_" + templetId
+                + "_" + secondTempletId + "_" + typeCode + "_" + 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);
         map.put("secondTempletId",secondTempletId);
         map.put("typeCode",typeCode);
-        if (agentId!=null){
+        if (agentId != null){
             List<Long> adviserIds = adviserConsr.getIdsByNameAndAgentId(agentId, null);
             if (ListUtils.isEmpty(adviserIds)){
                 map.put("adviserIds",Arrays.asList(-1L));
@@ -1904,8 +1914,11 @@ public class BookBizImpl implements BookBiz {
                 map.put("adviserIds",adviserIds);
             }
         }
-        PageBeanNew<BookDto> page = bookDao.listPageNew(new PageParam(currentPage, numPerPage), map, "getAdviserBooks4Pcloud");
+        PageBeanNew<BookDto> page = bookDao.listPageNew(new PageParam(currentPage, numPerPage), map, "getAdviserBooks4Pcloud", "getAdviserBooksCount4Pcloud");
         fillBookInfo(page.getRecordList());
+        if(!ListUtils.isEmpty(page.getRecordList())) {
+            JedisClusterUtils.set(redisKey, JSONObject.toJSONString(page), 3600);
+        }
         return page;
     }
 

pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml

@@ -2066,6 +2066,40 @@
 		A.LAST_MODIFIED_DATE DESC
 	</select>
 
+	<select id="getAdviserBooksCount4Pcloud" resultType="long" parameterType="map">
+		SELECT
+		COUNT(1)
+		FROM
+		BOOK_ADVISER A
+		LEFT JOIN BOOK B ON A.BOOK_ID = B.BOOK_ID AND B.IS_DELETE = 0
+		WHERE
+		A.IS_MAIN_EDITOR = 1 AND A.IS_DELETE = 0
+		<if test="typeCode!=null">
+			AND
+			B.TYPE_CODE = #{typeCode}
+		</if>
+		<if test="keyword != null">
+			AND (B.BOOK_NAME LIKE CONCAT('%', #{keyword}, '%')
+			OR  B.ISBN LIKE CONCAT(#{keyword},'%')
+			OR  CONCAT('BK',A.BOOK_ID) = #{keyword})
+		</if>
+		<if test="templetId != null">
+			AND
+			A.TEMPLET_ID = #{templetId}
+		</if>
+		<if test="secondTempletId!=null ">
+			AND
+			A.SECOND_TEMPLET_ID=#{secondTempletId}
+		</if>
+		<if test="adviserIds!=null and adviserIds.size()>0">
+			AND
+			A.ADVISER_ID in
+			<foreach collection="adviserIds" item="item" open="(" separator="," close=")">
+				${item}
+			</foreach>
+		</if>
+	</select>
+
 	<select id="getAdviserBooks4H5" resultMap="bookMap" parameterType="map">
 		SELECT
 		A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID, A.IS_MAIN_EDITOR, T.TYPE_CODE, T.TYPE_NAME, B.ISBN, B.BOOK_NAME, B.REMARK,