From e89de9319d8f771f8e53cb5f876d06465a580c57 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 02 八月 2021 18:23:22 +0800
Subject: [PATCH] kafka日志集成
---
src/main/java/com/yeshi/buwan/controller/parser/UserParser.java | 106 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 82 insertions(+), 24 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 da328aa..7c90b8b 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
@@ -19,8 +19,8 @@
import com.yeshi.buwan.service.imp.*;
import com.yeshi.buwan.service.inter.juhe.InternetSearchVideoService;
import com.yeshi.buwan.service.inter.system.SystemConfigService;
-import com.yeshi.buwan.service.manager.SolrAlbumVideoDataManager;
-import com.yeshi.buwan.service.manager.SolrInternetSearchVideoDataManager;
+import com.yeshi.buwan.service.manager.search.SolrAlbumVideoDataManager;
+import com.yeshi.buwan.service.manager.search.SolrInternetSearchVideoDataManager;
import com.yeshi.buwan.util.*;
import com.yeshi.buwan.util.JuHe.VideoResourceUtil;
import com.yeshi.buwan.util.annotation.RequireUid;
@@ -28,7 +28,6 @@
import com.yeshi.buwan.util.factory.VideoInfoFactory;
import com.yeshi.buwan.util.log.LoggerUtil;
import com.yeshi.buwan.util.log.UserActiveLogFactory;
-import com.yeshi.buwan.util.rank.IqiyiRankUtil;
import com.yeshi.buwan.util.video.VideoCategoryConstant;
import com.yeshi.buwan.util.video.VideoConstant;
import com.yeshi.buwan.vo.AcceptData;
@@ -38,18 +37,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.IOException;
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;
@@ -82,6 +84,9 @@
@Resource
private SystemConfigService systemConfigService;
+ @Resource
+ private RedisManager redisManager;
+
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());
@@ -101,7 +106,7 @@
object.put("ZiXun", map.get("zixun_url"));
if (acceptData.getPlatform().equalsIgnoreCase("ios") && !"涓浗".equalsIgnoreCase(userInfo.getCountry()))// 姝ｅ湪瀹℃牳鐨勭増鏈�
object.put("CommentUrl", "");
- else
+ else if (share != null)
object.put("CommentUrl", share.getShareUrl());
object.put("IOSSlotID", "");
@@ -167,12 +172,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);
@@ -209,19 +212,41 @@
}
}
}
- if (list == null || list.size() < 3) {
- List<String> list1 = solrInternetSearchVideoDataManager.getSuggestKeyList(key);
- if (list1 != null) {
- list.addAll(list1);
- }
+ 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()));
@@ -296,7 +321,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)
@@ -383,6 +408,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);
@@ -390,7 +439,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";
@@ -570,7 +619,7 @@
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,
@@ -874,7 +923,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> list = recommendService.getRelativeVideoList(ds.getId(), 4, videoId, resourceList,
@@ -913,7 +962,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,
@@ -1030,8 +1079,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();
--
Gitblit v1.8.0