From d3ebf5b103d4deebd6ffb75f4471a6fddab8d764 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 05 九月 2020 17:30:30 +0800
Subject: [PATCH] '微信登录'
---
src/main/java/com/yeshi/buwan/controller/parser/UserParser.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
index ac147d6..90e6900 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
@@ -2,10 +2,12 @@
import com.yeshi.buwan.domain.*;
import com.yeshi.buwan.service.imp.*;
+import com.yeshi.buwan.service.manager.SolrDataManager;
import com.yeshi.buwan.util.*;
import com.yeshi.buwan.util.JuHe.VideoResourceUtil;
import com.yeshi.buwan.util.annotation.RequireUid;
import com.yeshi.buwan.util.email.MailSenderUtil;
+import com.yeshi.buwan.util.video.VideoCategoryConstant;
import com.yeshi.buwan.vo.AcceptData;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -18,6 +20,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
@Controller
public class UserParser {
@@ -44,6 +47,9 @@
@Resource
private VideoInfoService videoInfoService;
+ @Resource
+ private SolrDataManager solrDataManager;
+
public void getUid(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
String uid = userService.getUid(acceptData.getDevice(), acceptData.getSystem(), acceptData.getImei(), acceptData.getMac(), acceptData.getLat(), acceptData.getLng());
@@ -53,7 +59,7 @@
out.print(JsonUtil.loadFalseJson("鑾峰彇uid澶辫触"));
return;
} else {
- Map<String, String> map = configService.getConfigAsMap(detailSystem,acceptData.getVersion());
+ Map<String, String> map = configService.getConfigAsMap(detailSystem, acceptData.getVersion());
ShareContent share = shareService.getShareContent(detailSystem.getId());
JSONObject object = new JSONObject();
object.put("Uid", uid);
@@ -138,10 +144,10 @@
return;
}
- List<String> list = searchService.suggestSearch(key, acceptData.getSystem());
+ List<String> list = solrDataManager.getSuggestKeyList(key); //searchService.suggestSearch(key, acceptData.getSystem());
if (acceptData.getPlatform().equalsIgnoreCase("ios")) {
if (Constant.IOSTest) {
- if (acceptData.getVersion()== 1) {
+ if (acceptData.getVersion() == 1) {
list = new ArrayList<String>();
}
}
@@ -157,6 +163,34 @@
out.print(JsonUtil.loadTrueJson(object.toString()));
}
+
+ private List<VideoDetailInfo> createSearchVideoDetailsVO(VideoInfo video) {
+ List<VideoDetailInfo> detailList = new ArrayList<>();
+ if (video.getVideoType() != null && (Integer.parseInt(video.getVideoType().getId() + "") == VideoCategoryConstant.CATEGORY_DIANSHIJU || Integer.parseInt(video.getVideoType().getId() + "") == VideoCategoryConstant.CATEGORY_DONGMAN)) {
+ if (video.getVideocount() <= 5) {
+ for (int i = 0; i < video.getVideocount(); i++) {
+ VideoDetailInfo detail = new VideoDetailInfo();
+ detail.setTag((i + 1) + "");
+ detailList.add(detail);
+ }
+ } else {
+ for (int i = 0; i < 3; i++) {
+ VideoDetailInfo detail = new VideoDetailInfo();
+ detail.setTag((i + 1) + "");
+ detailList.add(detail);
+ }
+
+ for (int i = video.getVideocount() - 3; i < video.getVideocount(); i++) {
+ VideoDetailInfo detail = new VideoDetailInfo();
+ detail.setTag((i + 1) + "");
+ detailList.add(detail);
+ }
+ }
+ }
+
+ return detailList;
+ }
+
// 鎼滅储
public void search(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
@@ -208,6 +242,20 @@
List<VideoInfo> list = searchService.search(detailSystem.getId(), request.getRemoteAddr(),
acceptData.getUid(), key, pageIndex, (StringUtil.isNullOrEmpty(contentType) ? 0 : Integer.parseInt(contentType)),
acceptData.getSystem(), resourceList, cacheMD5);
+ //缁勭粐鏁版嵁
+ Set<Integer> albumCategorys = VideoCategoryConstant.getAlbumCategorys();
+ for (VideoInfo video : list) {
+ //濡傛灉鏄鐗囷紝涓斾负5澶у垎绫� 灏遍噰鐢ㄧ珫鏉″睍绀�
+ /**
+ * 鏄笓杈戯紝骞朵笖涓烘鐗�
+ */
+ //video.getVideoType() != null && albumCategorys.contains(Integer.parseInt(video.getVideoType().getId() + "")) &&
+ if (video.getContentType() == 0) {
+ video.setVideoDetailList(createSearchVideoDetailsVO(video));
+ video.setShowType(1);
+ } else
+ video.setShowType(0);
+ }
cacheMD5 = "0";
if (list != null) {
for (VideoInfo info : list) {
--
Gitblit v1.8.0