From 04f09e52ffd4681bdfd85e51acd3da0d1280c3d3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 16 四月 2022 16:07:10 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java | 168 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 144 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java b/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
index 36d846f..74342db 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
@@ -1,39 +1,45 @@
package com.yeshi.buwan.controller.parser;
-import java.io.PrintWriter;
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
+import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.annotations.Expose;
import com.google.gson.reflect.TypeToken;
-import com.yeshi.buwan.domain.system.DetailSystem;
import com.yeshi.buwan.domain.recommend.FloatAD;
+import com.yeshi.buwan.domain.system.DetailSystem;
import com.yeshi.buwan.dto.config.ADShieldIPConfig;
+import com.yeshi.buwan.dto.log.BaseLog;
import com.yeshi.buwan.log.LogHelper;
+import com.yeshi.buwan.service.imp.DetailSystemConfigService;
import com.yeshi.buwan.service.imp.SystemService;
import com.yeshi.buwan.service.inter.ad.FloatADService;
+import com.yeshi.buwan.service.inter.system.SystemConfigService;
+import com.yeshi.buwan.service.inter.user.UserDPContentWatchStatisticService;
+import com.yeshi.buwan.service.manager.APPManager;
import com.yeshi.buwan.service.manager.IPManager;
import com.yeshi.buwan.util.IPUtil;
+import com.yeshi.buwan.util.JsonUtil;
import com.yeshi.buwan.util.StringUtil;
+import com.yeshi.buwan.util.log.LoggerUtil;
+import com.yeshi.buwan.util.log.UserActiveLogFactory;
import com.yeshi.buwan.vo.AcceptData;
+import net.sf.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
-import com.google.gson.Gson;
-import com.yeshi.buwan.service.imp.DetailSystemConfigService;
-import com.yeshi.buwan.util.JsonUtil;
-
-import net.sf.json.JSONObject;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.PrintWriter;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
@Controller
public class ConfigParser {
+
Logger logger = LoggerFactory.getLogger(ConfigParser.class);
@Resource
@@ -47,19 +53,56 @@
@Resource
private IPManager ipManager;
+ @Resource
+ private SystemConfigService systemConfigService;
+
+ @Resource
+ private UserDPContentWatchStatisticService userDPContentWatchStatisticService;
+
+ @Resource
+ private APPManager appManager;
+
+
public ADConfig getAdShowType(String key, String channel, int version, Map<String, String> map) {
String splash = map.get(key);
JSONObject jsonObject = JSONObject.fromObject(splash);
+ if (jsonObject == null || jsonObject.isEmpty())
+ return null;
ADConfig adConfig = null;
channel = channel.toLowerCase();
- if (jsonObject.optJSONObject(channel) == null) {
+ if (jsonObject == null || jsonObject.optJSONObject(channel) == null) {
// 榛樿涓哄簲鐢ㄥ疂
channel = "qq";
}
- adConfig = new Gson().fromJson(jsonObject.optJSONObject(channel).toString(), ADConfig.class);
+ JSONObject channelAd = jsonObject.optJSONObject(channel);
+ adConfig = new Gson().fromJson(channelAd.toString(), ADConfig.class);
if (version >= adConfig.getVersion()) {
adConfig = null;
}
+ //鏍煎紡濡備笅:
+ //{"typeProperties":{"csj":{"weight":1,"pid":"123123"},"gdt":{"weight":1,"pid":"123123"}}}
+ if (adConfig != null && channelAd.optJSONObject("typeProbability") != null) {
+ JSONObject properties = channelAd.optJSONObject("typeProbability");
+
+ BigDecimal total = new BigDecimal(0);
+ for (Iterator<String> its = properties.keys(); its.hasNext(); ) {
+ String k = its.next();
+ total = total.add(new BigDecimal(properties.optJSONObject(k).optString("weight")));
+ }
+ BigDecimal random = total.multiply(new BigDecimal(Math.random()));
+ total = new BigDecimal(0);
+ for (Iterator<String> its = properties.keys(); its.hasNext(); ) {
+ String k = its.next();
+ total = total.add(new BigDecimal(properties.optJSONObject(k).optString("weight")));
+ if (random.compareTo(total) < 0) {
+ adConfig.setPid(properties.optJSONObject(k).optString("pid"));
+ adConfig.setType(k);
+ break;
+ }
+ }
+
+ }
+
return adConfig;
}
@@ -120,8 +163,9 @@
}
public void getConfig(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+ LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createAppSplash(new BaseLog(acceptData, "")));
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- Map<String, String> map = configService.getConfigAsMap(detailSystem, acceptData.getVersion());
+ Map<String, String> map = configService.getConfigAsMap(acceptData.getChildDetailSystem(), acceptData.getVersion());
JSONObject data = new JSONObject();
JSONObject ad = new JSONObject();
JSONObject adNew = new JSONObject();
@@ -155,6 +199,14 @@
}
}
}
+ //鏄惁涓哄唴瀹归槄璇荤敤鎴�
+ boolean isDPUser = false;
+ try {
+ isDPUser = userDPContentWatchStatisticService.isDPUser(acceptData);
+ } catch (Exception e) {
+
+ }
+
//骞垮憡鍏ㄩ儴灞忚斀鍖哄煙
String shieldAdLocationInfo = map.get("shield_ad_ip_location");
boolean hiddenAll = shieldAllAd(acceptData.getChannel(), acceptData.getVersion(), shieldAdLocationInfo, ip);
@@ -173,10 +225,11 @@
splashConfig = null;
//寮�灞�
ad.put("splash", splash);
- adNew.put("splash", gson.toJson(splashConfig));
+ if (!isDPUser)
+ adNew.put("splash", gson.toJson(splashConfig));
- ADConfig adConfig = null;
+ ADConfig adConfig = null;
//瑙嗛鍓嶈创
adConfig = getAdShowType("ad_play_video_pre", acceptData.getChannel(), acceptData.getVersion(), map);
if (hiddenAll)
@@ -188,13 +241,15 @@
if (hiddenAll)
adConfig = null;
ad.put("exitApp", adConfig == null ? "" : adConfig.getType());
- adNew.put("exitApp", gson.toJson(adConfig));
+ if (!isDPUser)
+ adNew.put("exitApp", gson.toJson(adConfig));
//鍏ㄥ睆骞垮憡鎺у埗
adConfig = getAdShowType("ad_video_detail_full_video", acceptData.getChannel(), acceptData.getVersion(), map);
if (hiddenAll)
adConfig = null;
ad.put("videoDetailFullVideo", adConfig == null ? "" : adConfig.getType());
- adNew.put("videoDetailFullVideo", gson.toJson(adConfig));
+ if (!isDPUser)
+ adNew.put("videoDetailFullVideo", gson.toJson(adConfig));
//鎼滅储椤靛箍鍛婃帶鍒�
adConfig = getAdShowType("ad_video_search", acceptData.getChannel(), acceptData.getVersion(), map);
if (hiddenAll)
@@ -208,14 +263,77 @@
adConfig = null;
adNew.put("pptvNoAdReward", gson.toJson(adConfig));
+ //鐑惎鍔ㄥ紑灞�
+ adConfig = getAdShowType("ad_splash_hot_start", acceptData.getChannel(), acceptData.getVersion(), map);
+ if (hiddenAll)
+ adConfig = null;
+ adNew.put("splashHotStart", gson.toJson(adConfig));
+
+ //棣栭〉鎻掑睆
+ adConfig = getAdShowType("home_ad_interstitial", acceptData.getChannel(), acceptData.getVersion(), map);
+ if (hiddenAll)
+ adConfig = null;
+ if (!isDPUser)
+ adNew.put("homeInterstitial", gson.toJson(adConfig));
+
+ //搴旂敤閫�鍑哄叏灞�
+ adConfig = getAdShowType("ad_exit_app_fullvideo", acceptData.getChannel(), acceptData.getVersion(), map);
+ if (hiddenAll)
+ adConfig = null;
+ if (!isDPUser)
+ adNew.put("exitAppFullvideo", gson.toJson(adConfig));
+
+
+ //鍏朵粬骞垮憡
+ adConfig = getAdShowType("ad_other", acceptData.getChannel(), acceptData.getVersion(), map);
+ if (hiddenAll)
+ adConfig = null;
+ adNew.put("other", gson.toJson(adConfig));
+
+ //骞垮憡ID
+ if (!StringUtil.isNullOrEmpty(map.get("gdt_app_id"))) {
+ adNew.put("gdtAppId", map.get("gdt_app_id"));
+ }
+
+ if (!StringUtil.isNullOrEmpty(map.get("csj_app_id"))) {
+ adNew.put("csjAppId", map.get("csj_app_id"));
+ }
+
data.put("ad", ad);
data.put("adNew", adNew);
//PPTV鍏嶅箍鍛婃潈鐩婃椂闀�,鏆傛椂璁剧疆涓�3灏忔椂
data.put("pptvNoAdRewardHour", 3);
//璁剧疆缃戦〉鍔犻�熷煙鍚�
- data.put("webSpeedUpHost",map.get("web_speed_up_host"));
+ data.put("webSpeedUpHost", map.get("web_speed_up_host"));
+ //鎴戠殑椤甸潰banner
+ data.put("minePageBanner", map.get("mine_page_banner"));
+ //鎾斁椤靛璺冲崗璁櫧鍚嶅崟
+ data.put("jumpAppProtocolPrefix", map.get("player_out_jump_protocol_prefix"));
+ //鑾峰彇璐拱璁板綍閾炬帴
+ data.put("buyRecordUrl", systemConfigService.getConfigValueByKeyCache("buyRecordUrl"));
+ //鑱旂郴鎴戜滑
+ data.put("contactUsLink", map.get("contact_us_link"));
+ //娉ㄩ攢
+ data.put("unRegisterLink", map.get("unregister_link"));
+ //鍏充簬鎴戜滑閾炬帴
+ data.put("aboutUsLink", map.get("about_us_link"));
+ //鍙嶉閾炬帴
+ data.put("feedBackLink", map.get("feed_back_link"));
+ //甯姪閾炬帴
+ data.put("helpLink", map.get("help_link"));
+ //搴旂敤閾炬帴
+ data.put("appLink", map.get("app_link"));
+
+ //鏄惁姝ｅ湪涓婄嚎
+
+ boolean onLine = false;
+ try {
+ onLine = appManager.isOnline(acceptData.getDetailSystem().getId(), acceptData.getVersion(), acceptData.getChannel());
+ } catch (Exception e) {
+ }
+ data.put("onLining", onLine);
out.print(JsonUtil.loadTrueJson(data.toString()));
@@ -230,7 +348,7 @@
* @param out
*/
public void getHomeConfig(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
- DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
+ LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createAppMainPage(new BaseLog(acceptData, "")));
List<FloatAD> adList = floatADService.listShowAD(1, 1);
Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
JSONObject data = new JSONObject();
@@ -272,6 +390,8 @@
public void setPid(String pid) {
this.pid = pid;
}
+
+
}
}
--
Gitblit v1.8.0