|
@@ -9,7 +9,12 @@ import cn.com.ctop.common.module.service.IBindAccountAuthService;
|
|
import cn.com.ctop.common.module.service.ICtopOauthTokenService;
|
|
import cn.com.ctop.common.module.service.ICtopOauthTokenService;
|
|
import cn.com.ctop.common.module.service.ISysDepartService;
|
|
import cn.com.ctop.common.module.service.ISysDepartService;
|
|
import cn.com.ctop.common.module.service.ISysUserService;
|
|
import cn.com.ctop.common.module.service.ISysUserService;
|
|
-import cn.com.ctop.common.module.utils.*;
|
|
|
|
|
|
+import cn.com.ctop.common.module.utils.BytedanceInterfaceConstant;
|
|
|
|
+import cn.com.ctop.common.module.utils.Check;
|
|
|
|
+import cn.com.ctop.common.module.utils.HttpUtils;
|
|
|
|
+import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
|
|
|
|
+import cn.com.ctop.common.module.utils.PropertiesUtils;
|
|
|
|
+import cn.com.ctop.kuaishou.modules.ai.service.IKuaishouAppPackageService;
|
|
import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
|
|
import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
|
|
import cn.com.ctop.kuaishou.modules.material.entity.KuaishouAccessToken;
|
|
import cn.com.ctop.kuaishou.modules.material.entity.KuaishouAccessToken;
|
|
import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResultToken;
|
|
import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResultToken;
|
|
@@ -35,7 +40,10 @@ import javax.servlet.http.HttpServletResponse;
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.text.ParseException;
|
|
import java.text.ParseException;
|
|
-import java.util.*;
|
|
|
|
|
|
+import java.util.Date;
|
|
|
|
+import java.util.HashMap;
|
|
|
|
+import java.util.List;
|
|
|
|
+import java.util.Map;
|
|
|
|
|
|
@Slf4j
|
|
@Slf4j
|
|
@RestController
|
|
@RestController
|
|
@@ -58,6 +66,8 @@ public class CallbackController {
|
|
private IByteDanceAdvertiserDataService advertiserDataService;
|
|
private IByteDanceAdvertiserDataService advertiserDataService;
|
|
@Autowired
|
|
@Autowired
|
|
private IReportService reportService;
|
|
private IReportService reportService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private IKuaishouAppPackageService kuaishouAppPackageService;
|
|
|
|
|
|
@GetMapping("/qywexin")
|
|
@GetMapping("/qywexin")
|
|
public void qywexin(HttpServletRequest request,
|
|
public void qywexin(HttpServletRequest request,
|
|
@@ -192,6 +202,8 @@ public class CallbackController {
|
|
userAllocation.setWarningAmount(warningAmount);
|
|
userAllocation.setWarningAmount(warningAmount);
|
|
userAllocation.setCreateTime(new Date());
|
|
userAllocation.setCreateTime(new Date());
|
|
userAllocation.setUpdateTime(new Date());
|
|
userAllocation.setUpdateTime(new Date());
|
|
|
|
+ //同步物料,0关闭,1开启
|
|
|
|
+ userAllocation.setAutoDelivery(json.getInteger("autoDelivery"));
|
|
allocationMapper.deleteById(userAllocation.getId());
|
|
allocationMapper.deleteById(userAllocation.getId());
|
|
Map<String, Object> deleteUserMap = new HashMap<>();
|
|
Map<String, Object> deleteUserMap = new HashMap<>();
|
|
deleteUserMap.put("advertiser_id", advertiserId);
|
|
deleteUserMap.put("advertiser_id", advertiserId);
|
|
@@ -201,6 +213,8 @@ public class CallbackController {
|
|
if (i > 0) {
|
|
if (i > 0) {
|
|
log.info("同步分配用户表完成,task_id:{},accountId:{}", state, accountId);
|
|
log.info("同步分配用户表完成,task_id:{},accountId:{}", state, accountId);
|
|
}
|
|
}
|
|
|
|
+ //物料类型,0-不同步,1应用包,(2人群包,3定向包)
|
|
|
|
+ Integer materialType = json.getInteger("materialType");
|
|
//账号绑定
|
|
//账号绑定
|
|
bindAccountAuthService.addBindAccount(accountId, KuaishouInterfaceConstant.LOGIN_TYPE_KUAISHOU, advertiserId);
|
|
bindAccountAuthService.addBindAccount(accountId, KuaishouInterfaceConstant.LOGIN_TYPE_KUAISHOU, advertiserId);
|
|
Thread t = new Thread() {
|
|
Thread t = new Thread() {
|
|
@@ -208,6 +222,9 @@ public class CallbackController {
|
|
public void run() {
|
|
public void run() {
|
|
try {
|
|
try {
|
|
kuaishouInterfaceService.loadKuaishouDataSingle(topOauthToken);
|
|
kuaishouInterfaceService.loadKuaishouDataSingle(topOauthToken);
|
|
|
|
+ if (!Check.isNull(materialType) && materialType != 0) {
|
|
|
|
+ synchronMaterials(materialType, accountId, projectId);
|
|
|
|
+ }
|
|
} catch (ParseException e) {
|
|
} catch (ParseException e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
}
|
|
}
|
|
@@ -223,9 +240,19 @@ public class CallbackController {
|
|
return "授权绑定失败!";
|
|
return "授权绑定失败!";
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
- public static void main(String[] args) {
|
|
|
|
- System.err.println(UUID.randomUUID().toString().replace("-", ""));
|
|
|
|
|
|
+ private void synchronMaterials(Integer materialType, Long accountId, Long projectId) {
|
|
|
|
+ if (materialType == 1) {
|
|
|
|
+ JSONArray accountIds = new JSONArray();
|
|
|
|
+ accountIds.add(accountId);
|
|
|
|
+ //1 有效项目模板
|
|
|
|
+ List<Long> ids = kuaishouAppPackageService.queryByAppVersion(projectId, null, 1);
|
|
|
|
+ log.info("同步账户应用,应用模板={}", ids);
|
|
|
|
+ if (!Check.isNull(ids)) {
|
|
|
|
+ for (Long id : ids) {
|
|
|
|
+ kuaishouAppPackageService.pushAppPackage(id, accountIds);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
@RequestMapping("/bytedance")
|
|
@RequestMapping("/bytedance")
|