|
@@ -1,14 +1,12 @@
|
|
package org.jeecg.modules.ctop.controller;
|
|
package org.jeecg.modules.ctop.controller;
|
|
|
|
|
|
-import cn.com.ctop.common.module.utils.CtopAdConstant;
|
|
|
|
-import cn.com.ctop.common.module.entity.BindAccountLogin;
|
|
|
|
import cn.com.ctop.common.module.entity.UserAllocation;
|
|
import cn.com.ctop.common.module.entity.UserAllocation;
|
|
-import cn.com.ctop.common.module.service.IBindAccountLoginService;
|
|
|
|
import cn.com.ctop.common.module.service.IFileInfoService;
|
|
import cn.com.ctop.common.module.service.IFileInfoService;
|
|
import cn.com.ctop.common.module.service.IUserAllocationService;
|
|
import cn.com.ctop.common.module.service.IUserAllocationService;
|
|
import cn.com.ctop.toutiao.modules.material.entity.ByteDanceAdvertisePlan;
|
|
import cn.com.ctop.toutiao.modules.material.entity.ByteDanceAdvertisePlan;
|
|
import cn.com.ctop.toutiao.modules.material.entity.ByteDanceCampaign;
|
|
import cn.com.ctop.toutiao.modules.material.entity.ByteDanceCampaign;
|
|
-import cn.com.ctop.toutiao.modules.material.service.*;
|
|
|
|
|
|
+import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertisePlanService;
|
|
|
|
+import cn.com.ctop.toutiao.modules.material.service.IByteDanceCampaignService;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
@@ -33,8 +31,6 @@ import java.util.Map;
|
|
@RequestMapping("template")
|
|
@RequestMapping("template")
|
|
public class ByteDanceTemplateController {
|
|
public class ByteDanceTemplateController {
|
|
@Autowired
|
|
@Autowired
|
|
- private IByteDanceCreativeService creativeService;
|
|
|
|
- @Autowired
|
|
|
|
private IUserAllocationService userAllocationService;
|
|
private IUserAllocationService userAllocationService;
|
|
@Autowired
|
|
@Autowired
|
|
private IFileInfoService fileInfoService;
|
|
private IFileInfoService fileInfoService;
|
|
@@ -67,35 +63,6 @@ public class ByteDanceTemplateController {
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
- @Autowired
|
|
|
|
- private IBindAccountLoginService bindAccountLoginService;
|
|
|
|
-
|
|
|
|
- /**
|
|
|
|
- * 获取头条授权用户信息列表
|
|
|
|
- *
|
|
|
|
- * @param accountLogin
|
|
|
|
- * @param pageNo
|
|
|
|
- * @param pageSize
|
|
|
|
- * @param req
|
|
|
|
- * @return
|
|
|
|
- */
|
|
|
|
- @PostMapping(value = "bind/login/list")
|
|
|
|
- public Result<IPage<BindAccountLogin>> queryBindLoginList(@RequestBody BindAccountLogin accountLogin,
|
|
|
|
- @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
|
- @RequestParam(name = "pageSize", defaultValue = "100") Integer pageSize,
|
|
|
|
- HttpServletRequest req) {
|
|
|
|
- Result<IPage<BindAccountLogin>> result = new Result<>();
|
|
|
|
- QueryWrapper<BindAccountLogin> queryWrapper = QueryGenerator.initQueryWrapper(accountLogin, req.getParameterMap());
|
|
|
|
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
- queryWrapper.eq("user_id", user.getId()).eq("login_type", CtopAdConstant.PLATFORM_TYPE_BYTEDANCE_PY);
|
|
|
|
- Page<BindAccountLogin> page = new Page<>(pageNo, pageSize);
|
|
|
|
- IPage<BindAccountLogin> pageList = bindAccountLoginService.page(page, queryWrapper);
|
|
|
|
- result.setSuccess(true);
|
|
|
|
- result.setResult(pageList);
|
|
|
|
- return result;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* @param pageNo
|
|
* @param pageNo
|
|
* @param pageSize
|
|
* @param pageSize
|
|
@@ -108,7 +75,7 @@ public class ByteDanceTemplateController {
|
|
@RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize, HttpServletRequest req) {
|
|
@RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize, HttpServletRequest req) {
|
|
Result<IPage<ByteDanceCampaign>> result = new Result<>();
|
|
Result<IPage<ByteDanceCampaign>> result = new Result<>();
|
|
QueryWrapper<ByteDanceCampaign> queryWrapper = QueryGenerator.initQueryWrapper(campaign, req.getParameterMap());
|
|
QueryWrapper<ByteDanceCampaign> queryWrapper = QueryGenerator.initQueryWrapper(campaign, req.getParameterMap());
|
|
- queryWrapper.eq("toutiao_id", campaign.getToutiaoId()).orderByAsc("id");
|
|
|
|
|
|
+ queryWrapper.eq("account_id", campaign.getId()).orderByAsc("id");
|
|
Page<ByteDanceCampaign> page = new Page<>(pageNo, pageSize);
|
|
Page<ByteDanceCampaign> page = new Page<>(pageNo, pageSize);
|
|
IPage<ByteDanceCampaign> pageList = campaignService.page(page, queryWrapper);
|
|
IPage<ByteDanceCampaign> pageList = campaignService.page(page, queryWrapper);
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|