modify

src/main/java/com/lwby/marketing/controller/ClickbackService.java

@@ -158,55 +158,10 @@ public class ClickbackService extends ServiceHelper{
         clientInfo.setIdfa(params.get("idfaMd5"));
         clientInfo.setClientIp(params.get("ip"));
         clientInfo.setUa(params.get("ua"));
-        String model = encode(params.get("model"));
-        if (StringUtils.isEmpty(model) && StringUtils.isNotEmpty(clientInfo.getUa())) {
-            model = getModelByUa(clientInfo.getUa());
-        }
-        clientInfo.setPhoneModel(model);
-        DeliveryDeviceInfo deliveryDeviceInfo = new DeliveryDeviceInfo();
-        deliveryDeviceInfo.setClick_time(System.currentTimeMillis());
-        deliveryDeviceInfo.setAd_group_id(params.get("campaign_id"));
-        deliveryDeviceInfo.setAd_creative_id(params.get("cid"));
-        deliveryDeviceInfo.setAd_plan_id(params.get("adid"));
-        deliveryDeviceInfo.setMedia(Media.NOVEL_JRTT.name);
-        deliveryDeviceInfo.setPlatform_id(params.get("platform_id"));
-        deliveryDeviceInfo.setDj_channel(params.get("channel"));
-        deliveryDeviceInfo.setBook_id(StringUtils.defaultIfBlank(params.get("book"), StringUtils.defaultIfBlank(params.get("books"), params.get("book_id"))));
-        deliveryDeviceInfo.setCallback_param(params.get("callback_param"));
-        if (Objects.isNull(deliveryDeviceInfo.getCallback_param())) {
-            deliveryDeviceInfo.setCallback_url(params.get("callback_url"));
-        }
-        deliveryDeviceInfo.setAdvertiser_id(params.get("advertiser_id"));
-        deliveryDeviceInfo.setUuid(UUID.randomUUID().toString());
-        deliveryDeviceInfo.setAd_platform_type(params.get("ad_platform_type"));
-        deliveryDeviceInfo.setTarget_audience(params.get("target_audience"));
-        deliveryDeviceInfo.setIp(params.get("ip"));
-        if (!filter.contains(params.get("oaid"))) {
-            deliveryDeviceInfo.setOaid(params.get("oaid"));
-        }
-        if (StringUtils.isNotEmpty(clientInfo.getImei())) {
-            deliveryDeviceInfo.setImeiMd5(clientInfo.getImei());
-        }
-        if (StringUtils.isNotEmpty(clientInfo.getPhoneModel())) {
-            deliveryDeviceInfo.setModel(clientInfo.getPhoneModel());
-        }
-        //通投智选union_site
-        deliveryDeviceInfo.setUnion_site(params.get("union_site"));
-        deliveryDeviceInfo.setPartId(params.get("part_id"));
-        //巨量广告体验版中特有的宏参，代表巨量广告体验版的广告ID
-        deliveryDeviceInfo.setPromotion_id(emptyIsNull(params.get("promotion_id")));
-        //巨量广告体验版中特有的宏参，代表巨量广告体验版的项目ID
-        deliveryDeviceInfo.setProject_id(emptyIsNull(params.get("project_id")));
-        //巨量广告体验版中的广告名称
-        deliveryDeviceInfo.setPromotion_name(emptyIsNull(params.get("promotion_name")));
-        //巨量广告体验版中的项目名称
-        deliveryDeviceInfo.setProject_name(emptyIsNull(params.get("project_name")));
-        //信息流投放广告来源(碎片 1 书籍 2)
-        deliveryDeviceInfo.setSource(parseInt(params.get("source")));
+        //TODO;没有验证
+        clientInfo.setPhoneModel(StringUtils.defaultIfEmpty(encode(params.get("model")), getModelByUa(clientInfo.getUa())));
 
-        storyKafkaTemplate.send("growth_ad_click", JSONObject.toJSONString(params));
-
-        return new NovelAction(clientInfo,deliveryDeviceInfo);
+        return getNovelAction(params,Media.NOVEL_JRTT,clientInfo);
     }
 
     public NovelAction fullWeChat(Map<String, String> params) {
@@ -221,46 +176,9 @@ public class ClickbackService extends ServiceHelper{
         clientInfo.setOaid(params.get("hash_oaid"));
         clientInfo.setClientIp(params.get("ip"));
         clientInfo.setUa(params.get("user_agent"));
-        String model = encode(params.get("model"));
-        if (StringUtils.isEmpty(model) && StringUtils.isNotEmpty(clientInfo.getUa())) {
-            model = getModelByUa(clientInfo.getUa());
-        }
-        clientInfo.setPhoneModel(model);
-        DeliveryDeviceInfo deliveryDeviceInfo = new DeliveryDeviceInfo();
-        deliveryDeviceInfo.setClick_time(System.currentTimeMillis());
-        deliveryDeviceInfo.setClick_id(params.get("click_id"));
-        deliveryDeviceInfo.setAd_group_id(params.get("campaign_id"));
-        deliveryDeviceInfo.setAd_creative_id(params.get("ad_id"));
-        deliveryDeviceInfo.setAd_plan_id(params.get("adgroup_id"));
-        deliveryDeviceInfo.setMedia(Media.NOVEL_GDT.name);
-        deliveryDeviceInfo.setPlatform_id(params.get("platformId"));
-        deliveryDeviceInfo.setDj_channel(params.get("channel"));
-        deliveryDeviceInfo.setBook_id(StringUtils.defaultIfBlank(params.get("book"), StringUtils.defaultIfBlank(params.get("books"), params.get("book_id"))));
-        deliveryDeviceInfo.setCallback_url(params.get("callback"));
-        deliveryDeviceInfo.setAdvertiser_id(params.get("account_id"));
-        deliveryDeviceInfo.setUuid(UUID.randomUUID().toString());
-        deliveryDeviceInfo.setAd_platform_type(params.get("ad_platform_type"));
-        deliveryDeviceInfo.setTarget_audience(params.get("target_audience"));
-        deliveryDeviceInfo.setIp(params.get("ip"));
-        if (!filter.contains(params.get("oaid"))) {
-            deliveryDeviceInfo.setOaid(params.get("oaid"));
-        }
-        if (StringUtils.isNotEmpty(clientInfo.getImei())) {
-            deliveryDeviceInfo.setImeiMd5(clientInfo.getImei());
-        }
-
-        if (StringUtils.isNotEmpty(clientInfo.getPhoneModel())) {
-            deliveryDeviceInfo.setModel(clientInfo.getPhoneModel());
-        }
-
-        //通投智选union_site
-        deliveryDeviceInfo.setUnion_site(params.get("union_site"));
-        deliveryDeviceInfo.setPartId(params.get("part_id"));
-        //信息流投放广告来源(碎片 1 书籍 2)
-        deliveryDeviceInfo.setSource(parseInt(params.get("source")));
+        clientInfo.setPhoneModel(StringUtils.defaultIfEmpty(encode(params.get("model")), getModelByUa(clientInfo.getUa())));
 
-        storyKafkaTemplate.send("growth_ad_click", JSONObject.toJSONString(params));
-        return new NovelAction(clientInfo,deliveryDeviceInfo);
+        return getNovelAction(params,Media.NOVEL_GDT,clientInfo);
     }
 
     public NovelAction fullJrttFreeVideo(Map<String, String> params) {
@@ -276,20 +194,21 @@ public class ClickbackService extends ServiceHelper{
         clientInfo.setClientIp(params.get("ip"));
         clientInfo.setUa(params.get("ua"));
         clientInfo.setOs(params.get("os"));
-        String model = encode(params.get("model"));
-        if (StringUtils.isEmpty(model) && StringUtils.isNotEmpty(clientInfo.getUa())) {
-            model = getModelByUa(clientInfo.getUa());
-        }
-        clientInfo.setPhoneModel(model);
+        clientInfo.setPhoneModel(StringUtils.defaultIfEmpty(encode(params.get("model")), getModelByUa(clientInfo.getUa())));
+
+        return getNovelAction(params,Media.VIDEOAPP_JRTT,clientInfo);
+    }
+
+    public NovelAction getNovelAction(Map<String, String> params,Media media,ClientInfo clientInfo){
         DeliveryDeviceInfo deliveryDeviceInfo = new DeliveryDeviceInfo();
         deliveryDeviceInfo.setClick_time(System.currentTimeMillis());
         deliveryDeviceInfo.setAd_group_id(params.get("campaign_id"));
         deliveryDeviceInfo.setAd_creative_id(params.get("cid"));
         deliveryDeviceInfo.setAd_plan_id(params.get("adid"));
-        deliveryDeviceInfo.setMedia(Media.VIDEOAPP_JRTT.name);
+        deliveryDeviceInfo.setMedia(media.name);
         deliveryDeviceInfo.setPlatform_id(params.get("platform_id"));
         deliveryDeviceInfo.setDj_channel(params.get("channel"));
-        deliveryDeviceInfo.setVideoResourceId(params.get("videoResourceId"));
+        deliveryDeviceInfo.setBook_id(StringUtils.defaultIfBlank(params.get("book"), StringUtils.defaultIfBlank(params.get("books"), params.get("book_id"))));
         deliveryDeviceInfo.setCallback_param(params.get("callback_param"));
         if (Objects.isNull(deliveryDeviceInfo.getCallback_param())) {
             deliveryDeviceInfo.setCallback_url(params.get("callback_url"));
@@ -299,16 +218,10 @@ public class ClickbackService extends ServiceHelper{
         deliveryDeviceInfo.setAd_platform_type(params.get("ad_platform_type"));
         deliveryDeviceInfo.setTarget_audience(params.get("target_audience"));
         deliveryDeviceInfo.setIp(params.get("ip"));
-        deliveryDeviceInfo.setVideoId(params.get("videoId"));
-        if (!filter.contains(params.get("oaid"))) {
-            deliveryDeviceInfo.setOaid(params.get("oaid"));
-        }
-        if (StringUtils.isNotEmpty(clientInfo.getImei())) {
-            deliveryDeviceInfo.setImeiMd5(clientInfo.getImei());
-        }
-        if (StringUtils.isNotEmpty(clientInfo.getPhoneModel())) {
-            deliveryDeviceInfo.setModel(clientInfo.getPhoneModel());
-        }
+        deliveryDeviceInfo.setOaid(filter.contains(params.get("oaid"))?null:params.get("oaid"));
+        deliveryDeviceInfo.setImeiMd5(emptyIsNull(clientInfo.getImei()));
+        deliveryDeviceInfo.setModel(emptyIsNull(clientInfo.getPhoneModel()));
+
         //通投智选union_site
         deliveryDeviceInfo.setUnion_site(params.get("union_site"));
         deliveryDeviceInfo.setPartId(params.get("part_id"));
@@ -330,7 +243,6 @@ public class ClickbackService extends ServiceHelper{
         deliveryDeviceInfo.setMid5(emptyIsNull(params.get("mid5")));
         deliveryDeviceInfo.setMid6(emptyIsNull(params.get("mid6")));
 
-
         storyKafkaTemplate.send("growth_ad_click", JSONObject.toJSONString(params));
 
         return new NovelAction(clientInfo,deliveryDeviceInfo);