Bladeren bron

添加代码逻辑

syh 5 jaren geleden
bovenliggende
commit
c690cb27ba
22 gewijzigde bestanden met toevoegingen van 277 en 273 verwijderingen
  1. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java
  2. 4 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AuthController.java
  3. 31 47
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertiserPostController.java
  4. 107 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceTemplateController.java
  5. 0 206
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TouTiaoAdvertiserController.java
  6. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertisePlan.java
  7. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertiser.java
  8. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertiserBudget.java
  9. 6 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceBudgetTemplate.java
  10. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCampaign.java
  11. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCreative.java
  12. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCreativeMaterial.java
  13. 23 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCustomAudience.java
  14. 9 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceUserOrientationTemplate.java
  15. 6 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceDeliveryTargetTemplate.java
  16. 6 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IByteDanceBudgetTemplateService.java
  17. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IByteDanceCampaignTemplateService.java
  18. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IBytedanceDeliveryTargetTemplateService.java
  19. 6 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceAdvertiserDataServiceImpl.java
  20. 21 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceBudgetTemplateServiceImpl.java
  21. 20 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceCampaignTemplateServiceImpl.java
  22. 21 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/BytedanceDeliveryTargetTemplateServiceImpl.java

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -89,7 +89,7 @@ public class ShiroConfig {
 		//头条接口
 		filterChainDefinitionMap.put("/toutiao/dictitem/list", "anon");
 		filterChainDefinitionMap.put("/toutiao/advertiser/**", "anon");
-		filterChainDefinitionMap.put("/toutiao/**/insert", "user");
+        filterChainDefinitionMap.put("/template/**", "user");
 
 		//爬虫接口
 		filterChainDefinitionMap.put("/graphql/video", "anon");

+ 4 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AuthController.java

@@ -14,6 +14,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -72,8 +73,10 @@ public class AuthController {
         return "auth_fail";
     }
 
+    @GetMapping("bytedance/refreshtoken")
 
-    public String getByteDanceAccessToken(String authCode,String accountId){
+
+    public String getByteDanceAccessToken(String authCode, String accountId){
         Map<String, Object> param = new HashMap<String, Object>();
         param.put("app_id",PropertiesUtils.getValue("bytedance_config","bytedance_appid"));
         param.put("secret",PropertiesUtils.getValue("bytedance_config","bytedance_secret"));

+ 31 - 47
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertiserPostController.java

@@ -3,11 +3,11 @@ package org.jeecg.modules.ctop.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.ctop.entity.ByteDanceBudgetTemplate;
-import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
-import org.jeecg.modules.ctop.entity.BytedanceDeliveryTargetTemplate;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.ctop.entity.*;
 import org.jeecg.modules.ctop.service.*;
 import org.jeecg.modules.system.entity.SysDictItem;
 import org.jeecg.modules.system.service.ISysDictItemService;
@@ -140,68 +140,52 @@ public class ByteDanceAdvertiserPostController {
     }
 
     /**
-     * @功能:查询字典数据
-     * @param sysDictItem
+     * @param audience
      * @param pageNo
      * @param pageSize
      * @param req
      * @return
+     * @功能:查询字典数据
      */
-    @RequestMapping(value = "dictitem/list", method = RequestMethod.GET)
-    public Result<IPage<SysDictItem>> queryPageList(SysDictItem sysDictItem, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                                    @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
-        Result<IPage<SysDictItem>> result = new Result<IPage<SysDictItem>>();
-        QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
+    @RequestMapping(value = "audience/list", method = RequestMethod.GET)
+    public Result<IPage<ByteDanceCustomAudience>> audiencePageList(ByteDanceCustomAudience audience, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                   @RequestParam(name = "pageSize", defaultValue = "100") Integer pageSize, HttpServletRequest req) {
+        Result<IPage<ByteDanceCustomAudience>> result = new Result<>();
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        audience.setAdvertiserId(user.getId());
+        QueryWrapper<ByteDanceCustomAudience> queryWrapper = QueryGenerator.initQueryWrapper(audience, req.getParameterMap());
         queryWrapper.orderByAsc("sort_order");
-        Page<SysDictItem> page = new Page<SysDictItem>(pageNo, pageSize);
-        IPage<SysDictItem> pageList = sysDictItemService.page(page, queryWrapper);
+        Page<ByteDanceCustomAudience> page = new Page<>(pageNo, pageSize);
+        IPage<ByteDanceCustomAudience> pageList = audienceService.page(page, queryWrapper);
         result.setSuccess(true);
         result.setResult(pageList);
         return result;
     }
 
-    /**
-     * 预算与出价模板
-     * @param template
-     * @param req
-     * @return
-     */
-    @PostMapping("budget/template/insert")
-    public Map<String, Object> budgetTemplateInsert(@RequestBody ByteDanceBudgetTemplate template, HttpServletRequest req) {
-        return budgetTemplateService.insertTemplate(template);
-    }
+    @Autowired
+    private IByteDanceCustomAudienceService audienceService;
 
-    /**
-     * 广告组模板
-     *
-     * @param template
-     * @param req
-     * @return
-     */
-    @PostMapping("campaign/template/insert")
-    public Map<String, Object> campaignTemplateInsert(@RequestBody ByteDanceCampaignTemplate template, HttpServletRequest req) {
-        return campaignTemplateService.insertTemplate(template);
-    }
 
     /**
-     * 投放目标
-     *
-     * @param template
+     * @功能:查询字典数据
+     * @param sysDictItem
+     * @param pageNo
+     * @param pageSize
      * @param req
      * @return
      */
-    @PostMapping("deliverytarget/template/insert")
-    public Map<String, Object> diliverytargetTemplateInsert(@RequestBody BytedanceDeliveryTargetTemplate template, HttpServletRequest req) {
-        return deliveryTargetTemplateService.insertTemplate(template);
+    @RequestMapping(value = "dictitem/list", method = RequestMethod.GET)
+    public Result<IPage<SysDictItem>> dictitemPageList(SysDictItem sysDictItem, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                       @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
+        Result<IPage<SysDictItem>> result = new Result<IPage<SysDictItem>>();
+        QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
+        queryWrapper.orderByAsc("sort_order");
+        Page<SysDictItem> page = new Page<SysDictItem>(pageNo, pageSize);
+        IPage<SysDictItem> pageList = sysDictItemService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
     }
-
-
-    @Autowired
-    private IByteDanceCampaignTemplateService campaignTemplateService;
-    @Autowired
-    private IByteDanceBudgetTemplateService budgetTemplateService;
-    @Autowired
-    private IBytedanceDeliveryTargetTemplateService deliveryTargetTemplateService;
     @Autowired
     private ISysDictItemService sysDictItemService;
 }

+ 107 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceTemplateController.java

@@ -0,0 +1,107 @@
+package org.jeecg.modules.ctop.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.ctop.entity.ByteDanceBudgetTemplate;
+import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
+import org.jeecg.modules.ctop.entity.BytedanceDeliveryTargetTemplate;
+import org.jeecg.modules.ctop.entity.CTopOauthToken;
+import org.jeecg.modules.ctop.service.IByteDanceBudgetTemplateService;
+import org.jeecg.modules.ctop.service.IByteDanceCampaignTemplateService;
+import org.jeecg.modules.ctop.service.IBytedanceDeliveryTargetTemplateService;
+import org.jeecg.modules.ctop.service.ICTopOauthTokenService;
+import org.jeecg.modules.system.entity.SysDictItem;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+@RestController
+@RequestMapping("template")
+public class ByteDanceTemplateController {
+    /**
+     * 预算与出价模板
+     *
+     * @param template
+     * @param req
+     * @return
+     */
+    @PostMapping("budget/insert")
+    public Map<String, Object> budgetTemplateInsert(@RequestBody ByteDanceBudgetTemplate template, HttpServletRequest req) {
+        return budgetTemplateService.insertTemplate(template);
+    }
+
+    /**
+     * 广告组模板
+     *
+     * @param template
+     * @param req
+     * @return
+     */
+    @PostMapping("campaign/insert")
+    public Map<String, Object> campaignTemplateInsert(@RequestBody ByteDanceCampaignTemplate template, HttpServletRequest req) {
+        return campaignTemplateService.insertTemplate(template);
+    }
+
+    /**
+     * 投放目标
+     *
+     * @param template
+     * @param req
+     * @return
+     */
+    @PostMapping("deliverytarget/insert")
+    public Map<String, Object> diliverytargetTemplateInsert(@RequestBody BytedanceDeliveryTargetTemplate template, HttpServletRequest req) {
+        return deliveryTargetTemplateService.insertTemplate(template);
+    }
+
+    /**
+     * 预算与出价模板
+     *
+     * @param template
+     * @param req
+     * @return
+     */
+    @PostMapping("budget/list")
+    public Result<IPage<ByteDanceBudgetTemplate>> budgetTemplateList(ByteDanceBudgetTemplate template, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+        return budgetTemplateService.getList(template, pageNo, pageSize, req);
+    }
+
+    /**
+     * 广告组模板
+     *
+     * @return
+     */
+    @PostMapping("campaign/list")
+    public Result<IPage<ByteDanceCampaignTemplate>> campaignTemplateList(ByteDanceCampaignTemplate template, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+        return campaignTemplateService.getList(template, pageNo, pageSize, req);
+    }
+
+    /**
+     * 投放目标
+     *
+     * @param template
+     * @param req
+     * @return
+     */
+    @PostMapping("deliverytarget/list")
+    public Result<IPage<BytedanceDeliveryTargetTemplate>> diliverytargetTemplateList(BytedanceDeliveryTargetTemplate template, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+        return deliveryTargetTemplateService.getList(template, pageNo, pageSize, req);
+    }
+
+    @Autowired
+    private IByteDanceCampaignTemplateService campaignTemplateService;
+    @Autowired
+    private IByteDanceBudgetTemplateService budgetTemplateService;
+    @Autowired
+    private IBytedanceDeliveryTargetTemplateService deliveryTargetTemplateService;
+    @Autowired
+    private ICTopOauthTokenService tokenService;
+
+}

+ 0 - 206
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TouTiaoAdvertiserController.java

@@ -1,206 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.ctop.service.ITouTiaoAdvertiserService;
-import org.jeecg.modules.system.entity.SysDictItem;
-import org.jeecg.modules.system.service.ISysDictItemService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 头条广告主相关 2019年7月10日14:13:04 @author 宋英豪
- */
-@Controller
-@RequestMapping("toutiao")
-public class TouTiaoAdvertiserController {
-    @Autowired
-    private ITouTiaoAdvertiserService touTiaoAdvertiserService;
-
-    /**
-     * 1:获取广告主信息 @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/info")
-    @ResponseBody
-    public Map<String, Object> advertiserInfo(String accountId) {
-        return touTiaoAdvertiserService.getAdvertiserInfo(accountId);
-    }
-
-    /**
-     * 2:获取广告主广告计划信息 @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/plan/get")
-    @ResponseBody
-    public Map<String, Object> advertiserPlan(String accountId, String ids) {
-        return touTiaoAdvertiserService.getAdvertiserPlan(accountId, ids);
-    }
-
-    /**
-     * 3:修改广告计划信息状态 @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/plan/update/status")
-    @ResponseBody
-    public Map<String, Object> advertiserPlanUpdateStatus(String accountId, String adIds, String optStatus) {
-        return touTiaoAdvertiserService.advertiserPlanUpdateStatus(accountId, adIds, optStatus);
-    }
-
-    /**
-     * 3:修改广告计划信息状态 @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/plan/update/bid")
-    @ResponseBody
-    public Map<String, Object> advertiserPlanUpdateBid(String accountId, String adIds, String bids) {
-        return touTiaoAdvertiserService.advertiserPlanUpdateBid(accountId, adIds, bids);
-    }
-
-    /**
-     * 3:修改广告计划信息状态 @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/plan/update/budget")
-    @ResponseBody
-    public Map<String, Object> advertiserPlanUpdateBudget(String accountId, String adIds, String budgets) {
-        return touTiaoAdvertiserService.advertiserPlanUpdateBudget(accountId, adIds, budgets);
-    }
-
-    /**
-     * 4:获取广告主广告预算信息 @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/budget/get/")
-    @ResponseBody
-    public Map<String, Object> advertiserBudget(String accountId) {
-        return touTiaoAdvertiserService.getAdvertiserBudget(accountId);
-    }
-
-    /**
-     * 3:获取广告主广告组信息 @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/campaign/get")
-    @ResponseBody
-    public Map<String, Object> advertiserCampaign(String accountId, String ids) {
-        return touTiaoAdvertiserService.getAdvertiserCampaign(accountId, ids);
-    }
-
-    /**
-     * 5:获取广告主广告创意信息 @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/creative/get")
-    @ResponseBody
-    public Map<String, Object> getAdvertiserCreative(String accountId, String ids) {
-        return touTiaoAdvertiserService.getAdvertiserCreative(accountId, ids);
-    }
-
-    /**
-     * 5:修改广告创意信息状态 @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/update/status/")
-    @ResponseBody
-    public Map<String, Object> advertiserCreativeUpdateStatus(String accountId, String creativeIds, String optStatus) {
-        return touTiaoAdvertiserService.advertiserCreativeUpdateStatus(accountId, creativeIds, optStatus);
-    }
-
-    /**
-     * 6:获取广告主广告创意素材信息 @param accountId 本平台广告主id @param creativeIds 广告创意id
-     */
-    @RequestMapping("/advertiser/creative/material/read")
-    @ResponseBody
-    public Map<String, Object> advertiserCreativeMaterial(String accountId, String creativeIds) {
-        return touTiaoAdvertiserService.getAdvertiserCreativeMaterial(accountId, creativeIds);
-    }
-
-    /**
-     * 7:创建广告组信息 @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/campaign/create")
-    @ResponseBody
-    public Map<String, Object> advertiserCampaignCreate(String accountId, String campaignName, String budgetMode, Integer budget, String landingType) {
-        return touTiaoAdvertiserService.advertiserCampaignCreate(accountId, campaignName, budgetMode, budget, landingType);
-    }
-
-    /**
-     * 7:广告组更新状态信息 @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/campaign/update/status")
-    @ResponseBody
-    public Map<String, Object> advertiserCampaignUpdateStatus(String accountId, String campaignIds, String optStatus) {
-        return touTiaoAdvertiserService.advertiserCampaignUpdateStatus(accountId, campaignIds, optStatus);
-    }
-
-    /**
-     * 8:广告组更新信息 @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/campaign/update")
-    @ResponseBody
-    public Map<String, Object> advertiserCampaignUpdate(String accountId, Long campaignId, String budgetMode, Integer budget, String campaignName) {
-        return touTiaoAdvertiserService.advertiserCampaignUpdate(accountId, campaignId, budgetMode, budget, campaignName);
-    }
-
-    /**
-     * @功能:查询字典数据
-     * @param sysDictItem
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @RequestMapping(value = "dictItem/list", method = RequestMethod.GET)
-    @ResponseBody
-    public Result<IPage<SysDictItem>> queryPageList(SysDictItem sysDictItem, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                                    @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
-        Result<IPage<SysDictItem>> result = new Result<IPage<SysDictItem>>();
-        QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
-        queryWrapper.orderByAsc("sort_order");
-        Page<SysDictItem> page = new Page<SysDictItem>(pageNo, pageSize);
-        IPage<SysDictItem> pageList = sysDictItemService.page(page, queryWrapper);
-        System.err.println(pageList);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     *
-     * @param setBidType
-     * @param setFlowControlMode
-     * @param setBudgetPrice
-     * @param setBudgetMode
-     * @param setFlowDate
-     * @param setDateFlowRange
-     * @param setDateQuantum
-     * @param setPriceType
-     * @param setConvertPrice
-     * @param setFilterType
-     * @param setDateQuantumRange
-     * @param req
-     * @return
-     */
-    @RequestMapping(value = "budgetModel/insert", method = RequestMethod.GET)
-    @ResponseBody
-    public Map<String,Object> budgetModelInsert(@RequestParam(name="setBidType", defaultValue="1")String setBidType,
-                                                @RequestParam(name="setFlowControlMode", defaultValue="1") String setFlowControlMode,
-                                                @RequestParam(name="setBudgetPrice", defaultValue="1") String setBudgetPrice,
-                                                @RequestParam(name="setBudgetMode", defaultValue="1") String setBudgetMode,
-                                                @RequestParam(name="setFlowDate", defaultValue="1") String setFlowDate,
-                                                @RequestParam(name="setDateFlowRange", defaultValue="1") String setDateFlowRange,
-                                                @RequestParam(name="setDateQuantum", defaultValue="1") String setDateQuantum,
-                                                @RequestParam(name="setPriceType", defaultValue="1") String setPriceType,
-                                                @RequestParam(name="setConvertPrice", defaultValue="1") String setConvertPrice,
-                                                @RequestParam(name="setFilterType", defaultValue="1") String setFilterType,
-                                                @RequestParam(name="setDateQuantumRange", defaultValue="1") String setDateQuantumRange,HttpServletRequest req) {
-        Map<String,Object> result = new HashMap<>();
-        return result;
-    }
-
-    @Autowired
-    private ISysDictItemService sysDictItemService;
-}

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertisePlan.java

@@ -32,7 +32,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 public class ByteDanceAdvertisePlan {
     
 	/**头条平台广告计划id*/
-    @TableId(type = IdType.UUID)
+    @TableId
     @ApiModelProperty(value = "头条平台广告计划id")
 	private Long id;
 	/**平台广告主id*/

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertiser.java

@@ -32,7 +32,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 public class ByteDanceAdvertiser {
     
 	/**外部平台头条id*/
-	@TableId(type = IdType.UUID)
+    @TableId
     @ApiModelProperty(value = "外部平台头条id")
 	private Long id;
 	/**本平台id*/

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertiserBudget.java

@@ -27,7 +27,7 @@ import java.math.BigDecimal;
 public class ByteDanceAdvertiserBudget {
     
 	/**头条广告主id*/
-	@TableId(type = IdType.UUID)
+    @TableId
     @ApiModelProperty(value = "头条广告主id")
 	private Long id;
 	/**平台账号id*/

+ 6 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceBudgetTemplate.java

@@ -48,6 +48,12 @@ public class ByteDanceBudgetTemplate {
     @ApiModelProperty(value = "头条账号id")
     private Long toutiaoId;
     /**
+     * 模板名称
+     */
+    @Excel(name = "模板名称", width = 15)
+    @ApiModelProperty(value = "模板名称")
+    private String name;
+    /**
      * bidType
      */
     @Excel(name = "bidType", width = 15)

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCampaign.java

@@ -32,7 +32,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 public class ByteDanceCampaign {
     
 	/**今日头条广告组id*/
-	@TableId(type = IdType.UUID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "今日头条广告组id")
 	private Long id;
 	/**平台用户id*/

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCreative.java

@@ -31,7 +31,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 public class ByteDanceCreative {
     
 	/**创意id*/
-	@TableId(type = IdType.UUID)
+    @TableId
     @ApiModelProperty(value = "创意id")
 	private Long id;
 	/**广告计划id*/

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCreativeMaterial.java

@@ -31,7 +31,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 public class ByteDanceCreativeMaterial {
     
 	/**素材id*/
-	@TableId(type = IdType.UUID)
+    @TableId
     @ApiModelProperty(value = "素材id")
 	private Long id;
 	/**平台广告主id*/

+ 23 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCustomAudience.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.ctop.entity;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -32,9 +33,9 @@ public class ByteDanceCustomAudience {
     /**
      * id
      */
-    @TableId(type = IdType.UUID)
+    @TableId
     @ApiModelProperty(value = "id")
-    private Integer id;
+    private Long id;
     /**
      * 广告主id
      */
@@ -46,7 +47,7 @@ public class ByteDanceCustomAudience {
      */
     @Excel(name = "头条账号id", width = 15)
     @ApiModelProperty(value = "头条账号id")
-    private Integer accountId;
+    private Long accountId;
     /**
      * 是否删除
      */
@@ -82,13 +83,13 @@ public class ByteDanceCustomAudience {
      */
     @Excel(name = "人群包覆盖人群数目", width = 15)
     @ApiModelProperty(value = "人群包覆盖人群数目")
-    private Integer coverNum;
+    private Long coverNum;
     /**
      * 上传类型人群包包含人群数目
      */
     @Excel(name = "上传类型人群包包含人群数目", width = 15)
     @ApiModelProperty(value = "上传类型人群包包含人群数目")
-    private Integer uploadNum;
+    private Long uploadNum;
     /**
      * 人群分组
      */
@@ -105,4 +106,21 @@ public class ByteDanceCustomAudience {
      */
     @ApiModelProperty(value = "updateTime")
     private Date updateTime;
+
+    public ByteDanceCustomAudience() {
+    }
+
+    public ByteDanceCustomAudience(CTopOauthToken token, JSONObject dataObject) {
+        this.id = dataObject.getLong("custom_audience_id");
+        this.accountId = token.getAccountId();
+        this.advertiserId = token.getAdvertiserId();
+        this.isdel = dataObject.getInteger("isdel");
+        this.dataSourceId = dataObject.getString("custom_audience_id");
+        this.name = dataObject.getString("name");
+        this.source = dataObject.getString("source");
+        this.status = dataObject.getInteger("status");
+        this.coverNum = dataObject.getLong("cover_num");
+        this.uploadNum = dataObject.getLong("upload_num");
+        this.tag = dataObject.getString("tag");
+    }
 }

+ 9 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceUserOrientationTemplate.java

@@ -32,15 +32,15 @@ public class ByteDanceUserOrientationTemplate {
     /**
      * id
      */
-    @TableId(type = IdType.UUID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
-    private Integer id;
+    private Long id;
     /**
      * 头条账号id
      */
     @Excel(name = "头条账号id", width = 15)
     @ApiModelProperty(value = "头条账号id")
-    private Integer accountId;
+    private Long accountId;
     /**
      * 广告主id
      */
@@ -48,6 +48,12 @@ public class ByteDanceUserOrientationTemplate {
     @ApiModelProperty(value = "广告主id")
     private String advertiserId;
     /**
+     * 模板名称
+     */
+    @Excel(name = "模板名称", width = 15)
+    @ApiModelProperty(value = "模板名称")
+    private String name;
+    /**
      * 定向人群包列表
      */
     @Excel(name = "定向人群包列表", width = 15)

+ 6 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceDeliveryTargetTemplate.java

@@ -48,6 +48,12 @@ public class BytedanceDeliveryTargetTemplate {
     @ApiModelProperty(value = "平台账号id")
     private String advertiserId;
     /**
+     * 模板名称
+     */
+    @Excel(name = "模板名称", width = 15)
+    @ApiModelProperty(value = "模板名称")
+    private String name;
+    /**
      * 投放目标
      */
     @Excel(name = "投放目标", width = 15)

+ 6 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IByteDanceBudgetTemplateService.java

@@ -1,8 +1,12 @@
 package org.jeecg.modules.ctop.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.ctop.entity.ByteDanceBudgetTemplate;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -14,4 +18,6 @@ import java.util.Map;
 public interface IByteDanceBudgetTemplateService extends IService<ByteDanceBudgetTemplate> {
 
     Map<String, Object> insertTemplate(ByteDanceBudgetTemplate template);
+
+    Result<IPage<ByteDanceBudgetTemplate>> getList(ByteDanceBudgetTemplate template, Integer pageNo, Integer pageSize, HttpServletRequest req);
 }

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IByteDanceCampaignTemplateService.java

@@ -1,8 +1,11 @@
 package org.jeecg.modules.ctop.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -14,4 +17,6 @@ import java.util.Map;
 public interface IByteDanceCampaignTemplateService extends IService<ByteDanceCampaignTemplate> {
 
     Map<String, Object> insertTemplate(ByteDanceCampaignTemplate template);
+
+    Result<IPage<ByteDanceCampaignTemplate>> getList(ByteDanceCampaignTemplate template, Integer pageNo, Integer pageSize, HttpServletRequest req);
 }

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IBytedanceDeliveryTargetTemplateService.java

@@ -1,8 +1,11 @@
 package org.jeecg.modules.ctop.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.ctop.entity.BytedanceDeliveryTargetTemplate;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -14,4 +17,6 @@ import java.util.Map;
 public interface IBytedanceDeliveryTargetTemplateService extends IService<BytedanceDeliveryTargetTemplate> {
 
     Map<String, Object> insertTemplate(BytedanceDeliveryTargetTemplate template);
+
+    Result<IPage<BytedanceDeliveryTargetTemplate>> getList(BytedanceDeliveryTargetTemplate template, Integer pageNo, Integer pageSize, HttpServletRequest req);
 }

+ 6 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceAdvertiserDataServiceImpl.java

@@ -635,7 +635,9 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
         System.out.println(data.toJSONString());
         for (int i = 0; i < data.size(); i++) {
             JSONObject dataObject = data.getJSONObject(i);
-
+            ByteDanceCustomAudience audience = new ByteDanceCustomAudience(token, dataObject);
+            audienceMapper.deleteById(audience.getId());
+            audienceMapper.insert(audience);
         }
 
         resultMap.put("success", true);
@@ -645,6 +647,9 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     }
 
     @Autowired
+    private ByteDanceCustomAudienceMapper audienceMapper;
+
+    @Autowired
     private ICTopOauthTokenService tokenService;
 
     @Autowired

+ 21 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceBudgetTemplateServiceImpl.java

@@ -1,10 +1,13 @@
 package org.jeecg.modules.ctop.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.ctop.entity.ByteDanceAdvertiser;
-import org.jeecg.modules.ctop.entity.ByteDanceBudgetTemplate;
-import org.jeecg.modules.ctop.entity.CTopOauthToken;
+import org.jeecg.modules.ctop.entity.*;
 import org.jeecg.modules.ctop.mapper.ByteDanceAdvertiserMapper;
 import org.jeecg.modules.ctop.mapper.ByteDanceBudgetTemplateMapper;
 import org.jeecg.modules.ctop.service.IByteDanceAdvertiserBudgetService;
@@ -17,6 +20,7 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -45,6 +49,20 @@ public class ByteDanceBudgetTemplateServiceImpl extends ServiceImpl<ByteDanceBud
         return resultMap;
     }
 
+    @Override
+    public Result<IPage<ByteDanceBudgetTemplate>> getList(ByteDanceBudgetTemplate template, Integer pageNo, Integer pageSize, HttpServletRequest req) {
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        CTopOauthToken token = tokenService.getOAuthTokenByAccountId(user.getId());
+        Result<IPage<ByteDanceBudgetTemplate>> result = new Result<>();
+        QueryWrapper<ByteDanceBudgetTemplate> queryWrapper = QueryGenerator.initQueryWrapper(template, req.getParameterMap());
+        queryWrapper.eq("advertiser_id", token.getAdvertiserId()).orderByDesc("create_time");
+        Page<ByteDanceBudgetTemplate> page = new Page<>(pageNo, pageSize);
+        IPage<ByteDanceBudgetTemplate> pageList = this.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
     @Autowired
     private ICTopOauthTokenService tokenService;
     @Autowired

+ 20 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceCampaignTemplateServiceImpl.java

@@ -1,6 +1,11 @@
 package org.jeecg.modules.ctop.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.ctop.entity.ByteDanceCampaign;
 import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
@@ -13,6 +18,7 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -38,6 +44,20 @@ public class ByteDanceCampaignTemplateServiceImpl extends ServiceImpl<ByteDanceC
         return resultMap;
     }
 
+    @Override
+    public Result<IPage<ByteDanceCampaignTemplate>> getList(ByteDanceCampaignTemplate template, Integer pageNo, Integer pageSize, HttpServletRequest req) {
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        CTopOauthToken token = tokenService.getOAuthTokenByAccountId(user.getId());
+        Result<IPage<ByteDanceCampaignTemplate>> result = new Result<>();
+        QueryWrapper<ByteDanceCampaignTemplate> queryWrapper = QueryGenerator.initQueryWrapper(template, req.getParameterMap());
+        queryWrapper.eq("advertiser_id", token.getAdvertiserId()).orderByDesc("create_time");
+        Page<ByteDanceCampaignTemplate> page = new Page<>(pageNo, pageSize);
+        IPage<ByteDanceCampaignTemplate> pageList = this.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
     @Autowired
     private ByteDanceCampaignTemplateMapper campaignTemplateMapper;
     @Autowired

+ 21 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/BytedanceDeliveryTargetTemplateServiceImpl.java

@@ -1,7 +1,13 @@
 package org.jeecg.modules.ctop.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
 import org.jeecg.modules.ctop.entity.BytedanceDeliveryTargetTemplate;
 import org.jeecg.modules.ctop.entity.CTopOauthToken;
 import org.jeecg.modules.ctop.mapper.BytedanceDeliveryTargetTemplateMapper;
@@ -12,6 +18,7 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -38,6 +45,20 @@ public class BytedanceDeliveryTargetTemplateServiceImpl extends ServiceImpl<Byte
         return resultMap;
     }
 
+    @Override
+    public Result<IPage<BytedanceDeliveryTargetTemplate>> getList(BytedanceDeliveryTargetTemplate template, Integer pageNo, Integer pageSize, HttpServletRequest req) {
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        CTopOauthToken token = tokenService.getOAuthTokenByAccountId(user.getId());
+        Result<IPage<BytedanceDeliveryTargetTemplate>> result = new Result<>();
+        QueryWrapper<BytedanceDeliveryTargetTemplate> queryWrapper = QueryGenerator.initQueryWrapper(template, req.getParameterMap());
+        queryWrapper.eq("advertiser_id", token.getAdvertiserId()).orderByDesc("create_time");
+        Page<BytedanceDeliveryTargetTemplate> page = new Page<>(pageNo, pageSize);
+        IPage<BytedanceDeliveryTargetTemplate> pageList = this.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
     @Autowired
     private ICTopOauthTokenService tokenService;
     @Autowired