From 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/DouYinCallBackController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/DouYinCallBackController.java b/fanli/src/main/java/com/yeshi/fanli/controller/DouYinCallBackController.java
index 566ba28..c18951f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/DouYinCallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/DouYinCallBackController.java
@@ -2,16 +2,25 @@
import java.io.PrintWriter;
+import javax.annotation.Resource;
+
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import com.google.gson.Gson;
import com.yeshi.fanli.entity.ad.DouYinClickEvent;
-import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.entity.push.DeviceActive;
+import com.yeshi.fanli.service.inter.ad.DouYinClickEventService;
+import com.yeshi.fanli.service.inter.push.DeviceActiveService;
+import com.yeshi.fanli.util.ad.DouYinAdUtil;
@Controller
@RequestMapping("ad/callback/douyin")
public class DouYinCallBackController {
+ @Resource
+ private DouYinClickEventService douYinClickEventService;
+
+ @Resource
+ private DeviceActiveService deviceActiveService;
/**
* 鎶栭煶涓嬭浇鍥炶皟
@@ -20,7 +29,13 @@
*/
@RequestMapping("monitor")
public void download(DouYinClickEvent event, PrintWriter out) {
- LogHelper.test(new Gson().toJson(event));
+ douYinClickEventService.save(event);
+ if (event.getOs() == 0) {
+ DeviceActive active = deviceActiveService.getFirstActiveInfo(event.getAndroidId());
+ if (active != null) {
+ DouYinAdUtil.activeAndroid(event.getCallback(), event.getImei(), active.getCreateTime().getTime());
+ }
+ }
out.print("success");
}
--
Gitblit v1.8.0