From f788607ff771a47bc60d6a86e00b3433c40f3d2c Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期五, 24 九月 2021 15:22:03 +0800 Subject: [PATCH] 接入视频直播 --- src/main/java/com/yeshi/buwan/controller/parser/UserParser.java | 360 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 319 insertions(+), 41 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 9bcbf7c..9598bf3 100644 --- a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java +++ b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java @@ -1,30 +1,40 @@ package com.yeshi.buwan.controller.parser; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import com.yeshi.buwan.domain.*; import com.yeshi.buwan.domain.Collection; import com.yeshi.buwan.domain.solr.SolrAlbumVideo; +import com.yeshi.buwan.domain.solr.SolrShortVideo; import com.yeshi.buwan.domain.system.DetailSystem; +import com.yeshi.buwan.domain.system.DetailSystemConfig; import com.yeshi.buwan.domain.user.LoginUser; import com.yeshi.buwan.domain.video.InternetSearchVideo; import com.yeshi.buwan.dto.log.BaseLog; import com.yeshi.buwan.dto.search.SolrResultDTO; +import com.yeshi.buwan.dto.search.SolrShortVideoSearchFilter; import com.yeshi.buwan.dto.search.SolrVideoSearchFilter; import com.yeshi.buwan.dto.user.LoginInfoDto; import com.yeshi.buwan.exception.user.LoginUserException; import com.yeshi.buwan.exception.user.RegisterUserException; -import com.yeshi.buwan.pptv.PPTVUtil; +import com.yeshi.buwan.videos.pptv.PPTVUtil; import com.yeshi.buwan.service.imp.*; import com.yeshi.buwan.service.inter.juhe.InternetSearchVideoService; -import com.yeshi.buwan.service.manager.SolrAlbumVideoDataManager; +import com.yeshi.buwan.service.inter.system.SystemConfigService; +import com.yeshi.buwan.service.manager.search.SolrAlbumVideoDataManager; +import com.yeshi.buwan.service.manager.search.SolrInternetSearchVideoDataManager; +import com.yeshi.buwan.service.manager.search.SolrShortVideoDataManager; 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.factory.VideoInfoFactory; +import com.yeshi.buwan.util.factory.vo.UserInfoVOFactory; import com.yeshi.buwan.util.log.LoggerUtil; import com.yeshi.buwan.util.log.UserActiveLogFactory; import com.yeshi.buwan.util.video.VideoCategoryConstant; import com.yeshi.buwan.util.video.VideoConstant; +import com.yeshi.buwan.util.video.VideoUtil; import com.yeshi.buwan.vo.AcceptData; import com.yeshi.buwan.vo.video.VideoListResultVO; import net.sf.json.JSONArray; @@ -32,16 +42,21 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; +import redis.clients.jedis.Jedis; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.io.File; import java.io.PrintWriter; +import java.lang.reflect.Type; import java.util.*; @Controller public class UserParser { + + Logger searchKeyLogger = LoggerFactory.getLogger("searchKey"); + @Resource private SystemService systemService; @@ -68,7 +83,18 @@ @Resource private SolrAlbumVideoDataManager solrDataManager; @Resource + private SolrInternetSearchVideoDataManager solrInternetSearchVideoDataManager; + + @Resource + private SolrShortVideoDataManager solrShortVideoDataManager; + + @Resource private ConfigParser configParser; + @Resource + private SystemConfigService systemConfigService; + + @Resource + private RedisManager redisManager; public void getUid(AcceptData acceptData, HttpServletRequest request, PrintWriter out) { DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName()); @@ -79,7 +105,7 @@ out.print(JsonUtil.loadFalseJson("鑾峰彇uid澶辫触")); return; } else { - Map<String, String> map = configService.getConfigAsMap(detailSystem, acceptData.getVersion()); + Map<String, String> map = configService.getConfigAsMap(acceptData.getChildDetailSystem(), acceptData.getVersion()); ShareContent share = shareService.getShareContent(detailSystem.getId()); JSONObject object = new JSONObject(); object.put("Uid", uid); @@ -89,7 +115,7 @@ object.put("ZiXun", map.get("zixun_url")); if (acceptData.getPlatform().equalsIgnoreCase("ios") && !"涓浗".equalsIgnoreCase(userInfo.getCountry()))// 姝e湪瀹℃牳鐨勭増鏈� object.put("CommentUrl", ""); - else + else if (share != null) object.put("CommentUrl", share.getShareUrl()); object.put("IOSSlotID", ""); @@ -155,12 +181,10 @@ // 骞垮憡绫诲瀷 object.put("adType", map.get("ad_type")); - int fullVideoVersion = Integer.parseInt(map.get("video_detail_full_video_version")); - String fullVideoVersionChannels = map.get("video_detail_full_video_version_channel"); - JSONObject json = JSONObject.fromObject(fullVideoVersionChannels); - if (json.optInt(acceptData.getChannel().toLowerCase(), 0) > 0) { - fullVideoVersion = json.optInt(acceptData.getChannel().toLowerCase(), 0); - } +// String fullVideoVersionChannels = map.get("video_detail_full_video_version_channel"); +// JSONObject json = JSONObject.fromObject(fullVideoVersionChannels); +// if (json.optInt(acceptData.getChannel().toLowerCase(), 0) > 0) { +// } ConfigParser.ADConfig adConfig = configParser.getAdShowType("ad_video_detail_full_video", acceptData.getChannel(), acceptData.getVersion(), map); @@ -197,12 +221,41 @@ } } } + List<String> list1 = solrInternetSearchVideoDataManager.getSuggestKeyList(key); + if (list1 != null) { + list.addAll(list1); + } + + Set<String> set = new HashSet<>(); + + if (list != null) { + for (String st : list) { + set.add(st); + } + list.clear(); + list.addAll(set); + } + + //鎸夊叧閿瘝鐨勫尮閰嶅害鎺掑簭 + Comparator<String> cm = new Comparator<String>() { + @Override + public int compare(String o1, String o2) { + float s1 = CompareStrSimUtil.getSimilarityRatio(o1, key, true); + float s2 = CompareStrSimUtil.getSimilarityRatio(o2, key, true); + return s2 > s1 ? 1 : -1; + } + }; + + Collections.sort(list, cm); + + JSONObject object = new JSONObject(); object.put("count", list.size() + ""); JSONArray array = new JSONArray(); for (int i = 0; i < list.size(); i++) { - array.add(StringUtil.outPutResultJson(list.get(i))); + if (i < 10) + array.add(StringUtil.outPutResultJson(list.get(i))); } object.put("data", array); out.print(JsonUtil.loadTrueJson(object.toString())); @@ -277,7 +330,7 @@ object.put("data", array); out.print(JsonUtil.loadTrueJson(object.toString())); } else { - List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, acceptData.getVersion()); + List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, acceptData.getVersion(), acceptData.getChannel()); String cacheMD5 = "0"; if (resourceList != null && resourceList.size() > 0) for (Long l : resourceList) @@ -364,6 +417,30 @@ return; } + final String id = StringUtil.Md5(String.format("%s#%s#%s#%s", acceptData.getDetailSystem().getId(), acceptData.getDevice(), key, type)); + ThreadUtil.run(new Runnable() { + @Override + public void run() { + String redisKey = "search-" + id; + Jedis jedis = redisManager.getJedis(); + try { + //閲嶅璇锋眰杩囨护 + if (jedis.setnx(redisKey, "1") <= 0) { + return; + } + jedis.expire(redisKey, 120); + JSONObject searchData = new JSONObject(); + searchData.put("key", key); + searchData.put("type", type); + searchData.put("detailSystemId", acceptData.getDetailSystem().getId()); + searchData.put("device", acceptData.getDevice()); + searchData.put("createTime", System.currentTimeMillis()); + searchKeyLogger.info(new Gson().toJson(searchData)); + } finally { + jedis.close(); + } + } + }); LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createSearch(new BaseLog(acceptData, ""), key, type)); int pageIndex = StringUtil.getPage(page); @@ -371,7 +448,7 @@ pageIndex = 1; } - List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion()); + List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel()); String cacheMD5 = "0"; @@ -409,26 +486,49 @@ } } - for (int i = 0; i < list.size(); i++) { - ((VideoInfo) list.get(i)) - .setPicture(VideoPictureUtil.getShowPicture((VideoInfo) list.get(i), acceptData.getPlatform(), acceptData.getVersion() + "")); - array.add(StringUtil.outPutResultJson(list.get(i))); - } - object.put("data", array); + if (pageIndex == 1) {//杩斿洖瀵艰埅鏍� List<VideoType> typeList = new ArrayList<>(); VideoType vt = new VideoType(); vt.setId(0); vt.setName("鍏ㄩ儴"); typeList.add(vt); - Set<Long> set = new HashSet<>(); - for (VideoInfo videoInfo : list) { - if (videoInfo.getShowType() == 1 && videoInfo.getVideoType() != null) - set.add(videoInfo.getVideoType().getId()); + List<Long> set = new ArrayList<>(); + //灏嗚棰戝唴瀹瑰垎绫诲苟鎺掑簭 + Map<Long, List<VideoInfo>> videoMap = new HashMap<>(); + for (int i = 0; i < list.size(); i++) { + VideoInfo videoInfo = list.get(i); + if (videoInfo.getShowType() == 1 && videoInfo.getVideoType() != null) { + if (videoMap.get(videoInfo.getVideoType().getId()) == null) + videoMap.put(videoInfo.getVideoType().getId(), new ArrayList<>()); + videoMap.get(videoInfo.getVideoType().getId()).add(videoInfo); + if (!set.contains(videoInfo.getVideoType().getId())) + set.add(videoInfo.getVideoType().getId()); + + if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion()) && (StringUtil.isNullOrEmpty(type) || type.equalsIgnoreCase("0"))) { + list.remove(i); + i--; + } + } } - for (Iterator<Long> its = set.iterator(); its.hasNext(); ) { - Long typeId = its.next(); + //閲嶆柊缁勭粐鏁版嵁 + if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion()) && (StringUtil.isNullOrEmpty(type) || type.equalsIgnoreCase("0"))) { + List<VideoInfo> albumVideoList = new ArrayList<>(); + for (int i = 0; i < set.size(); i++) { + Long typeId = set.get(i); + String typeName = VideoConstant.getMainCategoryName(typeId); + if (!StringUtil.isNullOrEmpty(typeName)) { + videoMap.get(typeId).get(0).setAlbumMoreInfo(new VideoInfo.VideoAlbumMoreInfo(typeName, i + 1)); + albumVideoList.addAll(videoMap.get(typeId)); + } + } + list.addAll(0, albumVideoList); + } + + + for (int i = 0; i < set.size(); i++) { + Long typeId = set.get(i); String typeName = VideoConstant.getMainCategoryName(typeId); if (!StringUtil.isNullOrEmpty(typeName)) { vt = new VideoType(); @@ -438,10 +538,13 @@ } } - vt = new VideoType(); - vt.setId(Constant.SEARCH_RESULT_TYPE_HIGH_DEFINITION); - vt.setName("楂樻竻"); - typeList.add(vt); + //闊╁墽涓嶈繑鍥為珮娓� + if (!acceptData.getDetailSystem().getId().equalsIgnoreCase("48")) { + vt = new VideoType(); + vt.setId(Constant.SEARCH_RESULT_TYPE_HIGH_DEFINITION); + vt.setName("楂樻竻"); + typeList.add(vt); + } JSONArray array1 = new JSONArray(); @@ -449,6 +552,13 @@ array1.add(StringUtil.outPutResultJson(vt1)); object.put("typeList", array1); } + + for (int i = 0; i < list.size(); i++) { + ((VideoInfo) list.get(i)) + .setPicture(VideoPictureUtil.getShowPicture((VideoInfo) list.get(i), acceptData.getPlatform(), acceptData.getVersion() + "")); + array.add(StringUtil.outPutResultJson(list.get(i))); + } + object.put("data", array); out.print(JsonUtil.loadTrueJson(object.toString())); @@ -464,7 +574,7 @@ int rootType = internetSearchVideo.getRootType(); SolrVideoSearchFilter filter = new SolrVideoSearchFilter(); filter.setVideoType(rootType); - filter.setResourceIds(new String[]{PPTVUtil.RESOURCE_ID + ""}); + filter.setResourceIds(Arrays.asList(new String[]{PPTVUtil.RESOURCE_ID + ""})); filter.setSortKey("watchcount"); SolrResultDTO dto = solrDataManager.find(filter, 1, 20); List<SolrAlbumVideo> solrAlbumVideoList = new ArrayList<>(); @@ -509,18 +619,53 @@ } + + private void guessLikeForShortVideo(AcceptData acceptData, String videoId, PrintWriter out) { + SolrShortVideo solrShortVideo = solrShortVideoDataManager.findOne(videoId); + SolrShortVideoSearchFilter filter = new SolrShortVideoSearchFilter(); + filter.setRootVideoType(solrShortVideo.getRootVideoType()); + if (solrShortVideo.getArea() != null) { + filter.setAreas(Arrays.asList(solrShortVideo.getArea().split(","))); + } + + SolrResultDTO dto = solrShortVideoDataManager.find(filter, 1, 10); + + + JSONObject object = new JSONObject(); + object.put("count", dto.getVideoList().size() + ""); + JSONArray array = new JSONArray(); + + for (int i = 0; i < dto.getVideoList().size(); i++) { + SolrShortVideo temp = (SolrShortVideo) dto.getVideoList().get(i); + if (temp.getId().equalsIgnoreCase(videoId)) + continue; + array.add(StringUtil.outPutResultJson(VideoInfoFactory.create(temp))); + } + if (array.size() % 2 != 0) { + array.remove(array.size() - 1); + } + + object.put("data", array); + out.print(JsonUtil.loadTrueJson(object.toString())); + } + // 鐚滀綘鍠滄 public void guessLike(AcceptData acceptData, HttpServletRequest request, PrintWriter out) { String videoId = request.getParameter("VideoId"); - if (!NumberUtil.isNumeric(videoId)) { - guessLikeForInternetSearch(acceptData, videoId, out); - return; + int fromtype = VideoUtil.getVideoFromType(videoId); + switch (fromtype) { + case HomeVideo.FROM_TYPE_INTERNET: + guessLikeForInternetSearch(acceptData, videoId, out); + return; + case HomeVideo.FROM_TYPE_SHORT: + guessLikeForShortVideo(acceptData, videoId, out); + return; } DetailSystem ds = systemService.getDetailSystemByPackage(acceptData.getPackageName()); - List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion()); + List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel()); List<VideoInfo> list1 = StringUtil.isNullOrEmpty(videoId) ? recommendService.guessLikeList(ds.getId(), 4, resourceList, CacheUtil.getMD5Long(resourceList)) : recommendService.guessLikeList(ds.getId(), 4, videoId, resourceList, @@ -571,6 +716,90 @@ object.put("data", array); out.print(JsonUtil.loadTrueJson(object.toString())); + } + + + //鏂扮増鐑棬鎼滅储 + public void getHotSearchNew(AcceptData acceptData, HttpServletRequest request, PrintWriter out) { + DetailSystemConfig config = configService.getConfigByKey("hot_search", acceptData.getDetailSystem(), acceptData.getVersion()); + if (config == null) { + out.print(JsonUtil.loadFalseJson("鏃犲唴瀹�")); + return; + } + String value = config.getValue(); + Type type = new TypeToken<List<String>>() { + }.getType(); + + List<String> list = new Gson().fromJson(value, type); + + + JSONObject object = new JSONObject(); + object.put("count", list.size() + ""); + JSONArray array = new JSONArray(); + for (int i = 0; i < list.size(); i++) { + array.add(list.get(i)); + } + + object.put("data", array); + out.print(JsonUtil.loadTrueJson(object.toString())); + } + + + //鑾峰彇鎼滅储鎺掕姒� + public void getSearchRank(AcceptData acceptData, HttpServletRequest request, PrintWriter out) { +// try { +// Map<String, List<String>> map = IqiyiRankUtil.getRank(10); +// } catch (IOException e) { +// e.printStackTrace(); +// } + + //鎼滅储鎺掕 + String value = systemConfigService.getConfigValueByKeyCache("searchRank"); + + Map<Integer, JSONObject> map = new TreeMap<>(); + if (!StringUtil.isNullOrEmpty(value)) { + JSONObject root = JSONObject.fromObject(value); + for (Iterator<String> its = root.keys(); its.hasNext(); ) { + String key = its.next(); + JSONArray array = root.optJSONArray(key); + JSONObject data = new JSONObject(); + switch (key) { + case "鐑悳": + data.put("鐑悳姒�", array); + map.put(0, data); + break; + case "鐢佃鍓�": + data.put("鐢佃鍓ф", array); + map.put(1, data); + break; + case "鐢靛奖": + data.put("鐢靛奖姒�", array); + map.put(2, data); + break; + case "缁艰壓": + data.put("缁艰壓姒�", array); + map.put(3, data); + break; + case "鍔ㄦ极": + data.put("鍔ㄦ极姒�", array); + map.put(4, data); + break; + } + } + } + + JSONObject data = new JSONObject(); + for (Iterator<Integer> its = map.keySet().iterator(); its.hasNext(); ) { + Integer key = its.next(); + JSONObject item = map.get(key); + String k = item.keys().next().toString(); + data.put(k, item.optJSONArray(k)); + } + + + JSONObject object = new JSONObject(); + object.put("data", data); + out.print(JsonUtil.loadTrueJson(object.toString())); } // 鑾峰彇鐢ㄦ埛淇℃伅 @@ -722,6 +951,35 @@ } + + private void getRelativeVideosForShortVideo(AcceptData acceptData, String videoId, PrintWriter out) { + SolrShortVideo solrShortVideo = solrShortVideoDataManager.findOne(videoId); + SolrShortVideoSearchFilter filter = new SolrShortVideoSearchFilter(); + filter.setKey(solrShortVideo.getName()); + filter.setFuzzy(true); + + SolrResultDTO dto = solrShortVideoDataManager.find(filter, 1, 10); + + + JSONObject object = new JSONObject(); + object.put("count", dto.getVideoList().size() + ""); + JSONArray array = new JSONArray(); + + for (int i = 0; i < dto.getVideoList().size(); i++) { + SolrShortVideo temp = (SolrShortVideo) dto.getVideoList().get(i); + if (temp.getId().equalsIgnoreCase(videoId)) + continue; + array.add(StringUtil.outPutResultJson(VideoInfoFactory.create(temp))); + } + if (array.size() % 2 != 0) { + array.remove(array.size() - 1); + } + + object.put("data", array); + out.print(JsonUtil.loadTrueJson(object.toString())); + } + + /** * 鐩稿叧瑙嗛 * @@ -735,12 +993,17 @@ return; } - if (!NumberUtil.isNumeric(videoId)) { - getRelativeVideosForInternetSearch(acceptData, videoId, out); - return; + int fromtype = VideoUtil.getVideoFromType(videoId); + switch (fromtype) { + case HomeVideo.FROM_TYPE_INTERNET: + getRelativeVideosForInternetSearch(acceptData, videoId, out); + return; + case HomeVideo.FROM_TYPE_SHORT: + getRelativeVideosForShortVideo(acceptData, videoId, out); + return; } - List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion()); + List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel()); DetailSystem ds = systemService.getDetailSystemByPackage(acceptData.getPackageName()); List<VideoInfo> list = recommendService.getRelativeVideoList(ds.getId(), 4, videoId, resourceList, @@ -779,7 +1042,7 @@ return; } - List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion()); + List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel()); DetailSystem ds = systemService.getDetailSystemByPackage(acceptData.getPackageName()); List<VideoInfo> list1 = recommendService.peopleSee(ds.getId(), 4, videoId, resourceList, @@ -896,8 +1159,17 @@ // new Thread(new Runnable() { // public void run() { // for (int i = 0; i < 3; i++) { - boolean isS = MailSenderUtil.sendEmail(account, "ysyz17784739772@126.com", "weikou2014", "甯冧父绀惧尯娉ㄥ唽楠岃瘉鐮�:" + code, - "甯冧父绀惧尯娉ㄥ唽楠岃瘉鐮�:" + code); + DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName()); + String title = "甯冧父绀惧尯娉ㄥ唽楠岃瘉鐮�:" + code; + String content = "甯冧父绀惧尯娉ㄥ唽楠岃瘉鐮�:" + code; + if (!detailSystem.getAppName().contains("甯冧父")) { + String name = detailSystem.getAppName(); + title = name + "楠岃瘉鐮�:" + code; + content = title; + } + + boolean isS = MailSenderUtil.sendEmail(account, "ysyz17784739772@126.com", "weikou2014", title, + content); // } // }).start(); @@ -995,6 +1267,12 @@ // 娉ㄥ唽 --鐢ㄦ埛鍚�,鏄电О,瀵嗙爜 LoginUser user = userService.getLoginUser(loginUid); + if (user.getState() != null && user.getState() == LoginUser.STATE_UNREGISTER) { + out.print(JsonUtil.loadFalseJson("璐︽埛宸叉敞閿�")); + return; + } + //闅愯棌user涓殑email + user.setEmail(UserInfoVOFactory.getHiddenEmail(user.getEmail())); if (user.getPortrait() != null && !user.getPortrait().startsWith("http")) user.setPortrait("http://" + Constant.WEBSITE + "/BuWan" + user.getPortrait()); out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(user))); -- Gitblit v1.8.0