From ad3ac53da1c3a11a96ae62d790aa61a81b9eab91 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 20 三月 2021 18:47:23 +0800
Subject: [PATCH] 完善APP首页顶部标签栏兼容，初步处理推送
---
src/main/java/com/yeshi/buwan/service/manager/SolrAlbumVideoDataManager.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/service/manager/SolrAlbumVideoDataManager.java b/src/main/java/com/yeshi/buwan/service/manager/SolrAlbumVideoDataManager.java
index 2ba98e9..bc28acf 100644
--- a/src/main/java/com/yeshi/buwan/service/manager/SolrAlbumVideoDataManager.java
+++ b/src/main/java/com/yeshi/buwan/service/manager/SolrAlbumVideoDataManager.java
@@ -135,7 +135,7 @@
Query query = null;
if (!StringUtil.isNullOrEmpty(filter.getKey())) {
//solr绮惧噯妫�绱㈤渶瑕佸甫寮曞彿
- query = new SimpleQuery(new Criteria("name").expression("\"" + filter.getKey() + "\"").or("mainactor").expression("\"" + filter.getKey() + "\""));
+ query = new SimpleQuery(new Criteria("nameStr").startsWith(filter.getKey()).or("mainactor").expression("\"" + filter.getKey() + "\""));
} else if (!StringUtil.isNullOrEmpty(filter.getActor())) {
query = new SimpleQuery(new Criteria("mainactor").expression("\"" + filter.getActor() + "\""));
} else if (!StringUtil.isNullOrEmpty(filter.getDirector())) {
@@ -152,8 +152,12 @@
if (filter.getResourceIds() != null && filter.getResourceIds().length > 0) {
query.addFilterQuery(new SimpleFilterQuery(Criteria.where("resourceIds").contains(filter.getResourceIds())));
}
- if(filter.getFreeType()!=null){
+ if (filter.getFreeType() != null) {
query.addFilterQuery(new SimpleFilterQuery(Criteria.where("free_type").is(filter.getFreeType())));
+ }
+
+ if (filter.getArea() != null) {
+ query.addFilterQuery(new SimpleFilterQuery(Criteria.where("area").contains(filter.getArea())));
}
@@ -161,9 +165,7 @@
query.setOffset((page - 1) * pageSize);
/** 璁剧疆姣忛〉鏄剧ず璁板綍鏁帮紝榛樿10 */
query.setRows(pageSize);
- if (StringUtil.isNullOrEmpty(filter.getSortKey())) {
- query.addSort(new Sort(Sort.Direction.DESC, "year"));
- } else {
+ if (!StringUtil.isNullOrEmpty(filter.getSortKey())) {
query.addSort(new Sort(Sort.Direction.DESC, filter.getSortKey()));
}
@@ -175,11 +177,13 @@
}
public List<String> getSuggestKeyList(String key) {
- Query query = new SimpleQuery("name:\"" + key + "\"");
+ Query query = new SimpleQuery(new Criteria("nameStr").startsWith(key));
/** 璁剧疆鍒嗛〉寮�濮嬭褰曟暟(绗竴椤�) 榛樿0 */
query.setOffset(0);
/** 璁剧疆姣忛〉鏄剧ず璁板綍鏁帮紝榛樿10 */
query.setRows(10);
+
+
ScoredPage<SolrAlbumVideo> result = solrTemplate.queryForPage(CORE_NAME, query, SolrAlbumVideo.class);
System.out.println("鎬昏褰曟暟锛�" + result.getTotalElements());
List<SolrAlbumVideo> list = result.getContent();
@@ -224,7 +228,7 @@
}
saveOrUpdate(videoList);
} catch (Exception e) {
- logger.error("涓撹緫鎼滅储寮曟搸鏁版嵁鍚屾澶辫触",e);
+ logger.error("涓撹緫鎼滅储寮曟搸鏁版嵁鍚屾澶辫触", e);
}
}
}
--
Gitblit v1.8.0