From fc7a6634496066fe45dca8ea9832bdd2f7341db4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 13 十月 2020 10:25:39 +0800
Subject: [PATCH] 百度内容联盟前端分类,首页弹窗广告

---
 src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java |   42 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 40 insertions(+), 2 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 6d0fc91..f6e8171 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
@@ -1,16 +1,24 @@
 package com.yeshi.buwan.controller.parser;
 
 import java.io.PrintWriter;
+import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.google.gson.GsonBuilder;
+import com.yeshi.buwan.domain.Config;
 import com.yeshi.buwan.domain.DetailSystem;
+import com.yeshi.buwan.domain.recommend.FloatAD;
+import com.yeshi.buwan.log.LogHelper;
 import com.yeshi.buwan.service.imp.SystemService;
+import com.yeshi.buwan.service.inter.ad.FloatADService;
 import com.yeshi.buwan.util.IPUtil;
 import com.yeshi.buwan.util.StringUtil;
 import com.yeshi.buwan.vo.AcceptData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 
 import com.google.gson.Gson;
@@ -21,12 +29,17 @@
 
 @Controller
 public class ConfigParser {
+
+    Logger logger = LoggerFactory.getLogger(ConfigParser.class);
     @Resource
     private ConfigService configService;
     @Resource
     private SystemService systemService;
 
-    private String getAdShowType(String key, String channel, int version, Map<String, String> map) {
+    @Resource
+    private FloatADService floatADService;
+
+    public String getAdShowType(String key, String channel, int version, Map<String, String> map) {
         String splash = map.get(key);
         JSONObject jsonObject = JSONObject.fromObject(splash);
         ADConfig splashAD = null;
@@ -58,14 +71,16 @@
 
         //寮�灞忕殑鍦板尯灞忚斀瑙勫垯
         String shieldProvince = map.get("shield_province");
-        if(!StringUtil.isNullOrEmpty(shieldProvince)) {
+        if (!StringUtil.isNullOrEmpty(shieldProvince)) {
             JSONObject json = JSONObject.fromObject(shieldProvince);
             //鑾峰彇娓犻亾闇�瑕佸睆钄界殑鍩庡競
             String province = json.optString(acceptData.getChannel().toLowerCase());
             if (!StringUtil.isNullOrEmpty(splash) && !StringUtil.isNullOrEmpty(province)) {
                 String pro = IPUtil.getIPProvince(ip);
+                LogHelper.print("鍩庡競灞忚斀锛�" + ip + ":" + pro);
                 if (pro != null && pro.contains(province)) {//灞忚斀IP
                     splash = "";
+                    LogHelper.print("鍩庡競灞忚斀:" + pro);
                 }
             }
         }
@@ -78,11 +93,34 @@
         ad.put("videoPlayPre", getAdShowType("ad_play_video_pre", acceptData.getChannel(), acceptData.getVersion(), map));
         //APP閫�鍑�
         ad.put("exitApp", getAdShowType("ad_exit_app", acceptData.getChannel(), acceptData.getVersion(), map));
+        //鍏ㄥ睆骞垮憡鎺у埗
+        ad.put("videoDetailFullVideo", getAdShowType("ad_video_detail_full_video", acceptData.getChannel(), acceptData.getVersion(), map));
 
         data.put("ad", ad);
         out.print(JsonUtil.loadTrueJson(data.toString()));
     }
 
+
+    /**
+     * 鑾峰彇棣栭〉閰嶇疆淇℃伅
+     *
+     * @param acceptData
+     * @param request
+     * @param out
+     */
+    public void getHomeConfig(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+        DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
+        List<FloatAD> adList = floatADService.listShowAD(1, 1);
+        Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+        JSONObject data = new JSONObject();
+        if (adList != null && adList.size() > 0) {
+            FloatAD ad = adList.get(0);
+            data.put("floatAD", gson.toJson(ad));
+        }
+
+        out.print(JsonUtil.loadTrueJson(data.toString()));
+    }
+
     class ADConfig {
         int version;
         String type;

--
Gitblit v1.8.0