diff --git a/README.md b/README.md
index 304e1ff..e41fe17 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,10 @@
## 巨量引擎开放平台 - 巨量引擎
https://open.oceanengine.com/doc/index.html?key=ad&type=api&id=1696710655781900#item-link-%E7%A4%BA%E4%BE%8B
## 百度广告投放平台检测 - 百度营销
- https://dev2.baidu.com/content?sceneType=0&pageId=101214&nodeId=15&subhead=
+ https://dev2.baidu.com/content?sceneType=0&pageId=101213&nodeId=663&subhead=
## 广电通 - 腾讯广告
- https://developers.e.qq.com/docs/guide/conversion/new_version/dianjijiance
\ No newline at end of file
+ https://developers.e.qq.com/docs/guide/conversion/new_version/dianjijiance
+## 快手
+ https://developers.e.kuaishou.com/docs?docType=DSP&documentId=1942
+## vivo
+
diff --git a/src/main/java/com/baiyee/adcallback/api/callback/MobileMonitorCallbackAPI.java b/src/main/java/com/baiyee/adcallback/api/callback/MobileMonitorCallbackAPI.java
index 848ae25..2566dee 100644
--- a/src/main/java/com/baiyee/adcallback/api/callback/MobileMonitorCallbackAPI.java
+++ b/src/main/java/com/baiyee/adcallback/api/callback/MobileMonitorCallbackAPI.java
@@ -5,12 +5,8 @@ import cn.hutool.core.util.StrUtil;
import com.baiyee.adcallback.api.common.CommonResponse;
import com.baiyee.adcallback.api.common.ResponseCode;
import com.baiyee.adcallback.api.vo.*;
-import com.baiyee.adcallback.config.pojo.BdBackdataDTO;
-import com.baiyee.adcallback.config.pojo.JlBackdataDTO;
-import com.baiyee.adcallback.config.pojo.UcBackdataDTO;
-import com.baiyee.adcallback.config.pojo.convert.BdBackdataConvert;
-import com.baiyee.adcallback.config.pojo.convert.JlBackdataConvert;
-import com.baiyee.adcallback.config.pojo.convert.UcBackdataConvert;
+import com.baiyee.adcallback.config.pojo.*;
+import com.baiyee.adcallback.config.pojo.convert.*;
import com.baiyee.adcallback.service.AdOriginalityManageService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +31,7 @@ public class MobileMonitorCallbackAPI {
/**
* julaing身份验证回调url请求
- *
+ *
* API文档:
*
*
@@ -74,21 +70,23 @@ public class MobileMonitorCallbackAPI {
@RequestParam(value = "TIMESTAMP", defaultValue = "") Long ts,
@RequestParam(value = "callback_url", defaultValue = "") String callbackUrl,
@RequestParam(value = "model", defaultValue = "") String model,
- @RequestParam(value = "caid1", defaultValue = "") String caid12
+ @RequestParam(value = "caid1", defaultValue = "") String caid12,
+ @RequestParam(value = "tag", defaultValue = "") String tag
) {
JuliangMobileMonitorCallbackRequestVO vo = new JuliangMobileMonitorCallbackRequestVO(
- aid,aidName,advertiserId,cid,ctype,csite,imei,idfa,oaid,os,mac,mac1,ip,geo,ts,callbackUrl,model,caid12
+ aid, aidName, advertiserId, cid, ctype, csite, imei, idfa, oaid, os, mac, mac1, ip, geo, ts, callbackUrl, model, caid12
);
if (ObjectUtil.isNull(vo)) {
return CommonResponse.createByErrorMessage(ResponseCode.EMPTY_ARGUMENT.getDesc());
}
// 请求过滤规则,过滤掉不用的数据
- if (preRuleForReq(vo)){
- log.error("================================= [not right imei data ,{} ] =================================",vo);
+ if (preRuleForReq(vo)) {
+ log.error("================================= [not right imei data ,{} ] =================================", vo);
return CommonResponse.createBySuccess();
}
- log.info("================================= [one request comming, JuliangMobileMonitorCallbackAPI|julaingMonitorUrlCallbackReqUrl, vo is {} ] =================================", vo);
+ setTag(tag,vo);
+ log.info("================================= [one request comming, julaingMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, vo is {} ] =================================", vo);
JlBackdataDTO jlBackdataDTO = new JlBackdataDTO();
JlBackdataConvert.voCovertToDTO(vo, jlBackdataDTO);
adOriginalityManageService.handleMonitorUrlCallbackDataThenSave();
@@ -103,28 +101,24 @@ public class MobileMonitorCallbackAPI {
private boolean preRuleForReq(JuliangMobileMonitorCallbackRequestVO vo) {
String imei = vo.getImei();
- if (StrUtil.isBlank(imei)){
+ if (StrUtil.isBlank(imei)) {
return Boolean.TRUE;
}
- if (StrUtil.isNotBlank(imei) && StrUtil.equalsIgnoreCase(IMEI_TAG,imei)){
+ if (StrUtil.isNotBlank(imei) && StrUtil.equalsIgnoreCase(IMEI_TAG, imei)) {
return Boolean.TRUE;
}
return Boolean.FALSE;
}
-
-
-
/**
* 百度链接监测API:
*
- *
- *
+ *
+ *
* 监测示例 URL - 广告主填写:
- * http://www.test.com/notice?imei_md5={{IMEI_MD5}}&os={{OS}}&ip={{IP}}&ua={{UA}}&ts={{TS}}&userid={{USER_ID}}&pid={{PLAN_ID}}&uid={{UNIT_ID}}&aid={{IDEA_ID}}&click_id={{CLICK_ID}}&callback_url={{CALLBACK_URL}}
- *
+ * http://www.test.com/notice?tag=test123&imei_md5={{IMEI_MD5}}&os={{OS}}&ip={{IP}}&ua={{UA}}&ts={{TS}}&userid={{USER_ID}}&pid={{PLAN_ID}}&uid={{UNIT_ID}}&aid={{IDEA_ID}}&click_id={{CLICK_ID}}&callback_url={{CALLBACK_URL}}
*/
@RequestMapping(value = "/bd/monitor")
public CommonResponse baiduMonitorUrlCallbackReqUrl(
@@ -144,23 +138,23 @@ public class MobileMonitorCallbackAPI {
@RequestParam(value = "device_info", defaultValue = "") String deviceInfo,
@RequestParam(value = "interactionsType", defaultValue = "") String interactionsType,
@RequestParam(value = "ext_info", defaultValue = "") String extInfo,
- @RequestParam(value = "callType", defaultValue = "") String callType
-
+ @RequestParam(value = "callType", defaultValue = "") String callType,
+ @RequestParam(value = "tag", defaultValue = "") String tag
) {
BaiduMobileMonitorCallbackRequestVO vo = new BaiduMobileMonitorCallbackRequestVO(
- userId,aid,pid,uid,callbackUrl,clickId,idfa,imei,oaid,mac,ip,os,ts,deviceInfo,interactionsType,extInfo,callType
+ userId, aid, pid, uid, callbackUrl, clickId, idfa, imei, oaid, mac, ip, os, ts, deviceInfo, interactionsType, extInfo, callType
);
if (ObjectUtil.isNull(vo)) {
return CommonResponse.createByErrorMessage(ResponseCode.EMPTY_ARGUMENT.getDesc());
}
// 请求过滤规则,过滤掉不用的数据
- if (preRuleForReq(vo)){
- log.error("================================= [not right imei data ,{} ] =================================",vo);
+ if (preRuleForReq(vo)) {
+ log.error("================================= [not right imei data ,{} ] =================================", vo);
return CommonResponse.createBySuccess();
}
-
- log.info("================================= [one request comming, BaiduMobileMonitorCallbackAPI|baiduMonitorUrlCallbackReqUrl, vo is {} ] =================================", vo);
+ setTag(tag,vo);
+ log.info("================================= [one request comming, baiduMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, vo is {} ] =================================", vo);
BdBackdataDTO bdBackdataDTO = new BdBackdataDTO();
BdBackdataConvert.voCovertToDTO(vo, bdBackdataDTO);
@@ -178,11 +172,11 @@ public class MobileMonitorCallbackAPI {
private boolean preRuleForReq(BaiduMobileMonitorCallbackRequestVO vo) {
String imei = vo.getImeiMd5();
- if (StrUtil.isBlank(imei)){
+ if (StrUtil.isBlank(imei)) {
return Boolean.TRUE;
}
- if (StrUtil.isNotBlank(imei) && StrUtil.equalsIgnoreCase(IMEI_TAG,imei)){
+ if (StrUtil.isNotBlank(imei) && StrUtil.equalsIgnoreCase(IMEI_TAG, imei)) {
return Boolean.TRUE;
}
return Boolean.FALSE;
@@ -191,7 +185,7 @@ public class MobileMonitorCallbackAPI {
/**
* UC 监控链接 - 目前只监测 Android 设备
- *
+ *
* 监控配置
* http://xxx.xxxx.com?imei={IMEI_SUM1}&oaid={OAID}&time={TS}&callback={CALL
* BACK_URL}&androidid={ANDROIDID_SUM1}&mac={MAC_SUM2}&ip={IP}&ua={U
@@ -210,28 +204,26 @@ public class MobileMonitorCallbackAPI {
@RequestParam(value = "acid", defaultValue = "") String acid,
@RequestParam(value = "gid", defaultValue = "") String gid,
@RequestParam(value = "aid", defaultValue = "") String aid,
- @RequestParam(value = "cid", defaultValue = "") String cid
+ @RequestParam(value = "cid", defaultValue = "") String cid,
+ @RequestParam(value = "tag", defaultValue = "") String tag
) {
UcMobileMonitorCallbackRequestVO vo = new UcMobileMonitorCallbackRequestVO(
- imei,oaid,ts,callbackUrl,androidId,mac,ip,ua,acid,gid,gid,aid
+ imei, oaid, ts, callbackUrl, androidId, mac, ip, ua, acid, gid, aid, cid
);
if (ObjectUtil.isNull(vo)) {
return CommonResponse.createByErrorMessage(ResponseCode.EMPTY_ARGUMENT.getDesc());
}
// 请求过滤规则,过滤掉不用的数据
- if (preRuleForReq(vo)){
- log.error("================================= [not right imei data ,{} ] =================================",vo);
+ if (preRuleForReq(vo)) {
+ log.error("================================= [not right imei data ,{} ] =================================", vo);
return CommonResponse.createBySuccess();
}
-
- log.info("================================= [one request comming, BaiduMobileMonitorCallbackAPI|baiduMonitorUrlCallbackReqUrl, vo is {} ] =================================", vo);
-
+ setTag(tag,vo);
+ log.info("================================= [one request comming, ucMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, vo is {} ] =================================", vo);
UcBackdataDTO ucBackdataDTO = new UcBackdataDTO();
UcBackdataConvert.voCovertToDTO(vo, ucBackdataDTO);
-
adOriginalityManageService.handleMonitorUrlCallbackDataThenSave2();
-
return CommonResponse.createBySuccess();
}
@@ -244,11 +236,11 @@ public class MobileMonitorCallbackAPI {
private boolean preRuleForReq(UcMobileMonitorCallbackRequestVO vo) {
String imei = vo.getImei();
- if (StrUtil.isBlank(imei)){
+ if (StrUtil.isBlank(imei)) {
return Boolean.TRUE;
}
- if (StrUtil.isNotBlank(imei) && StrUtil.equalsIgnoreCase(IMEI_TAG,imei)){
+ if (StrUtil.isNotBlank(imei) && StrUtil.equalsIgnoreCase(IMEI_TAG, imei)) {
return Boolean.TRUE;
}
return Boolean.FALSE;
@@ -256,16 +248,79 @@ public class MobileMonitorCallbackAPI {
+
+
/**
- * vivo 互联网检测
+ * 快手点击 监测API
+ * https://docs.qingque.cn/d/home/eZQBTWKAahwgCU4YeU_bRW5B_#
+ */
+ @RequestMapping(value = "/ks/monitor")
+ public CommonResponse kuaishouMonitorUrlCallbackReqUrl(
+ @RequestParam(value = "accountid", defaultValue = "") String accountid,
+ @RequestParam(value = "aid", defaultValue = "") String aid,
+ @RequestParam(value = "cid", defaultValue = "") String cid,
+ @RequestParam(value = "did", defaultValue = "") String did,
+ @RequestParam(value = "dname", defaultValue = "") String dName,
+ @RequestParam(value = "imeiMD5", defaultValue = "") String imei,
+ @RequestParam(value = "oaid", defaultValue = "") String oaid,
+ @RequestParam(value = "mac", defaultValue = "") String mac,
+ @RequestParam(value = "androidid", defaultValue = "") String androidid,
+ @RequestParam(value = "os", defaultValue = "") String os,
+ @RequestParam(value = "ts", defaultValue = "") String ts,
+ @RequestParam(value = "ip", defaultValue = "") String ip,
+ @RequestParam(value = "ua", defaultValue = "") String ua,
+ @RequestParam(value = "csite", defaultValue = "") String cSite,
+ @RequestParam(value = "model", defaultValue = "") String model,
+ @RequestParam(value = "ac_creative", defaultValue = "") String acCreative,
+ @RequestParam(value = "tag", defaultValue = "") String tag
+
+ ) {
+ KuaiShouMobileMonitorCallbackRequestVO vo = new KuaiShouMobileMonitorCallbackRequestVO(
+ accountid,aid,cid,did,dName,imei,oaid,mac,androidid,os,ts,ip,ua,cSite,model,acCreative
+ );
+
+ if (ObjectUtil.isNull(vo)) {
+ return CommonResponse.createByErrorMessage(ResponseCode.EMPTY_ARGUMENT.getDesc());
+ }
+ // 请求过滤规则,过滤掉不用的数据
+ if (preRuleForReq(vo)) {
+ log.error("================================= [not right imei data ,{} ] =================================", vo);
+ return CommonResponse.createBySuccess();
+ }
+ setTag(tag, vo);
+ log.info("================================= [one request comming, vivoMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, vo is {} ] =================================", vo);
+ KuaiShouBackdataDTO kuaiShouBackdataDTO = new KuaiShouBackdataDTO();
+ KuaiShouBackdataConvert.voCovertToDTO(vo, kuaiShouBackdataDTO);
+ adOriginalityManageService.handleMonitorUrlCallbackDataThenSave3();
+ return CommonResponse.createBySuccess();
+ }
+
+ /**
+ * 之前的规则要求
*
+ * @return boolean
+ */
+ private boolean preRuleForReq(KuaiShouMobileMonitorCallbackRequestVO vo) {
+
+ String imei = vo.getImei();
+ if (StrUtil.isBlank(imei)) {
+ return Boolean.TRUE;
+ }
+
+ if (StrUtil.isNotBlank(imei) && StrUtil.equalsIgnoreCase(IMEI_TAG, imei)) {
+ return Boolean.TRUE;
+ }
+ return Boolean.FALSE;
+ }
+
+
+ /**
+ * vivo 互联网检测
+ *
* API文档地址 : https://ad.vivo.com.cn/help?id=353
- *
- *
- *
*/
@RequestMapping(value = "/vivo/monitor")
- public CommonResponse baiduMonitorUrlCallbackReqUrl(
+ public CommonResponse vivoMonitorUrlCallbackReqUrl(
@RequestParam(value = "os", defaultValue = "") String os,
@RequestParam(value = "imei", defaultValue = "") String imei,
@RequestParam(value = "ip", defaultValue = "") String ip,
@@ -284,21 +339,56 @@ public class MobileMonitorCallbackAPI {
@RequestParam(value = "lang", defaultValue = "") String lang,
@RequestParam(value = "resolution", defaultValue = "") String resolution,
@RequestParam(value = "nettype", defaultValue = "") String nettype,
- @RequestParam(value = "ts", defaultValue = "") String ts
+ @RequestParam(value = "ts", defaultValue = "") Long ts,
+ @RequestParam(value = "tag", defaultValue = "") String tag
) {
+ VivoMobileMonitorCallbackRequestVO vo = new VivoMobileMonitorCallbackRequestVO(
+ os,imei,ip,oaid,oaidplain,ua,androidid,location,requestid,requesttime,advertiserId,adName,creativeid,osversion,model,lang,resolution,nettype,ts
+ );
+
+ if (ObjectUtil.isNull(vo)) {
+ return CommonResponse.createByErrorMessage(ResponseCode.EMPTY_ARGUMENT.getDesc());
+ }
+ // 请求过滤规则,过滤掉不用的数据
+ if (preRuleForReq(vo)) {
+ log.error("================================= [not right imei data ,{} ] =================================", vo);
+ return CommonResponse.createBySuccess();
+ }
+ setTag(tag, vo);
+ log.info("================================= [one request comming, vivoMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, vo is {} ] =================================", vo);
+ VivoBackdataDTO vivoBackdataDTO = new VivoBackdataDTO();
+ VivoBackdataConvert.voCovertToDTO(vo, vivoBackdataDTO);
+ adOriginalityManageService.handleMonitorUrlCallbackDataThenSave4();
return CommonResponse.createBySuccess();
}
+ /**
+ * 之前的规则要求
+ *
+ * @return boolean
+ */
+ private boolean preRuleForReq(VivoMobileMonitorCallbackRequestVO vo) {
+
+ String imei = vo.getImei();
+ if (StrUtil.isBlank(imei)) {
+ return Boolean.TRUE;
+ }
+
+ if (StrUtil.isNotBlank(imei) && StrUtil.equalsIgnoreCase(IMEI_TAG, imei)) {
+ return Boolean.TRUE;
+ }
+ return Boolean.FALSE;
+ }
+
/**
* vivo营销链接 点击 监控
*
* API 文档: https://ad.vivo.com.cn/help?id=352
*
- *
+ *
* 配置
* 直接配置链接即可 https://cb.tuoz.net/vivo/monitor
- *
*/
@PostMapping(value = "/vivo/p/monitor")
public CommonResponse vivoMonitorUrlCallbackReqUrl(@RequestBody VivoMobileMonitorPointCallbackRequestVO vo) {
@@ -307,9 +397,20 @@ public class MobileMonitorCallbackAPI {
}
+ /**
+ * 进行特殊标识处理
+ *
+ * @param tag 标识
+ * @param base 基类
+ */
+ private void setTag(String tag ,MobileMonitorCallbackRequestBase base) {
+ if (StrUtil.isNotBlank(tag)) {
+ base.setTag(tag);
+ }else {
+ base.setTag("");
+ }
-
-
+ }
}
diff --git a/src/main/java/com/baiyee/adcallback/api/vo/BaiduMobileMonitorCallbackRequestVO.java b/src/main/java/com/baiyee/adcallback/api/vo/BaiduMobileMonitorCallbackRequestVO.java
index 79a9f2f..315051f 100644
--- a/src/main/java/com/baiyee/adcallback/api/vo/BaiduMobileMonitorCallbackRequestVO.java
+++ b/src/main/java/com/baiyee/adcallback/api/vo/BaiduMobileMonitorCallbackRequestVO.java
@@ -16,7 +16,7 @@ import java.util.Date;
@Data
@AllArgsConstructor
@NoArgsConstructor
-public class BaiduMobileMonitorCallbackRequestVO implements Serializable {
+public class BaiduMobileMonitorCallbackRequestVO extends MobileMonitorCallbackRequestBase implements Serializable {
private String userid;
diff --git a/src/main/java/com/baiyee/adcallback/api/vo/JuliangMobileMonitorCallbackRequestVO.java b/src/main/java/com/baiyee/adcallback/api/vo/JuliangMobileMonitorCallbackRequestVO.java
index 72d0b7b..5591638 100644
--- a/src/main/java/com/baiyee/adcallback/api/vo/JuliangMobileMonitorCallbackRequestVO.java
+++ b/src/main/java/com/baiyee/adcallback/api/vo/JuliangMobileMonitorCallbackRequestVO.java
@@ -3,6 +3,7 @@ package com.baiyee.adcallback.api.vo;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import java.io.Serializable;
@@ -13,10 +14,11 @@ import java.io.Serializable;
* @author q
* @date 2022/01/07
*/
+@EqualsAndHashCode(callSuper = true)
@Data
@AllArgsConstructor
@NoArgsConstructor
-public class JuliangMobileMonitorCallbackRequestVO implements Serializable {
+public class JuliangMobileMonitorCallbackRequestVO extends MobileMonitorCallbackRequestBase implements Serializable {
private String aid;
diff --git a/src/main/java/com/baiyee/adcallback/api/vo/KuaiShouMobileMonitorCallbackRequestVO.java b/src/main/java/com/baiyee/adcallback/api/vo/KuaiShouMobileMonitorCallbackRequestVO.java
index cfd6116..f943a05 100644
--- a/src/main/java/com/baiyee/adcallback/api/vo/KuaiShouMobileMonitorCallbackRequestVO.java
+++ b/src/main/java/com/baiyee/adcallback/api/vo/KuaiShouMobileMonitorCallbackRequestVO.java
@@ -15,40 +15,23 @@ import java.io.Serializable;
@Data
@AllArgsConstructor
@NoArgsConstructor
-public class KuaiShouMobileMonitorCallbackRequestVO implements Serializable {
-
- private String userid;
+public class KuaiShouMobileMonitorCallbackRequestVO extends MobileMonitorCallbackRequestBase implements Serializable {
+ private String accountid;
private String aid;
-
- private String pid;
-
- private String uid;
-
- private String callbackUrl;
-
- private String clickId;
-
- private String idfa;
-
- private String imeiMd5;
-
+ private String cid;
+ private String did;
+ private String dName;
+ private String imei;
private String oaid;
-
private String mac;
-
- private String ip;
-
+ private String androidid;
private String os;
-
- private Long ts;
-
- private String deviceInfo;
-
- private String interactionsType;
-
- private String extInfo;
-
- private String callType;
+ private String ts;
+ private String ip;
+ private String ua;
+ private String cSite;
+ private String model;
+ private String acCreative;
}
diff --git a/src/main/java/com/baiyee/adcallback/api/vo/MobileMonitorCallbackRequestBase.java b/src/main/java/com/baiyee/adcallback/api/vo/MobileMonitorCallbackRequestBase.java
new file mode 100644
index 0000000..80b792a
--- /dev/null
+++ b/src/main/java/com/baiyee/adcallback/api/vo/MobileMonitorCallbackRequestBase.java
@@ -0,0 +1,20 @@
+package com.baiyee.adcallback.api.vo;
+
+
+import lombok.Data;
+
+
+/**
+ * 移动监控调请求基类 VO
+ *
+ * @author q
+ * @date 2022/02/23
+ */
+@Data
+public class MobileMonitorCallbackRequestBase{
+
+ /**
+ * 用于监测链接的自定义带参格式
+ */
+ private String tag;
+}
diff --git a/src/main/java/com/baiyee/adcallback/api/vo/UcMobileMonitorCallbackRequestVO.java b/src/main/java/com/baiyee/adcallback/api/vo/UcMobileMonitorCallbackRequestVO.java
index 7eb9f26..68e66c6 100644
--- a/src/main/java/com/baiyee/adcallback/api/vo/UcMobileMonitorCallbackRequestVO.java
+++ b/src/main/java/com/baiyee/adcallback/api/vo/UcMobileMonitorCallbackRequestVO.java
@@ -9,7 +9,7 @@ import java.io.Serializable;
@Data
@AllArgsConstructor
@NoArgsConstructor
-public class UcMobileMonitorCallbackRequestVO implements Serializable {
+public class UcMobileMonitorCallbackRequestVO extends MobileMonitorCallbackRequestBase implements Serializable {
private String imei;
diff --git a/src/main/java/com/baiyee/adcallback/api/vo/VivoMobileMonitorCallbackRequestVO.java b/src/main/java/com/baiyee/adcallback/api/vo/VivoMobileMonitorCallbackRequestVO.java
index 9a1a907..c24789e 100644
--- a/src/main/java/com/baiyee/adcallback/api/vo/VivoMobileMonitorCallbackRequestVO.java
+++ b/src/main/java/com/baiyee/adcallback/api/vo/VivoMobileMonitorCallbackRequestVO.java
@@ -3,6 +3,7 @@ package com.baiyee.adcallback.api.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.springframework.web.bind.annotation.RequestParam;
import java.io.Serializable;
import java.util.List;
@@ -16,7 +17,7 @@ import java.util.List;
@Data
@AllArgsConstructor
@NoArgsConstructor
-public class VivoMobileMonitorCallbackRequestVO implements Serializable {
+public class VivoMobileMonitorCallbackRequestVO extends MobileMonitorCallbackRequestBase implements Serializable {
private String os;
@@ -29,6 +30,8 @@ public class VivoMobileMonitorCallbackRequestVO implements Serializable {
private String oaidPlain;
+ private String ua;
+
private String androidId;
private String location;
@@ -41,13 +44,17 @@ public class VivoMobileMonitorCallbackRequestVO implements Serializable {
private String adName;
- private String creativeId;
+ private String creativeId;
+
+ private String osVersion;
+
+ private String model;
- private String osVersion;
+ private String lang;
- private String model;
+ private String resolution;
- private String netType;
+ private String netType;
- private Long ts;
+ private Long ts;
}
diff --git a/src/main/java/com/baiyee/adcallback/api/vo/VivoMobileMonitorPointCallbackRequestVO.java b/src/main/java/com/baiyee/adcallback/api/vo/VivoMobileMonitorPointCallbackRequestVO.java
index 60f9411..6a41064 100644
--- a/src/main/java/com/baiyee/adcallback/api/vo/VivoMobileMonitorPointCallbackRequestVO.java
+++ b/src/main/java/com/baiyee/adcallback/api/vo/VivoMobileMonitorPointCallbackRequestVO.java
@@ -16,7 +16,7 @@ import java.util.List;
@Data
@AllArgsConstructor
@NoArgsConstructor
-public class VivoMobileMonitorPointCallbackRequestVO implements Serializable {
+public class VivoMobileMonitorPointCallbackRequestVO extends MobileMonitorCallbackRequestBase implements Serializable {
private List vivoData;
diff --git a/src/main/java/com/baiyee/adcallback/config/pojo/BdBackdataDTO.java b/src/main/java/com/baiyee/adcallback/config/pojo/BdBackdataDTO.java
index 52777e9..fd1229a 100644
--- a/src/main/java/com/baiyee/adcallback/config/pojo/BdBackdataDTO.java
+++ b/src/main/java/com/baiyee/adcallback/config/pojo/BdBackdataDTO.java
@@ -43,4 +43,6 @@ public class BdBackdataDTO implements Serializable {
private String extInfo;
private String callType;
+
+ private String tag;
}
diff --git a/src/main/java/com/baiyee/adcallback/config/pojo/JlBackdataDTO.java b/src/main/java/com/baiyee/adcallback/config/pojo/JlBackdataDTO.java
index 0837754..12c55ff 100644
--- a/src/main/java/com/baiyee/adcallback/config/pojo/JlBackdataDTO.java
+++ b/src/main/java/com/baiyee/adcallback/config/pojo/JlBackdataDTO.java
@@ -29,5 +29,5 @@ public class JlBackdataDTO implements Serializable {
private String callbackUrl;
private String model;
private String caid12;
-
+ private String tag;
}
diff --git a/src/main/java/com/baiyee/adcallback/config/pojo/KuaiShouBackdataDTO.java b/src/main/java/com/baiyee/adcallback/config/pojo/KuaiShouBackdataDTO.java
new file mode 100644
index 0000000..f09536a
--- /dev/null
+++ b/src/main/java/com/baiyee/adcallback/config/pojo/KuaiShouBackdataDTO.java
@@ -0,0 +1,31 @@
+package com.baiyee.adcallback.config.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class KuaiShouBackdataDTO implements Serializable {
+
+ private String accountid;
+ private String aid;
+ private String cid;
+ private String did;
+ private String dName;
+ private String imei;
+ private String oaid;
+ private String mac;
+ private String androidid;
+ private String os;
+ private String ts;
+ private String ip;
+ private String ua;
+ private String cSite;
+ private String model;
+ private String acCreative;
+ private String tag;
+}
diff --git a/src/main/java/com/baiyee/adcallback/config/pojo/UcBackdataDTO.java b/src/main/java/com/baiyee/adcallback/config/pojo/UcBackdataDTO.java
index 5124cb7..4eb3bb3 100644
--- a/src/main/java/com/baiyee/adcallback/config/pojo/UcBackdataDTO.java
+++ b/src/main/java/com/baiyee/adcallback/config/pojo/UcBackdataDTO.java
@@ -24,4 +24,5 @@ public class UcBackdataDTO implements Serializable {
private String gid;
private String aid;
private String cid;
+ private String tag;
}
diff --git a/src/main/java/com/baiyee/adcallback/config/pojo/VivoBackdataDTO.java b/src/main/java/com/baiyee/adcallback/config/pojo/VivoBackdataDTO.java
new file mode 100644
index 0000000..cc9fe3c
--- /dev/null
+++ b/src/main/java/com/baiyee/adcallback/config/pojo/VivoBackdataDTO.java
@@ -0,0 +1,53 @@
+package com.baiyee.adcallback.config.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class VivoBackdataDTO implements Serializable {
+
+ private String os;
+
+ private String imei;
+
+ private String ip;
+
+ private String oaid;
+
+ private String oaidPlain;
+
+ private String ua;
+
+ private String androidId;
+
+ private String location;
+
+ private String requestId;
+
+ private String requestTime;
+
+ private String advertiserId;
+
+ private String adName;
+
+ private String creativeId;
+
+ private String osVersion;
+
+ private String model;
+
+ private String lang;
+
+ private String resolution;
+
+ private String netType;
+
+ private Long ts;
+
+ private String tag;
+}
diff --git a/src/main/java/com/baiyee/adcallback/config/pojo/convert/KuaiShouBackdataConvert.java b/src/main/java/com/baiyee/adcallback/config/pojo/convert/KuaiShouBackdataConvert.java
new file mode 100644
index 0000000..2b63a3a
--- /dev/null
+++ b/src/main/java/com/baiyee/adcallback/config/pojo/convert/KuaiShouBackdataConvert.java
@@ -0,0 +1,44 @@
+package com.baiyee.adcallback.config.pojo.convert;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baiyee.adcallback.api.vo.KuaiShouMobileMonitorCallbackRequestVO;
+import com.baiyee.adcallback.api.vo.VivoMobileMonitorCallbackRequestVO;
+import com.baiyee.adcallback.config.pojo.KuaiShouBackdataDTO;
+import com.baiyee.adcallback.config.pojo.VivoBackdataDTO;
+import com.baiyee.adcallback.repository.entity.TbKsBackdataEntity;
+import com.baiyee.adcallback.repository.entity.TbUcBackdataEntity;
+
+public class KuaiShouBackdataConvert {
+
+ /**
+ * 私有化构造
+ */
+ private KuaiShouBackdataConvert(){}
+
+ private static final ThreadLocal context = new ThreadLocal<>();
+
+ /**
+ * vo 转换为 dto -> 存放在当前线程上下文中
+ *
+ * @param vo 对象
+ */
+ public static void voCovertToDTO(KuaiShouMobileMonitorCallbackRequestVO vo, KuaiShouBackdataDTO dto) {
+ BeanUtil.copyProperties(vo, dto, true);
+ context.set(dto);
+ }
+
+ /**
+ * 转换为实体
+ *
+ * @return {@link TbUcBackdataEntity}
+ */
+ public static TbKsBackdataEntity covertToEntity(TbKsBackdataEntity entity) {
+ KuaiShouBackdataDTO kuaiShouBackdataDTO = context.get();
+ if (ObjectUtil.isNotNull(kuaiShouBackdataDTO)){
+ BeanUtil.copyProperties(kuaiShouBackdataDTO, entity, true);
+ }
+ context.remove();
+ return entity;
+ }
+}
diff --git a/src/main/java/com/baiyee/adcallback/config/pojo/convert/VivoBackdataConvert.java b/src/main/java/com/baiyee/adcallback/config/pojo/convert/VivoBackdataConvert.java
new file mode 100644
index 0000000..98be087
--- /dev/null
+++ b/src/main/java/com/baiyee/adcallback/config/pojo/convert/VivoBackdataConvert.java
@@ -0,0 +1,44 @@
+package com.baiyee.adcallback.config.pojo.convert;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baiyee.adcallback.api.vo.UcMobileMonitorCallbackRequestVO;
+import com.baiyee.adcallback.api.vo.VivoMobileMonitorCallbackRequestVO;
+import com.baiyee.adcallback.config.pojo.UcBackdataDTO;
+import com.baiyee.adcallback.config.pojo.VivoBackdataDTO;
+import com.baiyee.adcallback.repository.entity.TbUcBackdataEntity;
+import com.baiyee.adcallback.repository.entity.TbVivoBackdataEntity;
+
+public class VivoBackdataConvert {
+
+ /**
+ * 私有化构造
+ */
+ private VivoBackdataConvert(){}
+
+ private static final ThreadLocal context = new ThreadLocal<>();
+
+ /**
+ * vo 转换为 dto -> 存放在当前线程上下文中
+ *
+ * @param vo 对象
+ */
+ public static void voCovertToDTO(VivoMobileMonitorCallbackRequestVO vo, VivoBackdataDTO dto) {
+ BeanUtil.copyProperties(vo, dto, true);
+ context.set(dto);
+ }
+
+ /**
+ * 转换为实体
+ *
+ * @return {@link TbUcBackdataEntity}
+ */
+ public static TbVivoBackdataEntity covertToEntity(TbVivoBackdataEntity entity) {
+ VivoBackdataDTO vivoBackdataDTO = context.get();
+ if (ObjectUtil.isNotNull(vivoBackdataDTO)){
+ BeanUtil.copyProperties(vivoBackdataDTO, entity, true);
+ }
+ context.remove();
+ return entity;
+ }
+}
diff --git a/src/main/java/com/baiyee/adcallback/repository/TbKsBackdataEntityRepository.java b/src/main/java/com/baiyee/adcallback/repository/TbKsBackdataEntityRepository.java
new file mode 100644
index 0000000..290f715
--- /dev/null
+++ b/src/main/java/com/baiyee/adcallback/repository/TbKsBackdataEntityRepository.java
@@ -0,0 +1,7 @@
+package com.baiyee.adcallback.repository;
+
+import com.baiyee.adcallback.repository.entity.TbKsBackdataEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface TbKsBackdataEntityRepository extends JpaRepository {
+}
\ No newline at end of file
diff --git a/src/main/java/com/baiyee/adcallback/repository/TbVivoBackdataEntityRepository.java b/src/main/java/com/baiyee/adcallback/repository/TbVivoBackdataEntityRepository.java
new file mode 100644
index 0000000..0fa31b5
--- /dev/null
+++ b/src/main/java/com/baiyee/adcallback/repository/TbVivoBackdataEntityRepository.java
@@ -0,0 +1,7 @@
+package com.baiyee.adcallback.repository;
+
+import com.baiyee.adcallback.repository.entity.TbVivoBackdataEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface TbVivoBackdataEntityRepository extends JpaRepository {
+}
\ No newline at end of file
diff --git a/src/main/java/com/baiyee/adcallback/repository/entity/TbBdBackdataEntity.java b/src/main/java/com/baiyee/adcallback/repository/entity/TbBdBackdataEntity.java
index 44a27e7..514d78d 100644
--- a/src/main/java/com/baiyee/adcallback/repository/entity/TbBdBackdataEntity.java
+++ b/src/main/java/com/baiyee/adcallback/repository/entity/TbBdBackdataEntity.java
@@ -89,17 +89,7 @@ public class TbBdBackdataEntity {
@Column(name = "call_type", nullable = false, length = 255)
private String callType;
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- TbBdBackdataEntity that = (TbBdBackdataEntity) o;
- return id == that.id && ts == that.ts && Objects.equals(gmtCreate, that.gmtCreate) && Objects.equals(gmtModify, that.gmtModify) && Objects.equals(operator, that.operator) && Objects.equals(userid, that.userid) && Objects.equals(aid, that.aid) && Objects.equals(pid, that.pid) && Objects.equals(uid, that.uid) && Objects.equals(callbackUrl, that.callbackUrl) && Objects.equals(clickId, that.clickId) && Objects.equals(idfa, that.idfa) && Objects.equals(imeiMd5, that.imeiMd5) && Objects.equals(oaid, that.oaid) && Objects.equals(mac, that.mac) && Objects.equals(ip, that.ip) && Objects.equals(os, that.os) && Objects.equals(deviceInfo, that.deviceInfo) && Objects.equals(interactionsType, that.interactionsType) && Objects.equals(extInfo, that.extInfo) && Objects.equals(callType, that.callType);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(id, gmtCreate, gmtModify, operator, userid, aid, pid, uid, callbackUrl, clickId, idfa, imeiMd5, oaid, mac, ip, os, ts, deviceInfo, interactionsType, extInfo, callType);
- }
+ @Basic
+ @Column(name = "tag", nullable = false, length = 255)
+ private String tag;
}
diff --git a/src/main/java/com/baiyee/adcallback/repository/entity/TbJlBackdataEntity.java b/src/main/java/com/baiyee/adcallback/repository/entity/TbJlBackdataEntity.java
index 2822128..66ff57e 100644
--- a/src/main/java/com/baiyee/adcallback/repository/entity/TbJlBackdataEntity.java
+++ b/src/main/java/com/baiyee/adcallback/repository/entity/TbJlBackdataEntity.java
@@ -101,4 +101,8 @@ public class TbJlBackdataEntity {
@Column(name = "caid12", nullable = false, length = 255)
private String caid12;
+ @Basic
+ @Column(name = "tag", nullable = false, length = 255)
+ private String tag;
+
}
diff --git a/src/main/java/com/baiyee/adcallback/repository/entity/TbKsBackdataEntity.java b/src/main/java/com/baiyee/adcallback/repository/entity/TbKsBackdataEntity.java
new file mode 100644
index 0000000..c0a9abc
--- /dev/null
+++ b/src/main/java/com/baiyee/adcallback/repository/entity/TbKsBackdataEntity.java
@@ -0,0 +1,95 @@
+package com.baiyee.adcallback.repository.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+import java.util.Objects;
+
+@Entity
+@Table(name = "tb_ks_backdata", schema = "db_ad", catalog = "")
+@EntityListeners(AuditingEntityListener.class)
+@Data
+public class TbKsBackdataEntity {
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Id
+ @Column(name = "id", nullable = false)
+ private long id;
+
+ @CreatedDate
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Basic
+ @Column(name = "gmt_create", nullable = false)
+ private Timestamp gmtCreate;
+
+ @LastModifiedDate
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Basic
+ @Column(name = "gmt_modify", nullable = false)
+ private Timestamp gmtModify;
+
+ @LastModifiedBy
+ @Basic
+ @Column(name = "operation", nullable = false, length = 255)
+ private String operation;
+ @Basic
+ @Column(name = "account_id", nullable = false, length = 255)
+ private String accountId;
+ @Basic
+ @Column(name = "aid", nullable = false, length = 255)
+ private String aid;
+ @Basic
+ @Column(name = "cid", nullable = false, length = 255)
+ private String cid;
+ @Basic
+ @Column(name = "did", nullable = false, length = 255)
+ private String did;
+ @Basic
+ @Column(name = "dname", nullable = false, length = 255)
+ private String dname;
+ @Basic
+ @Column(name = "imei", nullable = false, length = 255)
+ private String imei;
+ @Basic
+ @Column(name = "oaid", nullable = false, length = 255)
+ private String oaid;
+ @Basic
+ @Column(name = "mac", nullable = false, length = 255)
+ private String mac;
+ @Basic
+ @Column(name = "androidid", nullable = false, length = 255)
+ private String androidid;
+ @Basic
+ @Column(name = "os", nullable = false, length = 255)
+ private String os;
+ @Basic
+ @Column(name = "ts", nullable = false, length = 255)
+ private String ts;
+ @Basic
+ @Column(name = "ip", nullable = false, length = 255)
+ private String ip;
+ @Basic
+ @Column(name = "ua", nullable = false, length = 255)
+ private String ua;
+ @Basic
+ @Column(name = "c_site", nullable = false, length = 255)
+ private String cSite;
+ @Basic
+ @Column(name = "model", nullable = false, length = 255)
+ private String model;
+ @Basic
+ @Column(name = "ac_creative", nullable = false, length = 255)
+ private String acCreative;
+ @Basic
+ @Column(name = "tag", nullable = false, length = 255)
+ private String tag;
+
+}
diff --git a/src/main/java/com/baiyee/adcallback/repository/entity/TbUcBackdataEntity.java b/src/main/java/com/baiyee/adcallback/repository/entity/TbUcBackdataEntity.java
index 695e6e8..ad6055e 100644
--- a/src/main/java/com/baiyee/adcallback/repository/entity/TbUcBackdataEntity.java
+++ b/src/main/java/com/baiyee/adcallback/repository/entity/TbUcBackdataEntity.java
@@ -1,6 +1,7 @@
package com.baiyee.adcallback.repository.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
import org.springframework.data.annotation.LastModifiedDate;
@@ -9,8 +10,8 @@ import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.*;
import java.sql.Timestamp;
-import java.util.Objects;
+@Data
@Entity
@Table(name = "tb_uc_backdata", schema = "db_ad", catalog = "")
@EntityListeners(AuditingEntityListener.class)
@@ -75,144 +76,8 @@ public class TbUcBackdataEntity {
@Column(name = "cid", nullable = false, length = 255)
private String cid;
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public Timestamp getGmtCreate() {
- return gmtCreate;
- }
-
- public void setGmtCreate(Timestamp gmtCreate) {
- this.gmtCreate = gmtCreate;
- }
-
- public Timestamp getGmtModify() {
- return gmtModify;
- }
-
- public void setGmtModify(Timestamp gmtModify) {
- this.gmtModify = gmtModify;
- }
-
- public String getOperator() {
- return operator;
- }
-
- public void setOperator(String operator) {
- this.operator = operator;
- }
-
- public String getImei() {
- return imei;
- }
-
- public void setImei(String imei) {
- this.imei = imei;
- }
-
- public String getOaid() {
- return oaid;
- }
-
- public void setOaid(String oaid) {
- this.oaid = oaid;
- }
-
- public long getTs() {
- return ts;
- }
-
- public void setTs(long ts) {
- this.ts = ts;
- }
-
- public String getCallbackUrl() {
- return callbackUrl;
- }
-
- public void setCallbackUrl(String callbackUrl) {
- this.callbackUrl = callbackUrl;
- }
-
- public String getAndroidId() {
- return androidId;
- }
-
- public void setAndroidId(String androidId) {
- this.androidId = androidId;
- }
-
- public String getMac() {
- return mac;
- }
-
- public void setMac(String mac) {
- this.mac = mac;
- }
-
- public String getIp() {
- return ip;
- }
-
- public void setIp(String ip) {
- this.ip = ip;
- }
-
- public String getUa() {
- return ua;
- }
-
- public void setUa(String ua) {
- this.ua = ua;
- }
-
- public String getAcid() {
- return acid;
- }
-
- public void setAcid(String acid) {
- this.acid = acid;
- }
-
- public String getGid() {
- return gid;
- }
-
- public void setGid(String gid) {
- this.gid = gid;
- }
-
- public String getAid() {
- return aid;
- }
-
- public void setAid(String aid) {
- this.aid = aid;
- }
-
- public String getCid() {
- return cid;
- }
-
- public void setCid(String cid) {
- this.cid = cid;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- TbUcBackdataEntity that = (TbUcBackdataEntity) o;
- return id == that.id && ts == that.ts && Objects.equals(gmtCreate, that.gmtCreate) && Objects.equals(gmtModify, that.gmtModify) && Objects.equals(operator, that.operator) && Objects.equals(imei, that.imei) && Objects.equals(oaid, that.oaid) && Objects.equals(callbackUrl, that.callbackUrl) && Objects.equals(androidId, that.androidId) && Objects.equals(mac, that.mac) && Objects.equals(ip, that.ip) && Objects.equals(ua, that.ua) && Objects.equals(acid, that.acid) && Objects.equals(gid, that.gid) && Objects.equals(aid, that.aid) && Objects.equals(cid, that.cid);
- }
+ @Basic
+ @Column(name = "tag", nullable = false, length = 255)
+ private String tag;
- @Override
- public int hashCode() {
- return Objects.hash(id, gmtCreate, gmtModify, operator, imei, oaid, ts, callbackUrl, androidId, mac, ip, ua, acid, gid, aid, cid);
- }
}
diff --git a/src/main/java/com/baiyee/adcallback/repository/entity/TbVivoBackdataEntity.java b/src/main/java/com/baiyee/adcallback/repository/entity/TbVivoBackdataEntity.java
new file mode 100644
index 0000000..99a82da
--- /dev/null
+++ b/src/main/java/com/baiyee/adcallback/repository/entity/TbVivoBackdataEntity.java
@@ -0,0 +1,105 @@
+package com.baiyee.adcallback.repository.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+import java.util.Objects;
+
+@Data
+@Entity
+@Table(name = "tb_vivo_backdata", schema = "db_ad", catalog = "")
+@EntityListeners(AuditingEntityListener.class)
+public class TbVivoBackdataEntity {
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Id
+ @Column(name = "id", nullable = false)
+ private long id;
+
+ @CreatedDate
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Basic
+ @Column(name = "gmt_create", nullable = false)
+ private Timestamp gmtCreate;
+
+ @LastModifiedDate
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Basic
+ @Column(name = "gmt_modify", nullable = false)
+ private Timestamp gmtModify;
+
+ @LastModifiedBy
+ @Basic
+ @Column(name = "operation", nullable = false, length = 255)
+ private String operation;
+ @Basic
+ @Column(name = "os", nullable = false, length = 255)
+ private String os;
+ @Basic
+ @Column(name = "imei", nullable = false, length = 255)
+ private String imei;
+ @Basic
+ @Column(name = "ip", nullable = false, length = 255)
+ private String ip;
+ @Basic
+ @Column(name = "oaid", nullable = false, length = 255)
+ private String oaid;
+ @Basic
+ @Column(name = "oaid_plain", nullable = false, length = 255)
+ private String oaidPlain;
+ @Basic
+ @Column(name = "ua", nullable = false, length = 255)
+ private String ua;
+ @Basic
+ @Column(name = "android_id", nullable = false, length = 255)
+ private String androidId;
+ @Basic
+ @Column(name = "location", nullable = false, length = 255)
+ private String location;
+ @Basic
+ @Column(name = "request_id", nullable = false, length = 255)
+ private String requestId;
+ @Basic
+ @Column(name = "request_time", nullable = false, length = 255)
+ private String requestTime;
+ @Basic
+ @Column(name = "advertiser_id", nullable = false, length = 255)
+ private String advertiserId;
+ @Basic
+ @Column(name = "ad_name", nullable = false, length = 255)
+ private String adName;
+ @Basic
+ @Column(name = "creative_id", nullable = false, length = 255)
+ private String creativeId;
+ @Basic
+ @Column(name = "os_version", nullable = false, length = 255)
+ private String osVersion;
+ @Basic
+ @Column(name = "model", nullable = false, length = 255)
+ private String model;
+ @Basic
+ @Column(name = "lang", nullable = false, length = 255)
+ private String lang;
+ @Basic
+ @Column(name = "resolution", nullable = false, length = 255)
+ private String resolution;
+ @Basic
+ @Column(name = "net_type", nullable = false, length = 255)
+ private String netType;
+ @Basic
+ @Column(name = "ts", nullable = false)
+ private long ts;
+ @Basic
+ @Column(name = "tag", nullable = false, length = 255)
+ private String tag;
+
+
+}
diff --git a/src/main/java/com/baiyee/adcallback/service/AdOriginalityManageService.java b/src/main/java/com/baiyee/adcallback/service/AdOriginalityManageService.java
index 5c4e67e..90611a0 100644
--- a/src/main/java/com/baiyee/adcallback/service/AdOriginalityManageService.java
+++ b/src/main/java/com/baiyee/adcallback/service/AdOriginalityManageService.java
@@ -24,4 +24,16 @@ public interface AdOriginalityManageService {
* 处理监测数据然后保存回调
*/
void handleMonitorUrlCallbackDataThenSave2();
+
+
+ /**
+ * 处理监测数据然后保存回调 - ks
+ */
+ void handleMonitorUrlCallbackDataThenSave3();
+
+ /**
+ * 处理监测数据然后保存回调 - vivo
+ */
+ void handleMonitorUrlCallbackDataThenSave4();
+
}
diff --git a/src/main/java/com/baiyee/adcallback/service/impl/AdOriginalityManageServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/AdOriginalityManageServiceImpl.java
index 042c9dc..a166521 100644
--- a/src/main/java/com/baiyee/adcallback/service/impl/AdOriginalityManageServiceImpl.java
+++ b/src/main/java/com/baiyee/adcallback/service/impl/AdOriginalityManageServiceImpl.java
@@ -1,17 +1,12 @@
package com.baiyee.adcallback.service.impl;
import cn.hutool.core.util.ObjectUtil;
-import com.baiyee.adcallback.config.pojo.convert.BdBackdataConvert;
-import com.baiyee.adcallback.config.pojo.convert.JlBackdataConvert;
-import com.baiyee.adcallback.config.pojo.convert.UcBackdataConvert;
-import com.baiyee.adcallback.repository.TbBdBackdataEntityRepository;
-import com.baiyee.adcallback.repository.TbJlBackdataEntityRepository;
-import com.baiyee.adcallback.repository.TbUcBackdataEntityRepository;
-import com.baiyee.adcallback.repository.entity.TbBdBackdataEntity;
-import com.baiyee.adcallback.repository.entity.TbJlBackdataEntity;
-import com.baiyee.adcallback.repository.entity.TbUcBackdataEntity;
+import com.baiyee.adcallback.config.pojo.convert.*;
+import com.baiyee.adcallback.repository.*;
+import com.baiyee.adcallback.repository.entity.*;
import com.baiyee.adcallback.service.AdOriginalityManageService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -30,10 +25,16 @@ public class AdOriginalityManageServiceImpl implements AdOriginalityManageServic
private final TbUcBackdataEntityRepository tbUcBackdataEntityRepository;
- public AdOriginalityManageServiceImpl(TbJlBackdataEntityRepository repository, TbBdBackdataEntityRepository bdBackdataEntityRepository, TbUcBackdataEntityRepository tbUcBackdataEntityRepository) {
+ private final TbKsBackdataEntityRepository ksBackdataEntityRepository;
+
+ private final TbVivoBackdataEntityRepository vivoBackdataEntityRepository;
+
+ public AdOriginalityManageServiceImpl(TbJlBackdataEntityRepository repository, TbBdBackdataEntityRepository bdBackdataEntityRepository, TbUcBackdataEntityRepository tbUcBackdataEntityRepository, TbKsBackdataEntityRepository ksBackdataEntityRepository, TbVivoBackdataEntityRepository vivoBackdataEntityRepository) {
this.repository = repository;
this.bdBackdataEntityRepository = bdBackdataEntityRepository;
this.tbUcBackdataEntityRepository = tbUcBackdataEntityRepository;
+ this.ksBackdataEntityRepository = ksBackdataEntityRepository;
+ this.vivoBackdataEntityRepository = vivoBackdataEntityRepository;
}
@Override
@@ -70,4 +71,26 @@ public class AdOriginalityManageServiceImpl implements AdOriginalityManageServic
log.error("============================= [save a data fail save is {} ] =============================", save);
}
}
+
+ @Override
+ public void handleMonitorUrlCallbackDataThenSave3() {
+ TbKsBackdataEntity entity = new TbKsBackdataEntity();
+ TbKsBackdataEntity backEntity = KuaiShouBackdataConvert.covertToEntity(entity);
+
+ TbKsBackdataEntity save = ksBackdataEntityRepository.save(backEntity);
+ if (ObjectUtil.isNull(save)){
+ log.error("============================= [save a data fail save is {} ] =============================", save);
+ }
+ }
+
+ @Override
+ public void handleMonitorUrlCallbackDataThenSave4() {
+ TbVivoBackdataEntity entity = new TbVivoBackdataEntity();
+ TbVivoBackdataEntity backEntity = VivoBackdataConvert.covertToEntity(entity);
+
+ TbVivoBackdataEntity save = vivoBackdataEntityRepository.save(backEntity);
+ if (ObjectUtil.isNull(save)){
+ log.error("============================= [save a data fail save is {} ] =============================", save);
+ }
+ }
}