Merge branch 'release_20240425_01' into 'main'

Release 20240425 01

See merge request !53

src/main/java/com/lwby/marketing/att/novel/NovelUniversalProcess.java

@@ -47,7 +47,7 @@ public class NovelUniversalProcess extends UniversalProcess {
         ddi.setDevice_status(exists(PRIZE_FLOW_PREFIX.concat(String.valueOf(ddi.getUserId()))) ? 2 : 0);
 
         String jsonString = JSONObject.toJSONString(ddi);
-        ListenableFuture<SendResult<String, String>> active_result = storyKafkaTemplate.send("ocpc_result_test", jsonString);
+        ListenableFuture<SendResult<String, String>> active_result = storyKafkaTemplate.send("ocpc_result", jsonString);
         active_result.addCallback(
                 result -> NOVEL_SYS_LOG.info("归因成功[{}],归因类型[{}]", jsonString, status.desc),
                 ex -> NOVEL_ERROR_LOG.error("归因失败[{}],归因类型[{}]", jsonString, status.desc, ex)

src/main/java/com/lwby/marketing/att/videoapp/handle/StoreVideoAppAttributionFlow.java

@@ -23,7 +23,7 @@ public class StoreVideoAppAttributionFlow extends NodeFlow<NovelAction> {
                 //商店判断30天活跃，不在活跃天数内，发BI
                 String aliveDeviceKey = up.buildKey(action.getPlatformId(), action.getDeviceId());
                 if (!up.existsIsAlive(aliveDeviceKey)) {
-                    up.notifyResult(action,"ocpc_result_test", AttributionStatus.STORE_CALLBACK);
+                    up.notifyResult(action,"ocpc_result", AttributionStatus.STORE_CALLBACK);
                 }
             }
             action.stop(true);   //结束后面所有执行流程

src/main/java/com/lwby/marketing/att/videoapp/handle/UploadVideoAppCallFlow.java

@@ -24,7 +24,7 @@ public class UploadVideoAppCallFlow extends NodeFlow<NovelAction> {
 
         boolean success = action.getMedia().notify(action);
         if (success) {
-            up.notifyResult(action, type.getTopic()+"_test",type.getStatus());
+            up.notifyResult(action, type.getTopic(),type.getStatus());
             up.set(up.getFirstCheckerKey(action), up.getExpire(action), "1");
         }
     }

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

@@ -202,6 +202,7 @@ public class ClickbackService extends ServiceHelper{
         deliveryDeviceInfo.setClick_time(System.currentTimeMillis());
         deliveryDeviceInfo.setAd_group_id(params.get("campaign_id"));
         deliveryDeviceInfo.setMedia(media.name);
+        params.put("media",deliveryDeviceInfo.getMedia());
         deliveryDeviceInfo.setDj_channel(params.get("channel"));
         //短剧视频合集和视频id
         deliveryDeviceInfo.setVideoResourceId(params.get("videoResourceId"));

src/main/java/com/lwby/marketing/notify/media/gdt/NovelGDTNotify.java

@@ -43,12 +43,10 @@ public class NovelGDTNotify extends MobileNotify {
 
         String userAction = JSONObject.toJSONString(dto);
         try {
-            //TODO;测试不执行
-//            String result = HttpUtil.post(sb.toString(), userAction);
-//            Integer resultCode = (Integer) JSON.parseObject(result).get("code");
-//            return resultCode == 0;
-            log.info("Callback info:{}",userAction);
-            return true;
+            String result = HttpUtil.post(sb.toString(), userAction);
+            Integer resultCode = (Integer) JSON.parseObject(result).get("code");
+            log.info("Callback gdt info:{},resultCode={}",userAction,resultCode);
+            return resultCode == 0;
         } catch (Exception e) {
             return false;
         }

src/main/java/com/lwby/marketing/notify/media/jrtt/NovelJRTTNotify.java

@@ -35,12 +35,10 @@ public class NovelJRTTNotify extends MobileNotify {
 
         String userJson = JSONObject.toJSONString(request);
         try {
-            //TODO;测试不执行
-//            String result = HttpUtil.post(ATTRIBUTE_URL, userJson);
-//            Integer resultCode = (Integer) JSON.parseObject(result).get("code");
-//            return resultCode == 0;
-            log.info("Callback info:{}",userJson);
-            return true;
+            String result = HttpUtil.post(ATTRIBUTE_URL, userJson);
+            Integer resultCode = (Integer) JSON.parseObject(result).get("code");
+            log.info("Callback jrtt info:{},resultCode={}",userJson,resultCode);
+            return resultCode == 0;
         } catch (Exception e) {
             return false;
         }

src/main/java/com/lwby/marketing/notify/media/jrtt/VideoAppJRTTNotify.java

@@ -58,14 +58,13 @@ public class VideoAppJRTTNotify extends MobileNotify {
         String userJson = JSONObject.toJSONString(request);
         try {
             //TODO;测试不执行
-//            String result = HttpUtil.post(ATTRIBUTE_URL, userJson);
-//            Integer resultCode = (Integer) JSON.parseObject(result).get("code");
-//            return resultCode == 0;
-            log.info("VideoAppJRTTNotify android Callback info:{}",userJson);
-            //if (Objects.equals(na.getType(),0)) {
-            //    sendAutoAttribute(ci,ddi,uploadAndroidUrl);
-            //}
-            return true;
+            String result = HttpUtil.post(ATTRIBUTE_URL, userJson);
+            Integer resultCode = (Integer) JSON.parseObject(result).get("code");
+            log.info("VideoAppJRTTNotify android Callback info:{},resultCode={}",userJson,resultCode);
+            if (Objects.equals(na.getType(),0)) {
+                sendAutoAttribute(ci,ddi,uploadAndroidUrl);
+            }
+            return resultCode == 0;
         } catch (Exception e) {
             return false;
         }
@@ -92,14 +91,13 @@ public class VideoAppJRTTNotify extends MobileNotify {
         String userJson = JSONObject.toJSONString(request);
         try {
             //TODO;测试不执行
-            //            String result = HttpUtil.post(ATTRIBUTE_URL, userJson);
-            //            Integer resultCode = (Integer) JSON.parseObject(result).get("code");
-            //            return resultCode == 0;
-            log.info("VideoAppJRTTNotify ios Callback info:{}",userJson);
-            //if (Objects.equals(na.getType(),0)) {
-            //    sendAutoAttribute(ci,ddi,uploadIosUrl);
-            //}
-            return true;
+            String result = HttpUtil.post(ATTRIBUTE_URL, userJson);
+            Integer resultCode = (Integer) JSON.parseObject(result).get("code");
+            log.info("VideoAppJRTTNotify ios Callback info:{},resultCode={}",userJson,resultCode);
+            if (Objects.equals(na.getType(),0)) {
+                sendAutoAttribute(ci,ddi,uploadIosUrl);
+            }
+            return resultCode == 0;
         } catch (Exception e) {
             return false;
         }