From cba071db4529097598095e2971949dfd109f12b9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 22 十月 2020 16:49:25 +0800
Subject: [PATCH] 图片显示403问题解决

---
 src/main/java/com/yeshi/buwan/service/manager/SolrAlbumDataManager.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/service/manager/SolrAlbumDataManager.java b/src/main/java/com/yeshi/buwan/service/manager/SolrAlbumDataManager.java
index be0cdfb..3949aa9 100644
--- a/src/main/java/com/yeshi/buwan/service/manager/SolrAlbumDataManager.java
+++ b/src/main/java/com/yeshi/buwan/service/manager/SolrAlbumDataManager.java
@@ -1,13 +1,14 @@
 package com.yeshi.buwan.service.manager;
 
-import com.yeshi.buwan.dao.video.AlbumVideoMapDao;
 import com.yeshi.buwan.domain.SolrVideo;
 import com.yeshi.buwan.domain.VideoInfo;
 import com.yeshi.buwan.domain.video.AlbumVideoMap;
+import com.yeshi.buwan.dto.search.SolrResultDTO;
 import com.yeshi.buwan.service.imp.VideoInfoService;
 import com.yeshi.buwan.service.inter.juhe.AlbumVideoMapService;
 import com.yeshi.buwan.util.factory.SolrVideoFactory;
 import org.apache.solr.client.solrj.response.UpdateResponse;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.solr.core.SolrTemplate;
 import org.springframework.data.solr.core.query.Criteria;
 import org.springframework.data.solr.core.query.Query;
@@ -71,8 +72,7 @@
         return solrVideo;
     }
 
-    public List<SolrVideo> findByKey(String key, Integer contentType, Integer videoType, int page) {
-        int pageSize = 20;
+    public SolrResultDTO findByKey(String key, Integer contentType, Integer videoType, int page, int pageSize) {
         Query query = new SimpleQuery("name:\"" + key + "\"");
 
         Criteria criteria = new Criteria("contenttype").is(contentType);
@@ -85,13 +85,14 @@
             query.addCriteria(criteria);
 
         /** 璁剧疆鍒嗛〉寮�濮嬭褰曟暟(绗竴椤�) 榛樿0 */
-        query.setOffset((page - 1) * page);
+        query.setOffset((page - 1) * pageSize);
         /** 璁剧疆姣忛〉鏄剧ず璁板綍鏁帮紝榛樿10 */
         query.setRows(pageSize);
+        query.addSort(new Sort(Sort.Direction.DESC, "year"));
         ScoredPage<SolrVideo> result = solrTemplate.queryForPage(query, SolrVideo.class);
         System.out.println("鎬昏褰曟暟锛�" + result.getTotalElements());
         List<SolrVideo> list = result.getContent();
-        return list;
+        return new SolrResultDTO(list, (int) result.getTotalElements());
     }
 
     public List<String> getSuggestKeyList(String key) {

--
Gitblit v1.8.0