Browse Source

代码规范+格式化

syh 6 years ago
parent
commit
6bbcf5f00e
99 changed files with 3290 additions and 1877 deletions
  1. 1 0
      .gitignore
  2. 253 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertisePlanController.java
  3. 244 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertiserBudgetController.java
  4. 58 58
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CTopToutiaoAdvertiserController.java
  5. 15 49
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TouTiaoAdvertiserController.java
  6. 58 58
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CTopToutiaoAdvertisePlanController.java
  7. 58 58
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ToutiaoCreativeController.java
  8. 244 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCampaignTemplateController.java
  9. 58 58
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CTopToutiaoCampaignController.java
  10. 253 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCreativeMaterialController.java
  11. 0 244
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CtopToutiaoAdvertiserBudgetController.java
  12. 0 244
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CtopToutiaoBudgetTemplateController.java
  13. 0 244
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ToutiaoCreativeMaterialController.java
  14. 58 57
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/CTopToutiaoAdvertisePlan.java
  15. 8 8
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/CTopToutiaoAdvertiser.java
  16. 14 12
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/CtopToutiaoAdvertiserBudget.java
  17. 138 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceBudgetTemplate.java
  18. 25 19
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/CTopToutiaoCampaign.java
  19. 84 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCampaignTemplate.java
  20. 7 7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ToutiaoCreative.java
  21. 14 10
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ToutiaoCreativeMaterial.java
  22. 0 97
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/CtopToutiaoBudgetTemplate.java
  23. 17 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceAdvertisePlanMapper.java
  24. 17 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceAdvertiserBudgetMapper.java
  25. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/CTopToutiaoAdvertiserMapper.java
  26. 17 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceBudgetTemplateMapper.java
  27. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/CTopToutiaoCampaignMapper.java
  28. 17 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceCampaignTemplateMapper.java
  29. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ToutiaoCreativeMapper.java
  30. 17 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceCreativeMaterialMapper.java
  31. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/CTopToutiaoAdvertisePlanMapper.java
  32. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/CtopToutiaoAdvertiserBudgetMapper.java
  33. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/CtopToutiaoBudgetTemplateMapper.java
  34. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ToutiaoCreativeMaterialMapper.java
  35. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/ToutiaoCreativeMaterialMapper.xml
  36. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/CtopToutiaoBudgetTemplateMapper.xml
  37. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/CTopToutiaoCampaignMapper.xml
  38. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/ByteDanceBudgetTemplateMapper.xml
  39. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/ToutiaoCreativeMapper.xml
  40. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/CTopToutiaoAdvertisePlanMapper.xml
  41. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/CTopToutiaoAdvertiserMapper.xml
  42. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/ByteDanceCreativeMaterialMapper.xml
  43. 0 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/CtopToutiaoAdvertiserBudgetMapper.xml
  44. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IByteDanceAdvertisePlanService.java
  45. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IByteDanceAdvertiserBudgetService.java
  46. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/ITouTiaoAdvertiserService.java
  47. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IByteDanceAdvertiserService.java
  48. 17 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IByteDanceBudgetTemplateService.java
  49. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IByteDanceCampaignService.java
  50. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IByteDanceCampaignTemplateService.java
  51. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IByteDanceCreativeMaterialService.java
  52. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IByteDanceCreativeService.java
  53. 0 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/ICTopToutiaoAdvertisePlanService.java
  54. 0 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/ICTopToutiaoAdvertiserService.java
  55. 0 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/ICTopToutiaoCampaignService.java
  56. 0 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/ICtopToutiaoAdvertiserBudgetService.java
  57. 0 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/ICtopToutiaoBudgetTemplateService.java
  58. 0 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IToutiaoCreativeMaterialService.java
  59. 0 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IToutiaoCreativeService.java
  60. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceAdvertisePlanServiceImpl.java
  61. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceAdvertiserBudgetServiceImpl.java
  62. 63 55
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/TouTiaoAdvertiserServiceImpl.java
  63. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceAdvertiserServiceImpl.java
  64. 35 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceBudgetTemplateServiceImpl.java
  65. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceCampaignServiceImpl.java
  66. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceCampaignTemplateServiceImpl.java
  67. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceCreativeMaterialServiceImpl.java
  68. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceCreativeServiceImpl.java
  69. 0 19
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CTopToutiaoAdvertisePlanServiceImpl.java
  70. 0 19
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CTopToutiaoAdvertiserServiceImpl.java
  71. 0 19
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CTopToutiaoCampaignServiceImpl.java
  72. 0 19
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CtopToutiaoAdvertiserBudgetServiceImpl.java
  73. 0 19
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CtopToutiaoBudgetTemplateServiceImpl.java
  74. 0 19
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ToutiaoCreativeMaterialServiceImpl.java
  75. 0 19
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ToutiaoCreativeServiceImpl.java
  76. 324 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/ByteDanceAdvertisePlanList.vue
  77. 11 11
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/CtopToutiaoAdvertiserBudgetList.vue
  78. 11 11
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/CTopToutiaoAdvertiserList.vue
  79. 41 36
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/CtopToutiaoBudgetTemplateList.vue
  80. 21 11
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/CTopToutiaoCampaignList.vue
  81. 33 44
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/CTopToutiaoAdvertisePlanList.vue
  82. 11 11
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/ToutiaoCreativeList.vue
  83. 17 12
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/ToutiaoCreativeMaterialList.vue
  84. 302 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/ByteDanceAdvertisePlanModal.vue
  85. 309 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/ByteDanceAdvertisePlanModal__Style#Drawer.vue
  86. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CtopToutiaoAdvertiserBudgetModal.vue
  87. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CtopToutiaoAdvertiserBudgetModal__Style#Drawer.vue
  88. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CTopToutiaoAdvertiserModal.vue
  89. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CTopToutiaoAdvertiserModal__Style#Drawer.vue
  90. 30 24
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CtopToutiaoBudgetTemplateModal.vue
  91. 30 24
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CtopToutiaoBudgetTemplateModal__Style#Drawer.vue
  92. 11 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CTopToutiaoCampaignModal.vue
  93. 11 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CTopToutiaoCampaignModal__Style#Drawer.vue
  94. 20 29
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CTopToutiaoAdvertisePlanModal.vue
  95. 20 29
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CTopToutiaoAdvertisePlanModal__Style#Drawer.vue
  96. 10 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/ToutiaoCreativeMaterialModal.vue
  97. 10 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/ToutiaoCreativeMaterialModal__Style#Drawer.vue
  98. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/ToutiaoCreativeModal.vue
  99. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/ToutiaoCreativeModal__Style#Drawer.vue

+ 1 - 0
.gitignore

@@ -32,3 +32,4 @@ hs_err_pid*
 *.iml
 *.iml
 out
 out
 gen
 gen
+/.idea/

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

@@ -0,0 +1,253 @@
+package org.jeecg.modules.ctop.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.ctop.entity.ByteDanceAdvertisePlan;
+import org.jeecg.modules.ctop.service.IByteDanceAdvertisePlanService;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @Description: 今日头条广告计划信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags = "今日头条广告计划信息")
+@RestController
+@RequestMapping("/ctop/byteDanceAdvertisePlan")
+public class ByteDanceAdvertisePlanController {
+    @Autowired
+    private IByteDanceAdvertisePlanService byteDanceAdvertisePlanService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param byteDanceAdvertisePlan
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "今日头条广告计划信息-分页列表查询")
+    @ApiOperation(value = "今日头条广告计划信息-分页列表查询", notes = "今日头条广告计划信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<ByteDanceAdvertisePlan>> queryPageList(ByteDanceAdvertisePlan byteDanceAdvertisePlan,
+                                                               @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                               HttpServletRequest req) {
+        Result<IPage<ByteDanceAdvertisePlan>> result = new Result<IPage<ByteDanceAdvertisePlan>>();
+        QueryWrapper<ByteDanceAdvertisePlan> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceAdvertisePlan, req.getParameterMap());
+        Page<ByteDanceAdvertisePlan> page = new Page<ByteDanceAdvertisePlan>(pageNo, pageSize);
+        IPage<ByteDanceAdvertisePlan> pageList = byteDanceAdvertisePlanService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param byteDanceAdvertisePlan
+     * @return
+     */
+    @AutoLog(value = "今日头条广告计划信息-添加")
+    @ApiOperation(value = "今日头条广告计划信息-添加", notes = "今日头条广告计划信息-添加")
+    @PostMapping(value = "/add")
+    public Result<ByteDanceAdvertisePlan> add(@RequestBody ByteDanceAdvertisePlan byteDanceAdvertisePlan) {
+        Result<ByteDanceAdvertisePlan> result = new Result<ByteDanceAdvertisePlan>();
+        try {
+            byteDanceAdvertisePlanService.save(byteDanceAdvertisePlan);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param byteDanceAdvertisePlan
+     * @return
+     */
+    @AutoLog(value = "今日头条广告计划信息-编辑")
+    @ApiOperation(value = "今日头条广告计划信息-编辑", notes = "今日头条广告计划信息-编辑")
+    @PutMapping(value = "/edit")
+    public Result<ByteDanceAdvertisePlan> edit(@RequestBody ByteDanceAdvertisePlan byteDanceAdvertisePlan) {
+        Result<ByteDanceAdvertisePlan> result = new Result<ByteDanceAdvertisePlan>();
+        ByteDanceAdvertisePlan byteDanceAdvertisePlanEntity = byteDanceAdvertisePlanService.getById(byteDanceAdvertisePlan.getId());
+        if (byteDanceAdvertisePlanEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = byteDanceAdvertisePlanService.updateById(byteDanceAdvertisePlan);
+            //TODO 返回false说明什么?
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "今日头条广告计划信息-通过id删除")
+    @ApiOperation(value = "今日头条广告计划信息-通过id删除", notes = "今日头条广告计划信息-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            byteDanceAdvertisePlanService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "今日头条广告计划信息-批量删除")
+    @ApiOperation(value = "今日头条广告计划信息-批量删除", notes = "今日头条广告计划信息-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<ByteDanceAdvertisePlan> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<ByteDanceAdvertisePlan> result = new Result<ByteDanceAdvertisePlan>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.byteDanceAdvertisePlanService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "今日头条广告计划信息-通过id查询")
+    @ApiOperation(value = "今日头条广告计划信息-通过id查询", notes = "今日头条广告计划信息-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<ByteDanceAdvertisePlan> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<ByteDanceAdvertisePlan> result = new Result<ByteDanceAdvertisePlan>();
+        ByteDanceAdvertisePlan byteDanceAdvertisePlan = byteDanceAdvertisePlanService.getById(id);
+        if (byteDanceAdvertisePlan == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(byteDanceAdvertisePlan);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<ByteDanceAdvertisePlan> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                ByteDanceAdvertisePlan byteDanceAdvertisePlan = JSON.parseObject(deString, ByteDanceAdvertisePlan.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(byteDanceAdvertisePlan, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<ByteDanceAdvertisePlan> pageList = byteDanceAdvertisePlanService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条广告计划信息列表");
+        mv.addObject(NormalExcelConstants.CLASS, ByteDanceAdvertisePlan.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("今日头条广告计划信息列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<ByteDanceAdvertisePlan> listByteDanceAdvertisePlans = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceAdvertisePlan.class, params);
+                byteDanceAdvertisePlanService.saveBatch(listByteDanceAdvertisePlans);
+                return Result.ok("文件导入成功!数据行数:" + listByteDanceAdvertisePlans.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
+
+}

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

@@ -0,0 +1,244 @@
+package org.jeecg.modules.ctop.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.ctop.entity.ByteDanceAdvertiserBudget;
+import org.jeecg.modules.ctop.service.IByteDanceAdvertiserBudgetService;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+  * @Description: 今日头条广告主预算信息
+ * @Author: jeecg-boot
+  * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags = "今日头条广告主预算信息")
+@RestController
+@RequestMapping("/ctop/byteDanceAdvertiserBudget")
+public class ByteDanceAdvertiserBudgetController {
+	@Autowired
+    private IByteDanceAdvertiserBudgetService byteDanceAdvertiserBudgetService;
+	
+	/**
+	  * 分页列表查询
+     * @param byteDanceAdvertiserBudget
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+    @AutoLog(value = "今日头条广告主预算信息-分页列表查询")
+    @ApiOperation(value = "今日头条广告主预算信息-分页列表查询", notes = "今日头条广告主预算信息-分页列表查询")
+	@GetMapping(value = "/list")
+    public Result<IPage<ByteDanceAdvertiserBudget>> queryPageList(ByteDanceAdvertiserBudget byteDanceAdvertiserBudget,
+                                                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                                  HttpServletRequest req) {
+        Result<IPage<ByteDanceAdvertiserBudget>> result = new Result<IPage<ByteDanceAdvertiserBudget>>();
+        QueryWrapper<ByteDanceAdvertiserBudget> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceAdvertiserBudget, req.getParameterMap());
+        Page<ByteDanceAdvertiserBudget> page = new Page<ByteDanceAdvertiserBudget>(pageNo, pageSize);
+        IPage<ByteDanceAdvertiserBudget> pageList = byteDanceAdvertiserBudgetService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+     * @param byteDanceAdvertiserBudget
+	 * @return
+	 */
+    @AutoLog(value = "今日头条广告主预算信息-添加")
+    @ApiOperation(value = "今日头条广告主预算信息-添加", notes = "今日头条广告主预算信息-添加")
+	@PostMapping(value = "/add")
+    public Result<ByteDanceAdvertiserBudget> add(@RequestBody ByteDanceAdvertiserBudget byteDanceAdvertiserBudget) {
+        Result<ByteDanceAdvertiserBudget> result = new Result<ByteDanceAdvertiserBudget>();
+		try {
+            byteDanceAdvertiserBudgetService.save(byteDanceAdvertiserBudget);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+     * @param byteDanceAdvertiserBudget
+	 * @return
+	 */
+    @AutoLog(value = "今日头条广告主预算信息-编辑")
+    @ApiOperation(value = "今日头条广告主预算信息-编辑", notes = "今日头条广告主预算信息-编辑")
+	@PutMapping(value = "/edit")
+    public Result<ByteDanceAdvertiserBudget> edit(@RequestBody ByteDanceAdvertiserBudget byteDanceAdvertiserBudget) {
+        Result<ByteDanceAdvertiserBudget> result = new Result<ByteDanceAdvertiserBudget>();
+        ByteDanceAdvertiserBudget byteDanceAdvertiserBudgetEntity = byteDanceAdvertiserBudgetService.getById(byteDanceAdvertiserBudget.getId());
+        if (byteDanceAdvertiserBudgetEntity == null) {
+			result.error500("未找到对应实体");
+		}else {
+            boolean ok = byteDanceAdvertiserBudgetService.updateById(byteDanceAdvertiserBudget);
+			//TODO 返回false说明什么?
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+    @AutoLog(value = "今日头条广告主预算信息-通过id删除")
+    @ApiOperation(value = "今日头条广告主预算信息-通过id删除", notes = "今日头条广告主预算信息-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+            byteDanceAdvertiserBudgetService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+    @AutoLog(value = "今日头条广告主预算信息-批量删除")
+    @ApiOperation(value = "今日头条广告主预算信息-批量删除", notes = "今日头条广告主预算信息-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+    public Result<ByteDanceAdvertiserBudget> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<ByteDanceAdvertiserBudget> result = new Result<ByteDanceAdvertiserBudget>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+            this.byteDanceAdvertiserBudgetService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+    @AutoLog(value = "今日头条广告主预算信息-通过id查询")
+    @ApiOperation(value = "今日头条广告主预算信息-通过id查询", notes = "今日头条广告主预算信息-通过id查询")
+	@GetMapping(value = "/queryById")
+    public Result<ByteDanceAdvertiserBudget> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<ByteDanceAdvertiserBudget> result = new Result<ByteDanceAdvertiserBudget>();
+        ByteDanceAdvertiserBudget byteDanceAdvertiserBudget = byteDanceAdvertiserBudgetService.getById(id);
+        if (byteDanceAdvertiserBudget == null) {
+			result.error500("未找到对应实体");
+		}else {
+            result.setResult(byteDanceAdvertiserBudget);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<ByteDanceAdvertiserBudget> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              ByteDanceAdvertiserBudget byteDanceAdvertiserBudget = JSON.parseObject(deString, ByteDanceAdvertiserBudget.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(byteDanceAdvertiserBudget, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<ByteDanceAdvertiserBudget> pageList = byteDanceAdvertiserBudgetService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条广告主预算信息列表");
+      mv.addObject(NormalExcelConstants.CLASS, ByteDanceAdvertiserBudget.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("今日头条广告主预算信息列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+  /**
+      * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();// 获取上传文件对象
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<ByteDanceAdvertiserBudget> listByteDanceAdvertiserBudgets = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceAdvertiserBudget.class, params);
+              byteDanceAdvertiserBudgetService.saveBatch(listByteDanceAdvertiserBudgets);
+              return Result.ok("文件导入成功!数据行数:" + listByteDanceAdvertiserBudgets.size());
+          } catch (Exception e) {
+              log.error(e.getMessage(),e);
+              return Result.error("文件导入失败:"+e.getMessage());
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败!");
+  }
+
+}

+ 58 - 58
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CTopToutiaoAdvertiserController.java

@@ -12,8 +12,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.CTopToutiaoAdvertiser;
-import org.jeecg.modules.ctop.service.ICTopToutiaoAdvertiserService;
+import org.jeecg.modules.ctop.entity.ByteDanceAdvertiser;
+import org.jeecg.modules.ctop.service.IByteDanceAdvertiserService;
 import java.util.Date;
 import java.util.Date;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -36,38 +36,38 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 
 
  /**
  /**
- * @Description: 头条广告主信息
+  * @Description: 今日头条广告主信息
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-07-10
+  * @Date: 2019-07-22
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 @Slf4j
 @Slf4j
-@Api(tags="头条广告主信息")
+@Api(tags = "今日头条广告主信息")
 @RestController
 @RestController
-@RequestMapping("/ctop/cTopToutiaoAdvertiser")
-public class CTopToutiaoAdvertiserController {
+@RequestMapping("/ctop/byteDanceAdvertiser")
+public class ByteDanceAdvertiserController {
 	@Autowired
 	@Autowired
-	private ICTopToutiaoAdvertiserService cTopToutiaoAdvertiserService;
+	private IByteDanceAdvertiserService byteDanceAdvertiserService;
 	
 	
 	/**
 	/**
 	  * 分页列表查询
 	  * 分页列表查询
-	 * @param cTopToutiaoAdvertiser
+	 * @param byteDanceAdvertiser
 	 * @param pageNo
 	 * @param pageNo
 	 * @param pageSize
 	 * @param pageSize
 	 * @param req
 	 * @param req
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "头条广告主信息-分页列表查询")
-	@ApiOperation(value="头条广告主信息-分页列表查询", notes="头条广告主信息-分页列表查询")
+	@AutoLog(value = "今日头条广告主信息-分页列表查询")
+	@ApiOperation(value = "今日头条广告主信息-分页列表查询", notes = "今日头条广告主信息-分页列表查询")
 	@GetMapping(value = "/list")
 	@GetMapping(value = "/list")
-	public Result<IPage<CTopToutiaoAdvertiser>> queryPageList(CTopToutiaoAdvertiser cTopToutiaoAdvertiser,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<CTopToutiaoAdvertiser>> result = new Result<IPage<CTopToutiaoAdvertiser>>();
-		QueryWrapper<CTopToutiaoAdvertiser> queryWrapper = QueryGenerator.initQueryWrapper(cTopToutiaoAdvertiser, req.getParameterMap());
-		Page<CTopToutiaoAdvertiser> page = new Page<CTopToutiaoAdvertiser>(pageNo, pageSize);
-		IPage<CTopToutiaoAdvertiser> pageList = cTopToutiaoAdvertiserService.page(page, queryWrapper);
+	public Result<IPage<ByteDanceAdvertiser>> queryPageList(ByteDanceAdvertiser byteDanceAdvertiser,
+															@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															HttpServletRequest req) {
+		Result<IPage<ByteDanceAdvertiser>> result = new Result<IPage<ByteDanceAdvertiser>>();
+		QueryWrapper<ByteDanceAdvertiser> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceAdvertiser, req.getParameterMap());
+		Page<ByteDanceAdvertiser> page = new Page<ByteDanceAdvertiser>(pageNo, pageSize);
+		IPage<ByteDanceAdvertiser> pageList = byteDanceAdvertiserService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		result.setResult(pageList);
 		return result;
 		return result;
@@ -75,16 +75,16 @@ public class CTopToutiaoAdvertiserController {
 	
 	
 	/**
 	/**
 	  *   添加
 	  *   添加
-	 * @param cTopToutiaoAdvertiser
+	 * @param byteDanceAdvertiser
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "头条广告主信息-添加")
-	@ApiOperation(value="头条广告主信息-添加", notes="头条广告主信息-添加")
+	@AutoLog(value = "今日头条广告主信息-添加")
+	@ApiOperation(value = "今日头条广告主信息-添加", notes = "今日头条广告主信息-添加")
 	@PostMapping(value = "/add")
 	@PostMapping(value = "/add")
-	public Result<CTopToutiaoAdvertiser> add(@RequestBody CTopToutiaoAdvertiser cTopToutiaoAdvertiser) {
-		Result<CTopToutiaoAdvertiser> result = new Result<CTopToutiaoAdvertiser>();
+	public Result<ByteDanceAdvertiser> add(@RequestBody ByteDanceAdvertiser byteDanceAdvertiser) {
+		Result<ByteDanceAdvertiser> result = new Result<ByteDanceAdvertiser>();
 		try {
 		try {
-			cTopToutiaoAdvertiserService.save(cTopToutiaoAdvertiser);
+			byteDanceAdvertiserService.save(byteDanceAdvertiser);
 			result.success("添加成功!");
 			result.success("添加成功!");
 		} catch (Exception e) {
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
 			log.error(e.getMessage(),e);
@@ -95,19 +95,19 @@ public class CTopToutiaoAdvertiserController {
 	
 	
 	/**
 	/**
 	  *  编辑
 	  *  编辑
-	 * @param cTopToutiaoAdvertiser
+	 * @param byteDanceAdvertiser
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "头条广告主信息-编辑")
-	@ApiOperation(value="头条广告主信息-编辑", notes="头条广告主信息-编辑")
+	@AutoLog(value = "今日头条广告主信息-编辑")
+	@ApiOperation(value = "今日头条广告主信息-编辑", notes = "今日头条广告主信息-编辑")
 	@PutMapping(value = "/edit")
 	@PutMapping(value = "/edit")
-	public Result<CTopToutiaoAdvertiser> edit(@RequestBody CTopToutiaoAdvertiser cTopToutiaoAdvertiser) {
-		Result<CTopToutiaoAdvertiser> result = new Result<CTopToutiaoAdvertiser>();
-		CTopToutiaoAdvertiser cTopToutiaoAdvertiserEntity = cTopToutiaoAdvertiserService.getById(cTopToutiaoAdvertiser.getId());
-		if(cTopToutiaoAdvertiserEntity==null) {
+	public Result<ByteDanceAdvertiser> edit(@RequestBody ByteDanceAdvertiser byteDanceAdvertiser) {
+		Result<ByteDanceAdvertiser> result = new Result<ByteDanceAdvertiser>();
+		ByteDanceAdvertiser byteDanceAdvertiserEntity = byteDanceAdvertiserService.getById(byteDanceAdvertiser.getId());
+		if (byteDanceAdvertiserEntity == null) {
 			result.error500("未找到对应实体");
 			result.error500("未找到对应实体");
 		}else {
 		}else {
-			boolean ok = cTopToutiaoAdvertiserService.updateById(cTopToutiaoAdvertiser);
+			boolean ok = byteDanceAdvertiserService.updateById(byteDanceAdvertiser);
 			//TODO 返回false说明什么?
 			//TODO 返回false说明什么?
 			if(ok) {
 			if(ok) {
 				result.success("修改成功!");
 				result.success("修改成功!");
@@ -122,12 +122,12 @@ public class CTopToutiaoAdvertiserController {
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "头条广告主信息-通过id删除")
-	@ApiOperation(value="头条广告主信息-通过id删除", notes="头条广告主信息-通过id删除")
+	@AutoLog(value = "今日头条广告主信息-通过id删除")
+	@ApiOperation(value = "今日头条广告主信息-通过id删除", notes = "今日头条广告主信息-通过id删除")
 	@DeleteMapping(value = "/delete")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		try {
 		try {
-			cTopToutiaoAdvertiserService.removeById(id);
+			byteDanceAdvertiserService.removeById(id);
 		} catch (Exception e) {
 		} catch (Exception e) {
 			log.error("删除失败",e.getMessage());
 			log.error("删除失败",e.getMessage());
 			return Result.error("删除失败!");
 			return Result.error("删除失败!");
@@ -140,15 +140,15 @@ public class CTopToutiaoAdvertiserController {
 	 * @param ids
 	 * @param ids
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "头条广告主信息-批量删除")
-	@ApiOperation(value="头条广告主信息-批量删除", notes="头条广告主信息-批量删除")
+	@AutoLog(value = "今日头条广告主信息-批量删除")
+	@ApiOperation(value = "今日头条广告主信息-批量删除", notes = "今日头条广告主信息-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
-	public Result<CTopToutiaoAdvertiser> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<CTopToutiaoAdvertiser> result = new Result<CTopToutiaoAdvertiser>();
+	public Result<ByteDanceAdvertiser> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+		Result<ByteDanceAdvertiser> result = new Result<ByteDanceAdvertiser>();
 		if(ids==null || "".equals(ids.trim())) {
 		if(ids==null || "".equals(ids.trim())) {
 			result.error500("参数不识别!");
 			result.error500("参数不识别!");
 		}else {
 		}else {
-			this.cTopToutiaoAdvertiserService.removeByIds(Arrays.asList(ids.split(",")));
+			this.byteDanceAdvertiserService.removeByIds(Arrays.asList(ids.split(",")));
 			result.success("删除成功!");
 			result.success("删除成功!");
 		}
 		}
 		return result;
 		return result;
@@ -159,16 +159,16 @@ public class CTopToutiaoAdvertiserController {
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "头条广告主信息-通过id查询")
-	@ApiOperation(value="头条广告主信息-通过id查询", notes="头条广告主信息-通过id查询")
+	@AutoLog(value = "今日头条广告主信息-通过id查询")
+	@ApiOperation(value = "今日头条广告主信息-通过id查询", notes = "今日头条广告主信息-通过id查询")
 	@GetMapping(value = "/queryById")
 	@GetMapping(value = "/queryById")
-	public Result<CTopToutiaoAdvertiser> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<CTopToutiaoAdvertiser> result = new Result<CTopToutiaoAdvertiser>();
-		CTopToutiaoAdvertiser cTopToutiaoAdvertiser = cTopToutiaoAdvertiserService.getById(id);
-		if(cTopToutiaoAdvertiser==null) {
+	public Result<ByteDanceAdvertiser> queryById(@RequestParam(name = "id", required = true) String id) {
+		Result<ByteDanceAdvertiser> result = new Result<ByteDanceAdvertiser>();
+		ByteDanceAdvertiser byteDanceAdvertiser = byteDanceAdvertiserService.getById(id);
+		if (byteDanceAdvertiser == null) {
 			result.error500("未找到对应实体");
 			result.error500("未找到对应实体");
 		}else {
 		}else {
-			result.setResult(cTopToutiaoAdvertiser);
+			result.setResult(byteDanceAdvertiser);
 			result.setSuccess(true);
 			result.setSuccess(true);
 		}
 		}
 		return result;
 		return result;
@@ -183,13 +183,13 @@ public class CTopToutiaoAdvertiserController {
   @RequestMapping(value = "/exportXls")
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
   public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
       // Step.1 组装查询条件
       // Step.1 组装查询条件
-      QueryWrapper<CTopToutiaoAdvertiser> queryWrapper = null;
+	  QueryWrapper<ByteDanceAdvertiser> queryWrapper = null;
       try {
       try {
           String paramsStr = request.getParameter("paramsStr");
           String paramsStr = request.getParameter("paramsStr");
           if (oConvertUtils.isNotEmpty(paramsStr)) {
           if (oConvertUtils.isNotEmpty(paramsStr)) {
               String deString = URLDecoder.decode(paramsStr, "UTF-8");
               String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              CTopToutiaoAdvertiser cTopToutiaoAdvertiser = JSON.parseObject(deString, CTopToutiaoAdvertiser.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(cTopToutiaoAdvertiser, request.getParameterMap());
+			  ByteDanceAdvertiser byteDanceAdvertiser = JSON.parseObject(deString, ByteDanceAdvertiser.class);
+			  queryWrapper = QueryGenerator.initQueryWrapper(byteDanceAdvertiser, request.getParameterMap());
           }
           }
       } catch (UnsupportedEncodingException e) {
       } catch (UnsupportedEncodingException e) {
           e.printStackTrace();
           e.printStackTrace();
@@ -197,11 +197,11 @@ public class CTopToutiaoAdvertiserController {
 
 
       //Step.2 AutoPoi 导出Excel
       //Step.2 AutoPoi 导出Excel
       ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
       ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<CTopToutiaoAdvertiser> pageList = cTopToutiaoAdvertiserService.list(queryWrapper);
+	  List<ByteDanceAdvertiser> pageList = byteDanceAdvertiserService.list(queryWrapper);
       //导出文件名称
       //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "头条广告主信息列表");
-      mv.addObject(NormalExcelConstants.CLASS, CTopToutiaoAdvertiser.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("头条广告主信息列表数据", "导出人:Jeecg", "导出信息"));
+	  mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条广告主信息列表");
+	  mv.addObject(NormalExcelConstants.CLASS, ByteDanceAdvertiser.class);
+	  mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("今日头条广告主信息列表数据", "导出人:Jeecg", "导出信息"));
       mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
       mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
       return mv;
       return mv;
   }
   }
@@ -224,9 +224,9 @@ public class CTopToutiaoAdvertiserController {
           params.setHeadRows(1);
           params.setHeadRows(1);
           params.setNeedSave(true);
           params.setNeedSave(true);
           try {
           try {
-              List<CTopToutiaoAdvertiser> listCTopToutiaoAdvertisers = ExcelImportUtil.importExcel(file.getInputStream(), CTopToutiaoAdvertiser.class, params);
-              cTopToutiaoAdvertiserService.saveBatch(listCTopToutiaoAdvertisers);
-              return Result.ok("文件导入成功!数据行数:" + listCTopToutiaoAdvertisers.size());
+			  List<ByteDanceAdvertiser> listByteDanceAdvertisers = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceAdvertiser.class, params);
+			  byteDanceAdvertiserService.saveBatch(listByteDanceAdvertisers);
+			  return Result.ok("文件导入成功!数据行数:" + listByteDanceAdvertisers.size());
           } catch (Exception e) {
           } catch (Exception e) {
               log.error(e.getMessage(),e);
               log.error(e.getMessage(),e);
               return Result.error("文件导入失败:"+e.getMessage());
               return Result.error("文件导入失败:"+e.getMessage());

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

@@ -5,26 +5,26 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.ctop.entity.ByteDanceBudgetTemplate;
+import org.jeecg.modules.ctop.service.IByteDanceBudgetTemplateService;
 import org.jeecg.modules.ctop.service.ITouTiaoAdvertiserService;
 import org.jeecg.modules.ctop.service.ITouTiaoAdvertiserService;
 import org.jeecg.modules.system.entity.SysDictItem;
 import org.jeecg.modules.system.entity.SysDictItem;
 import org.jeecg.modules.system.service.ISysDictItemService;
 import org.jeecg.modules.system.service.ISysDictItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 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 org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
 
 
 /**
 /**
- * 头条广告主相关 2019年7月10日14:13:04 @author 宋英豪
+ * 头条广告主相关 2019年7月10日14:13:04
+ * @author 宋英豪
  */
  */
-@Controller
+@RestController
 @RequestMapping("toutiao")
 @RequestMapping("toutiao")
-public class TouTiaoAdvertiserController {
+public class ByteDanceAdvertiserPostController {
     @Autowired
     @Autowired
     private ITouTiaoAdvertiserService touTiaoAdvertiserService;
     private ITouTiaoAdvertiserService touTiaoAdvertiserService;
 
 
@@ -32,7 +32,6 @@ public class TouTiaoAdvertiserController {
      * 1:获取广告主信息 @param accountId 本平台广告主id
      * 1:获取广告主信息 @param accountId 本平台广告主id
      */
      */
     @RequestMapping("/advertiser/info")
     @RequestMapping("/advertiser/info")
-    @ResponseBody
     public Map<String, Object> advertiserInfo(String accountId) {
     public Map<String, Object> advertiserInfo(String accountId) {
         return touTiaoAdvertiserService.getAdvertiserInfo(accountId);
         return touTiaoAdvertiserService.getAdvertiserInfo(accountId);
     }
     }
@@ -41,7 +40,6 @@ public class TouTiaoAdvertiserController {
      * 2:获取广告主广告计划信息 @param accountId 本平台广告主id
      * 2:获取广告主广告计划信息 @param accountId 本平台广告主id
      */
      */
     @RequestMapping("/advertiser/plan/get")
     @RequestMapping("/advertiser/plan/get")
-    @ResponseBody
     public Map<String, Object> advertiserPlan(String accountId, String ids) {
     public Map<String, Object> advertiserPlan(String accountId, String ids) {
         return touTiaoAdvertiserService.getAdvertiserPlan(accountId, ids);
         return touTiaoAdvertiserService.getAdvertiserPlan(accountId, ids);
     }
     }
@@ -50,7 +48,6 @@ public class TouTiaoAdvertiserController {
      * 3:修改广告计划信息状态 @param accountId 本平台广告主id
      * 3:修改广告计划信息状态 @param accountId 本平台广告主id
      */
      */
     @RequestMapping("/advertiser/plan/update/status")
     @RequestMapping("/advertiser/plan/update/status")
-    @ResponseBody
     public Map<String, Object> advertiserPlanUpdateStatus(String accountId, String adIds, String optStatus) {
     public Map<String, Object> advertiserPlanUpdateStatus(String accountId, String adIds, String optStatus) {
         return touTiaoAdvertiserService.advertiserPlanUpdateStatus(accountId, adIds, optStatus);
         return touTiaoAdvertiserService.advertiserPlanUpdateStatus(accountId, adIds, optStatus);
     }
     }
@@ -59,7 +56,6 @@ public class TouTiaoAdvertiserController {
      * 3:修改广告计划信息状态 @param accountId 本平台广告主id
      * 3:修改广告计划信息状态 @param accountId 本平台广告主id
      */
      */
     @RequestMapping("/advertiser/plan/update/bid")
     @RequestMapping("/advertiser/plan/update/bid")
-    @ResponseBody
     public Map<String, Object> advertiserPlanUpdateBid(String accountId, String adIds, String bids) {
     public Map<String, Object> advertiserPlanUpdateBid(String accountId, String adIds, String bids) {
         return touTiaoAdvertiserService.advertiserPlanUpdateBid(accountId, adIds, bids);
         return touTiaoAdvertiserService.advertiserPlanUpdateBid(accountId, adIds, bids);
     }
     }
@@ -68,7 +64,6 @@ public class TouTiaoAdvertiserController {
      * 3:修改广告计划信息状态 @param accountId 本平台广告主id
      * 3:修改广告计划信息状态 @param accountId 本平台广告主id
      */
      */
     @RequestMapping("/advertiser/plan/update/budget")
     @RequestMapping("/advertiser/plan/update/budget")
-    @ResponseBody
     public Map<String, Object> advertiserPlanUpdateBudget(String accountId, String adIds, String budgets) {
     public Map<String, Object> advertiserPlanUpdateBudget(String accountId, String adIds, String budgets) {
         return touTiaoAdvertiserService.advertiserPlanUpdateBudget(accountId, adIds, budgets);
         return touTiaoAdvertiserService.advertiserPlanUpdateBudget(accountId, adIds, budgets);
     }
     }
@@ -77,7 +72,6 @@ public class TouTiaoAdvertiserController {
      * 4:获取广告主广告预算信息 @param accountId 本平台广告主id
      * 4:获取广告主广告预算信息 @param accountId 本平台广告主id
      */
      */
     @RequestMapping("/advertiser/budget/get/")
     @RequestMapping("/advertiser/budget/get/")
-    @ResponseBody
     public Map<String, Object> advertiserBudget(String accountId) {
     public Map<String, Object> advertiserBudget(String accountId) {
         return touTiaoAdvertiserService.getAdvertiserBudget(accountId);
         return touTiaoAdvertiserService.getAdvertiserBudget(accountId);
     }
     }
@@ -86,7 +80,6 @@ public class TouTiaoAdvertiserController {
      * 3:获取广告主广告组信息 @param accountId 本平台广告主id
      * 3:获取广告主广告组信息 @param accountId 本平台广告主id
      */
      */
     @RequestMapping("/advertiser/campaign/get")
     @RequestMapping("/advertiser/campaign/get")
-    @ResponseBody
     public Map<String, Object> advertiserCampaign(String accountId, String ids) {
     public Map<String, Object> advertiserCampaign(String accountId, String ids) {
         return touTiaoAdvertiserService.getAdvertiserCampaign(accountId, ids);
         return touTiaoAdvertiserService.getAdvertiserCampaign(accountId, ids);
     }
     }
@@ -95,7 +88,6 @@ public class TouTiaoAdvertiserController {
      * 5:获取广告主广告创意信息 @param accountId 本平台广告主id
      * 5:获取广告主广告创意信息 @param accountId 本平台广告主id
      */
      */
     @RequestMapping("/advertiser/creative/get")
     @RequestMapping("/advertiser/creative/get")
-    @ResponseBody
     public Map<String, Object> getAdvertiserCreative(String accountId, String ids) {
     public Map<String, Object> getAdvertiserCreative(String accountId, String ids) {
         return touTiaoAdvertiserService.getAdvertiserCreative(accountId, ids);
         return touTiaoAdvertiserService.getAdvertiserCreative(accountId, ids);
     }
     }
@@ -104,7 +96,6 @@ public class TouTiaoAdvertiserController {
      * 5:修改广告创意信息状态 @param accountId 本平台广告主id
      * 5:修改广告创意信息状态 @param accountId 本平台广告主id
      */
      */
     @RequestMapping("/advertiser/update/status/")
     @RequestMapping("/advertiser/update/status/")
-    @ResponseBody
     public Map<String, Object> advertiserCreativeUpdateStatus(String accountId, String creativeIds, String optStatus) {
     public Map<String, Object> advertiserCreativeUpdateStatus(String accountId, String creativeIds, String optStatus) {
         return touTiaoAdvertiserService.advertiserCreativeUpdateStatus(accountId, creativeIds, optStatus);
         return touTiaoAdvertiserService.advertiserCreativeUpdateStatus(accountId, creativeIds, optStatus);
     }
     }
@@ -113,7 +104,6 @@ public class TouTiaoAdvertiserController {
      * 6:获取广告主广告创意素材信息 @param accountId 本平台广告主id @param creativeIds 广告创意id
      * 6:获取广告主广告创意素材信息 @param accountId 本平台广告主id @param creativeIds 广告创意id
      */
      */
     @RequestMapping("/advertiser/creative/material/read")
     @RequestMapping("/advertiser/creative/material/read")
-    @ResponseBody
     public Map<String, Object> advertiserCreativeMaterial(String accountId, String creativeIds) {
     public Map<String, Object> advertiserCreativeMaterial(String accountId, String creativeIds) {
         return touTiaoAdvertiserService.getAdvertiserCreativeMaterial(accountId, creativeIds);
         return touTiaoAdvertiserService.getAdvertiserCreativeMaterial(accountId, creativeIds);
     }
     }
@@ -122,7 +112,6 @@ public class TouTiaoAdvertiserController {
      * 7:创建广告组信息 @param accountId 本平台广告主id
      * 7:创建广告组信息 @param accountId 本平台广告主id
      */
      */
     @RequestMapping("/advertiser/campaign/create")
     @RequestMapping("/advertiser/campaign/create")
-    @ResponseBody
     public Map<String, Object> advertiserCampaignCreate(String accountId, String campaignName, String budgetMode, Integer budget, String landingType) {
     public Map<String, Object> advertiserCampaignCreate(String accountId, String campaignName, String budgetMode, Integer budget, String landingType) {
         return touTiaoAdvertiserService.advertiserCampaignCreate(accountId, campaignName, budgetMode, budget, landingType);
         return touTiaoAdvertiserService.advertiserCampaignCreate(accountId, campaignName, budgetMode, budget, landingType);
     }
     }
@@ -131,7 +120,6 @@ public class TouTiaoAdvertiserController {
      * 7:广告组更新状态信息 @param accountId 本平台广告主id
      * 7:广告组更新状态信息 @param accountId 本平台广告主id
      */
      */
     @RequestMapping("/advertiser/campaign/update/status")
     @RequestMapping("/advertiser/campaign/update/status")
-    @ResponseBody
     public Map<String, Object> advertiserCampaignUpdateStatus(String accountId, String campaignIds, String optStatus) {
     public Map<String, Object> advertiserCampaignUpdateStatus(String accountId, String campaignIds, String optStatus) {
         return touTiaoAdvertiserService.advertiserCampaignUpdateStatus(accountId, campaignIds, optStatus);
         return touTiaoAdvertiserService.advertiserCampaignUpdateStatus(accountId, campaignIds, optStatus);
     }
     }
@@ -140,7 +128,6 @@ public class TouTiaoAdvertiserController {
      * 8:广告组更新信息 @param accountId 本平台广告主id
      * 8:广告组更新信息 @param accountId 本平台广告主id
      */
      */
     @RequestMapping("/advertiser/campaign/update")
     @RequestMapping("/advertiser/campaign/update")
-    @ResponseBody
     public Map<String, Object> advertiserCampaignUpdate(String accountId, Long campaignId, String budgetMode, Integer budget, String campaignName) {
     public Map<String, Object> advertiserCampaignUpdate(String accountId, Long campaignId, String budgetMode, Integer budget, String campaignName) {
         return touTiaoAdvertiserService.advertiserCampaignUpdate(accountId, campaignId, budgetMode, budget, campaignName);
         return touTiaoAdvertiserService.advertiserCampaignUpdate(accountId, campaignId, budgetMode, budget, campaignName);
     }
     }
@@ -153,8 +140,7 @@ public class TouTiaoAdvertiserController {
      * @param req
      * @param req
      * @return
      * @return
      */
      */
-    @RequestMapping(value = "dictItem/list", method = RequestMethod.GET)
-    @ResponseBody
+    @RequestMapping(value = "dictitem/list", method = RequestMethod.GET)
     public Result<IPage<SysDictItem>> queryPageList(SysDictItem sysDictItem, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
     public Result<IPage<SysDictItem>> queryPageList(SysDictItem sysDictItem, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                     @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
                                                     @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
         Result<IPage<SysDictItem>> result = new Result<IPage<SysDictItem>>();
         Result<IPage<SysDictItem>> result = new Result<IPage<SysDictItem>>();
@@ -168,38 +154,18 @@ public class TouTiaoAdvertiserController {
     }
     }
 
 
     /**
     /**
-     *
-     * @param setBidType
-     * @param setFlowControlMode
-     * @param setBudgetPrice
-     * @param setBudgetMode
-     * @param setFlowDate
-     * @param setDateFlowRange
-     * @param setDateQuantum
-     * @param setPriceType
-     * @param setConvertPrice
-     * @param setFilterType
-     * @param setDateQuantumRange
+     * @param template
      * @param req
      * @param req
      * @return
      * @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;
+    @RequestMapping(value = "budget/template/insert", method = RequestMethod.GET)
+    public Map<String, Object> budgetModelInsert(@RequestBody ByteDanceBudgetTemplate template, HttpServletRequest req) {
+        return budgetTemplateService.insertTemplate(template);
     }
     }
 
 
+
+    @Autowired
+    private IByteDanceBudgetTemplateService budgetTemplateService;
     @Autowired
     @Autowired
     private ISysDictItemService sysDictItemService;
     private ISysDictItemService sysDictItemService;
 }
 }

+ 58 - 58
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CTopToutiaoAdvertisePlanController.java

@@ -12,8 +12,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.CTopToutiaoAdvertisePlan;
-import org.jeecg.modules.ctop.service.ICTopToutiaoAdvertisePlanService;
+import org.jeecg.modules.ctop.entity.ByteDanceBudgetTemplate;
+import org.jeecg.modules.ctop.service.IByteDanceBudgetTemplateService;
 import java.util.Date;
 import java.util.Date;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -36,38 +36,38 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 
 
  /**
  /**
- * @Description: 头条广告主广告计划信息
+  * @Description: 今日头条预算模板信息
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-07-10
+  * @Date: 2019-07-22
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 @Slf4j
 @Slf4j
-@Api(tags="头条广告主广告计划信息")
+@Api(tags = "今日头条预算模板信息")
 @RestController
 @RestController
-@RequestMapping("/ctop/cTopToutiaoAdvertisePlan")
-public class CTopToutiaoAdvertisePlanController {
+@RequestMapping("/ctop/byteDanceBudgetTemplate")
+public class ByteDanceBudgetTemplateController {
 	@Autowired
 	@Autowired
-	private ICTopToutiaoAdvertisePlanService cTopToutiaoAdvertisePlanService;
+    private IByteDanceBudgetTemplateService byteDanceBudgetTemplateService;
 	
 	
 	/**
 	/**
 	  * 分页列表查询
 	  * 分页列表查询
-	 * @param cTopToutiaoAdvertisePlan
+     * @param byteDanceBudgetTemplate
 	 * @param pageNo
 	 * @param pageNo
 	 * @param pageSize
 	 * @param pageSize
 	 * @param req
 	 * @param req
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "头条广告主广告计划信息-分页列表查询")
-	@ApiOperation(value="头条广告主广告计划信息-分页列表查询", notes="头条广告主广告计划信息-分页列表查询")
+    @AutoLog(value = "今日头条预算模板信息-分页列表查询")
+    @ApiOperation(value = "今日头条预算模板信息-分页列表查询", notes = "今日头条预算模板信息-分页列表查询")
 	@GetMapping(value = "/list")
 	@GetMapping(value = "/list")
-	public Result<IPage<CTopToutiaoAdvertisePlan>> queryPageList(CTopToutiaoAdvertisePlan cTopToutiaoAdvertisePlan,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<CTopToutiaoAdvertisePlan>> result = new Result<IPage<CTopToutiaoAdvertisePlan>>();
-		QueryWrapper<CTopToutiaoAdvertisePlan> queryWrapper = QueryGenerator.initQueryWrapper(cTopToutiaoAdvertisePlan, req.getParameterMap());
-		Page<CTopToutiaoAdvertisePlan> page = new Page<CTopToutiaoAdvertisePlan>(pageNo, pageSize);
-		IPage<CTopToutiaoAdvertisePlan> pageList = cTopToutiaoAdvertisePlanService.page(page, queryWrapper);
+    public Result<IPage<ByteDanceBudgetTemplate>> queryPageList(ByteDanceBudgetTemplate byteDanceBudgetTemplate,
+                                                                @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                                @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                                HttpServletRequest req) {
+        Result<IPage<ByteDanceBudgetTemplate>> result = new Result<IPage<ByteDanceBudgetTemplate>>();
+        QueryWrapper<ByteDanceBudgetTemplate> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceBudgetTemplate, req.getParameterMap());
+        Page<ByteDanceBudgetTemplate> page = new Page<ByteDanceBudgetTemplate>(pageNo, pageSize);
+        IPage<ByteDanceBudgetTemplate> pageList = byteDanceBudgetTemplateService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		result.setResult(pageList);
 		return result;
 		return result;
@@ -75,16 +75,16 @@ public class CTopToutiaoAdvertisePlanController {
 	
 	
 	/**
 	/**
 	  *   添加
 	  *   添加
-	 * @param cTopToutiaoAdvertisePlan
+     * @param byteDanceBudgetTemplate
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "头条广告主广告计划信息-添加")
-	@ApiOperation(value="头条广告主广告计划信息-添加", notes="头条广告主广告计划信息-添加")
+    @AutoLog(value = "今日头条预算模板信息-添加")
+    @ApiOperation(value = "今日头条预算模板信息-添加", notes = "今日头条预算模板信息-添加")
 	@PostMapping(value = "/add")
 	@PostMapping(value = "/add")
-	public Result<CTopToutiaoAdvertisePlan> add(@RequestBody CTopToutiaoAdvertisePlan cTopToutiaoAdvertisePlan) {
-		Result<CTopToutiaoAdvertisePlan> result = new Result<CTopToutiaoAdvertisePlan>();
+    public Result<ByteDanceBudgetTemplate> add(@RequestBody ByteDanceBudgetTemplate byteDanceBudgetTemplate) {
+        Result<ByteDanceBudgetTemplate> result = new Result<ByteDanceBudgetTemplate>();
 		try {
 		try {
-			cTopToutiaoAdvertisePlanService.save(cTopToutiaoAdvertisePlan);
+            byteDanceBudgetTemplateService.save(byteDanceBudgetTemplate);
 			result.success("添加成功!");
 			result.success("添加成功!");
 		} catch (Exception e) {
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
 			log.error(e.getMessage(),e);
@@ -95,19 +95,19 @@ public class CTopToutiaoAdvertisePlanController {
 	
 	
 	/**
 	/**
 	  *  编辑
 	  *  编辑
-	 * @param cTopToutiaoAdvertisePlan
+     * @param byteDanceBudgetTemplate
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "头条广告主广告计划信息-编辑")
-	@ApiOperation(value="头条广告主广告计划信息-编辑", notes="头条广告主广告计划信息-编辑")
+    @AutoLog(value = "今日头条预算模板信息-编辑")
+    @ApiOperation(value = "今日头条预算模板信息-编辑", notes = "今日头条预算模板信息-编辑")
 	@PutMapping(value = "/edit")
 	@PutMapping(value = "/edit")
-	public Result<CTopToutiaoAdvertisePlan> edit(@RequestBody CTopToutiaoAdvertisePlan cTopToutiaoAdvertisePlan) {
-		Result<CTopToutiaoAdvertisePlan> result = new Result<CTopToutiaoAdvertisePlan>();
-		CTopToutiaoAdvertisePlan cTopToutiaoAdvertisePlanEntity = cTopToutiaoAdvertisePlanService.getById(cTopToutiaoAdvertisePlan.getId());
-		if(cTopToutiaoAdvertisePlanEntity==null) {
+    public Result<ByteDanceBudgetTemplate> edit(@RequestBody ByteDanceBudgetTemplate byteDanceBudgetTemplate) {
+        Result<ByteDanceBudgetTemplate> result = new Result<ByteDanceBudgetTemplate>();
+        ByteDanceBudgetTemplate byteDanceBudgetTemplateEntity = byteDanceBudgetTemplateService.getById(byteDanceBudgetTemplate.getId());
+        if (byteDanceBudgetTemplateEntity == null) {
 			result.error500("未找到对应实体");
 			result.error500("未找到对应实体");
 		}else {
 		}else {
-			boolean ok = cTopToutiaoAdvertisePlanService.updateById(cTopToutiaoAdvertisePlan);
+            boolean ok = byteDanceBudgetTemplateService.updateById(byteDanceBudgetTemplate);
 			//TODO 返回false说明什么?
 			//TODO 返回false说明什么?
 			if(ok) {
 			if(ok) {
 				result.success("修改成功!");
 				result.success("修改成功!");
@@ -122,12 +122,12 @@ public class CTopToutiaoAdvertisePlanController {
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "头条广告主广告计划信息-通过id删除")
-	@ApiOperation(value="头条广告主广告计划信息-通过id删除", notes="头条广告主广告计划信息-通过id删除")
+    @AutoLog(value = "今日头条预算模板信息-通过id删除")
+    @ApiOperation(value = "今日头条预算模板信息-通过id删除", notes = "今日头条预算模板信息-通过id删除")
 	@DeleteMapping(value = "/delete")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		try {
 		try {
-			cTopToutiaoAdvertisePlanService.removeById(id);
+            byteDanceBudgetTemplateService.removeById(id);
 		} catch (Exception e) {
 		} catch (Exception e) {
 			log.error("删除失败",e.getMessage());
 			log.error("删除失败",e.getMessage());
 			return Result.error("删除失败!");
 			return Result.error("删除失败!");
@@ -140,15 +140,15 @@ public class CTopToutiaoAdvertisePlanController {
 	 * @param ids
 	 * @param ids
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "头条广告主广告计划信息-批量删除")
-	@ApiOperation(value="头条广告主广告计划信息-批量删除", notes="头条广告主广告计划信息-批量删除")
+    @AutoLog(value = "今日头条预算模板信息-批量删除")
+    @ApiOperation(value = "今日头条预算模板信息-批量删除", notes = "今日头条预算模板信息-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
-	public Result<CTopToutiaoAdvertisePlan> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<CTopToutiaoAdvertisePlan> result = new Result<CTopToutiaoAdvertisePlan>();
+    public Result<ByteDanceBudgetTemplate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<ByteDanceBudgetTemplate> result = new Result<ByteDanceBudgetTemplate>();
 		if(ids==null || "".equals(ids.trim())) {
 		if(ids==null || "".equals(ids.trim())) {
 			result.error500("参数不识别!");
 			result.error500("参数不识别!");
 		}else {
 		}else {
-			this.cTopToutiaoAdvertisePlanService.removeByIds(Arrays.asList(ids.split(",")));
+            this.byteDanceBudgetTemplateService.removeByIds(Arrays.asList(ids.split(",")));
 			result.success("删除成功!");
 			result.success("删除成功!");
 		}
 		}
 		return result;
 		return result;
@@ -159,16 +159,16 @@ public class CTopToutiaoAdvertisePlanController {
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "头条广告主广告计划信息-通过id查询")
-	@ApiOperation(value="头条广告主广告计划信息-通过id查询", notes="头条广告主广告计划信息-通过id查询")
+    @AutoLog(value = "今日头条预算模板信息-通过id查询")
+    @ApiOperation(value = "今日头条预算模板信息-通过id查询", notes = "今日头条预算模板信息-通过id查询")
 	@GetMapping(value = "/queryById")
 	@GetMapping(value = "/queryById")
-	public Result<CTopToutiaoAdvertisePlan> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<CTopToutiaoAdvertisePlan> result = new Result<CTopToutiaoAdvertisePlan>();
-		CTopToutiaoAdvertisePlan cTopToutiaoAdvertisePlan = cTopToutiaoAdvertisePlanService.getById(id);
-		if(cTopToutiaoAdvertisePlan==null) {
+    public Result<ByteDanceBudgetTemplate> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<ByteDanceBudgetTemplate> result = new Result<ByteDanceBudgetTemplate>();
+        ByteDanceBudgetTemplate byteDanceBudgetTemplate = byteDanceBudgetTemplateService.getById(id);
+        if (byteDanceBudgetTemplate == null) {
 			result.error500("未找到对应实体");
 			result.error500("未找到对应实体");
 		}else {
 		}else {
-			result.setResult(cTopToutiaoAdvertisePlan);
+            result.setResult(byteDanceBudgetTemplate);
 			result.setSuccess(true);
 			result.setSuccess(true);
 		}
 		}
 		return result;
 		return result;
@@ -183,13 +183,13 @@ public class CTopToutiaoAdvertisePlanController {
   @RequestMapping(value = "/exportXls")
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
   public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
       // Step.1 组装查询条件
       // Step.1 组装查询条件
-      QueryWrapper<CTopToutiaoAdvertisePlan> queryWrapper = null;
+      QueryWrapper<ByteDanceBudgetTemplate> queryWrapper = null;
       try {
       try {
           String paramsStr = request.getParameter("paramsStr");
           String paramsStr = request.getParameter("paramsStr");
           if (oConvertUtils.isNotEmpty(paramsStr)) {
           if (oConvertUtils.isNotEmpty(paramsStr)) {
               String deString = URLDecoder.decode(paramsStr, "UTF-8");
               String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              CTopToutiaoAdvertisePlan cTopToutiaoAdvertisePlan = JSON.parseObject(deString, CTopToutiaoAdvertisePlan.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(cTopToutiaoAdvertisePlan, request.getParameterMap());
+              ByteDanceBudgetTemplate byteDanceBudgetTemplate = JSON.parseObject(deString, ByteDanceBudgetTemplate.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(byteDanceBudgetTemplate, request.getParameterMap());
           }
           }
       } catch (UnsupportedEncodingException e) {
       } catch (UnsupportedEncodingException e) {
           e.printStackTrace();
           e.printStackTrace();
@@ -197,11 +197,11 @@ public class CTopToutiaoAdvertisePlanController {
 
 
       //Step.2 AutoPoi 导出Excel
       //Step.2 AutoPoi 导出Excel
       ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
       ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<CTopToutiaoAdvertisePlan> pageList = cTopToutiaoAdvertisePlanService.list(queryWrapper);
+      List<ByteDanceBudgetTemplate> pageList = byteDanceBudgetTemplateService.list(queryWrapper);
       //导出文件名称
       //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "头条广告主广告计划信息列表");
-      mv.addObject(NormalExcelConstants.CLASS, CTopToutiaoAdvertisePlan.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("头条广告主广告计划信息列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条预算模板信息列表");
+      mv.addObject(NormalExcelConstants.CLASS, ByteDanceBudgetTemplate.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("今日头条预算模板信息列表数据", "导出人:Jeecg", "导出信息"));
       mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
       mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
       return mv;
       return mv;
   }
   }
@@ -224,9 +224,9 @@ public class CTopToutiaoAdvertisePlanController {
           params.setHeadRows(1);
           params.setHeadRows(1);
           params.setNeedSave(true);
           params.setNeedSave(true);
           try {
           try {
-              List<CTopToutiaoAdvertisePlan> listCTopToutiaoAdvertisePlans = ExcelImportUtil.importExcel(file.getInputStream(), CTopToutiaoAdvertisePlan.class, params);
-              cTopToutiaoAdvertisePlanService.saveBatch(listCTopToutiaoAdvertisePlans);
-              return Result.ok("文件导入成功!数据行数:" + listCTopToutiaoAdvertisePlans.size());
+              List<ByteDanceBudgetTemplate> listByteDanceBudgetTemplates = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceBudgetTemplate.class, params);
+              byteDanceBudgetTemplateService.saveBatch(listByteDanceBudgetTemplates);
+              return Result.ok("文件导入成功!数据行数:" + listByteDanceBudgetTemplates.size());
           } catch (Exception e) {
           } catch (Exception e) {
               log.error(e.getMessage(),e);
               log.error(e.getMessage(),e);
               return Result.error("文件导入失败:"+e.getMessage());
               return Result.error("文件导入失败:"+e.getMessage());

+ 58 - 58
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ToutiaoCreativeController.java

@@ -12,8 +12,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.ToutiaoCreative;
-import org.jeecg.modules.ctop.service.IToutiaoCreativeService;
+import org.jeecg.modules.ctop.entity.ByteDanceCampaign;
+import org.jeecg.modules.ctop.service.IByteDanceCampaignService;
 import java.util.Date;
 import java.util.Date;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -36,38 +36,38 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 
 
  /**
  /**
- * @Description: 广告创意信息
+  * @Description: 今日头条广告组信息
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-07-11
+  * @Date: 2019-07-22
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 @Slf4j
 @Slf4j
-@Api(tags="广告创意信息")
+@Api(tags = "今日头条广告组信息")
 @RestController
 @RestController
-@RequestMapping("/ctop/toutiaoCreative")
-public class ToutiaoCreativeController {
+@RequestMapping("/ctop/byteDanceCampaign")
+public class ByteDanceCampaignController {
 	@Autowired
 	@Autowired
-	private IToutiaoCreativeService toutiaoCreativeService;
+    private IByteDanceCampaignService byteDanceCampaignService;
 	
 	
 	/**
 	/**
 	  * 分页列表查询
 	  * 分页列表查询
-	 * @param toutiaoCreative
+     * @param byteDanceCampaign
 	 * @param pageNo
 	 * @param pageNo
 	 * @param pageSize
 	 * @param pageSize
 	 * @param req
 	 * @param req
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "广告创意信息-分页列表查询")
-	@ApiOperation(value="广告创意信息-分页列表查询", notes="广告创意信息-分页列表查询")
+    @AutoLog(value = "今日头条广告组信息-分页列表查询")
+    @ApiOperation(value = "今日头条广告组信息-分页列表查询", notes = "今日头条广告组信息-分页列表查询")
 	@GetMapping(value = "/list")
 	@GetMapping(value = "/list")
-	public Result<IPage<ToutiaoCreative>> queryPageList(ToutiaoCreative toutiaoCreative,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<ToutiaoCreative>> result = new Result<IPage<ToutiaoCreative>>();
-		QueryWrapper<ToutiaoCreative> queryWrapper = QueryGenerator.initQueryWrapper(toutiaoCreative, req.getParameterMap());
-		Page<ToutiaoCreative> page = new Page<ToutiaoCreative>(pageNo, pageSize);
-		IPage<ToutiaoCreative> pageList = toutiaoCreativeService.page(page, queryWrapper);
+    public Result<IPage<ByteDanceCampaign>> queryPageList(ByteDanceCampaign byteDanceCampaign,
+                                                          @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                          @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                          HttpServletRequest req) {
+        Result<IPage<ByteDanceCampaign>> result = new Result<IPage<ByteDanceCampaign>>();
+        QueryWrapper<ByteDanceCampaign> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCampaign, req.getParameterMap());
+        Page<ByteDanceCampaign> page = new Page<ByteDanceCampaign>(pageNo, pageSize);
+        IPage<ByteDanceCampaign> pageList = byteDanceCampaignService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		result.setResult(pageList);
 		return result;
 		return result;
@@ -75,16 +75,16 @@ public class ToutiaoCreativeController {
 	
 	
 	/**
 	/**
 	  *   添加
 	  *   添加
-	 * @param toutiaoCreative
+     * @param byteDanceCampaign
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "广告创意信息-添加")
-	@ApiOperation(value="广告创意信息-添加", notes="广告创意信息-添加")
+    @AutoLog(value = "今日头条广告组信息-添加")
+    @ApiOperation(value = "今日头条广告组信息-添加", notes = "今日头条广告组信息-添加")
 	@PostMapping(value = "/add")
 	@PostMapping(value = "/add")
-	public Result<ToutiaoCreative> add(@RequestBody ToutiaoCreative toutiaoCreative) {
-		Result<ToutiaoCreative> result = new Result<ToutiaoCreative>();
+    public Result<ByteDanceCampaign> add(@RequestBody ByteDanceCampaign byteDanceCampaign) {
+        Result<ByteDanceCampaign> result = new Result<ByteDanceCampaign>();
 		try {
 		try {
-			toutiaoCreativeService.save(toutiaoCreative);
+            byteDanceCampaignService.save(byteDanceCampaign);
 			result.success("添加成功!");
 			result.success("添加成功!");
 		} catch (Exception e) {
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
 			log.error(e.getMessage(),e);
@@ -95,19 +95,19 @@ public class ToutiaoCreativeController {
 	
 	
 	/**
 	/**
 	  *  编辑
 	  *  编辑
-	 * @param toutiaoCreative
+     * @param byteDanceCampaign
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "广告创意信息-编辑")
-	@ApiOperation(value="广告创意信息-编辑", notes="广告创意信息-编辑")
+    @AutoLog(value = "今日头条广告组信息-编辑")
+    @ApiOperation(value = "今日头条广告组信息-编辑", notes = "今日头条广告组信息-编辑")
 	@PutMapping(value = "/edit")
 	@PutMapping(value = "/edit")
-	public Result<ToutiaoCreative> edit(@RequestBody ToutiaoCreative toutiaoCreative) {
-		Result<ToutiaoCreative> result = new Result<ToutiaoCreative>();
-		ToutiaoCreative toutiaoCreativeEntity = toutiaoCreativeService.getById(toutiaoCreative.getId());
-		if(toutiaoCreativeEntity==null) {
+    public Result<ByteDanceCampaign> edit(@RequestBody ByteDanceCampaign byteDanceCampaign) {
+        Result<ByteDanceCampaign> result = new Result<ByteDanceCampaign>();
+        ByteDanceCampaign byteDanceCampaignEntity = byteDanceCampaignService.getById(byteDanceCampaign.getId());
+        if (byteDanceCampaignEntity == null) {
 			result.error500("未找到对应实体");
 			result.error500("未找到对应实体");
 		}else {
 		}else {
-			boolean ok = toutiaoCreativeService.updateById(toutiaoCreative);
+            boolean ok = byteDanceCampaignService.updateById(byteDanceCampaign);
 			//TODO 返回false说明什么?
 			//TODO 返回false说明什么?
 			if(ok) {
 			if(ok) {
 				result.success("修改成功!");
 				result.success("修改成功!");
@@ -122,12 +122,12 @@ public class ToutiaoCreativeController {
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "广告创意信息-通过id删除")
-	@ApiOperation(value="广告创意信息-通过id删除", notes="广告创意信息-通过id删除")
+    @AutoLog(value = "今日头条广告组信息-通过id删除")
+    @ApiOperation(value = "今日头条广告组信息-通过id删除", notes = "今日头条广告组信息-通过id删除")
 	@DeleteMapping(value = "/delete")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		try {
 		try {
-			toutiaoCreativeService.removeById(id);
+            byteDanceCampaignService.removeById(id);
 		} catch (Exception e) {
 		} catch (Exception e) {
 			log.error("删除失败",e.getMessage());
 			log.error("删除失败",e.getMessage());
 			return Result.error("删除失败!");
 			return Result.error("删除失败!");
@@ -140,15 +140,15 @@ public class ToutiaoCreativeController {
 	 * @param ids
 	 * @param ids
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "广告创意信息-批量删除")
-	@ApiOperation(value="广告创意信息-批量删除", notes="广告创意信息-批量删除")
+    @AutoLog(value = "今日头条广告组信息-批量删除")
+    @ApiOperation(value = "今日头条广告组信息-批量删除", notes = "今日头条广告组信息-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
-	public Result<ToutiaoCreative> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<ToutiaoCreative> result = new Result<ToutiaoCreative>();
+    public Result<ByteDanceCampaign> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<ByteDanceCampaign> result = new Result<ByteDanceCampaign>();
 		if(ids==null || "".equals(ids.trim())) {
 		if(ids==null || "".equals(ids.trim())) {
 			result.error500("参数不识别!");
 			result.error500("参数不识别!");
 		}else {
 		}else {
-			this.toutiaoCreativeService.removeByIds(Arrays.asList(ids.split(",")));
+            this.byteDanceCampaignService.removeByIds(Arrays.asList(ids.split(",")));
 			result.success("删除成功!");
 			result.success("删除成功!");
 		}
 		}
 		return result;
 		return result;
@@ -159,16 +159,16 @@ public class ToutiaoCreativeController {
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "广告创意信息-通过id查询")
-	@ApiOperation(value="广告创意信息-通过id查询", notes="广告创意信息-通过id查询")
+    @AutoLog(value = "今日头条广告组信息-通过id查询")
+    @ApiOperation(value = "今日头条广告组信息-通过id查询", notes = "今日头条广告组信息-通过id查询")
 	@GetMapping(value = "/queryById")
 	@GetMapping(value = "/queryById")
-	public Result<ToutiaoCreative> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<ToutiaoCreative> result = new Result<ToutiaoCreative>();
-		ToutiaoCreative toutiaoCreative = toutiaoCreativeService.getById(id);
-		if(toutiaoCreative==null) {
+    public Result<ByteDanceCampaign> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<ByteDanceCampaign> result = new Result<ByteDanceCampaign>();
+        ByteDanceCampaign byteDanceCampaign = byteDanceCampaignService.getById(id);
+        if (byteDanceCampaign == null) {
 			result.error500("未找到对应实体");
 			result.error500("未找到对应实体");
 		}else {
 		}else {
-			result.setResult(toutiaoCreative);
+            result.setResult(byteDanceCampaign);
 			result.setSuccess(true);
 			result.setSuccess(true);
 		}
 		}
 		return result;
 		return result;
@@ -183,13 +183,13 @@ public class ToutiaoCreativeController {
   @RequestMapping(value = "/exportXls")
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
   public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
       // Step.1 组装查询条件
       // Step.1 组装查询条件
-      QueryWrapper<ToutiaoCreative> queryWrapper = null;
+      QueryWrapper<ByteDanceCampaign> queryWrapper = null;
       try {
       try {
           String paramsStr = request.getParameter("paramsStr");
           String paramsStr = request.getParameter("paramsStr");
           if (oConvertUtils.isNotEmpty(paramsStr)) {
           if (oConvertUtils.isNotEmpty(paramsStr)) {
               String deString = URLDecoder.decode(paramsStr, "UTF-8");
               String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              ToutiaoCreative toutiaoCreative = JSON.parseObject(deString, ToutiaoCreative.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(toutiaoCreative, request.getParameterMap());
+              ByteDanceCampaign byteDanceCampaign = JSON.parseObject(deString, ByteDanceCampaign.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCampaign, request.getParameterMap());
           }
           }
       } catch (UnsupportedEncodingException e) {
       } catch (UnsupportedEncodingException e) {
           e.printStackTrace();
           e.printStackTrace();
@@ -197,11 +197,11 @@ public class ToutiaoCreativeController {
 
 
       //Step.2 AutoPoi 导出Excel
       //Step.2 AutoPoi 导出Excel
       ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
       ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<ToutiaoCreative> pageList = toutiaoCreativeService.list(queryWrapper);
+      List<ByteDanceCampaign> pageList = byteDanceCampaignService.list(queryWrapper);
       //导出文件名称
       //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "广告创意信息列表");
-      mv.addObject(NormalExcelConstants.CLASS, ToutiaoCreative.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("广告创意信息列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条广告组信息列表");
+      mv.addObject(NormalExcelConstants.CLASS, ByteDanceCampaign.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("今日头条广告组信息列表数据", "导出人:Jeecg", "导出信息"));
       mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
       mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
       return mv;
       return mv;
   }
   }
@@ -224,9 +224,9 @@ public class ToutiaoCreativeController {
           params.setHeadRows(1);
           params.setHeadRows(1);
           params.setNeedSave(true);
           params.setNeedSave(true);
           try {
           try {
-              List<ToutiaoCreative> listToutiaoCreatives = ExcelImportUtil.importExcel(file.getInputStream(), ToutiaoCreative.class, params);
-              toutiaoCreativeService.saveBatch(listToutiaoCreatives);
-              return Result.ok("文件导入成功!数据行数:" + listToutiaoCreatives.size());
+              List<ByteDanceCampaign> listByteDanceCampaigns = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceCampaign.class, params);
+              byteDanceCampaignService.saveBatch(listByteDanceCampaigns);
+              return Result.ok("文件导入成功!数据行数:" + listByteDanceCampaigns.size());
           } catch (Exception e) {
           } catch (Exception e) {
               log.error(e.getMessage(),e);
               log.error(e.getMessage(),e);
               return Result.error("文件导入失败:"+e.getMessage());
               return Result.error("文件导入失败:"+e.getMessage());

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

@@ -0,0 +1,244 @@
+package org.jeecg.modules.ctop.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
+import org.jeecg.modules.ctop.service.IByteDanceCampaignTemplateService;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+  * @Description: 今日头条广告组模板信息
+ * @Author: jeecg-boot
+  * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags = "今日头条广告组模板信息")
+@RestController
+@RequestMapping("/ctop/byteDanceCampaignTemplate")
+public class ByteDanceCampaignTemplateController {
+	@Autowired
+    private IByteDanceCampaignTemplateService byteDanceCampaignTemplateService;
+	
+	/**
+	  * 分页列表查询
+     * @param byteDanceCampaignTemplate
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+    @AutoLog(value = "今日头条广告组模板信息-分页列表查询")
+    @ApiOperation(value = "今日头条广告组模板信息-分页列表查询", notes = "今日头条广告组模板信息-分页列表查询")
+	@GetMapping(value = "/list")
+    public Result<IPage<ByteDanceCampaignTemplate>> queryPageList(ByteDanceCampaignTemplate byteDanceCampaignTemplate,
+                                                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                                  HttpServletRequest req) {
+        Result<IPage<ByteDanceCampaignTemplate>> result = new Result<IPage<ByteDanceCampaignTemplate>>();
+        QueryWrapper<ByteDanceCampaignTemplate> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCampaignTemplate, req.getParameterMap());
+        Page<ByteDanceCampaignTemplate> page = new Page<ByteDanceCampaignTemplate>(pageNo, pageSize);
+        IPage<ByteDanceCampaignTemplate> pageList = byteDanceCampaignTemplateService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+     * @param byteDanceCampaignTemplate
+	 * @return
+	 */
+    @AutoLog(value = "今日头条广告组模板信息-添加")
+    @ApiOperation(value = "今日头条广告组模板信息-添加", notes = "今日头条广告组模板信息-添加")
+	@PostMapping(value = "/add")
+    public Result<ByteDanceCampaignTemplate> add(@RequestBody ByteDanceCampaignTemplate byteDanceCampaignTemplate) {
+        Result<ByteDanceCampaignTemplate> result = new Result<ByteDanceCampaignTemplate>();
+		try {
+            byteDanceCampaignTemplateService.save(byteDanceCampaignTemplate);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+     * @param byteDanceCampaignTemplate
+	 * @return
+	 */
+    @AutoLog(value = "今日头条广告组模板信息-编辑")
+    @ApiOperation(value = "今日头条广告组模板信息-编辑", notes = "今日头条广告组模板信息-编辑")
+	@PutMapping(value = "/edit")
+    public Result<ByteDanceCampaignTemplate> edit(@RequestBody ByteDanceCampaignTemplate byteDanceCampaignTemplate) {
+        Result<ByteDanceCampaignTemplate> result = new Result<ByteDanceCampaignTemplate>();
+        ByteDanceCampaignTemplate byteDanceCampaignTemplateEntity = byteDanceCampaignTemplateService.getById(byteDanceCampaignTemplate.getId());
+        if (byteDanceCampaignTemplateEntity == null) {
+			result.error500("未找到对应实体");
+		}else {
+            boolean ok = byteDanceCampaignTemplateService.updateById(byteDanceCampaignTemplate);
+			//TODO 返回false说明什么?
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+    @AutoLog(value = "今日头条广告组模板信息-通过id删除")
+    @ApiOperation(value = "今日头条广告组模板信息-通过id删除", notes = "今日头条广告组模板信息-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+            byteDanceCampaignTemplateService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+    @AutoLog(value = "今日头条广告组模板信息-批量删除")
+    @ApiOperation(value = "今日头条广告组模板信息-批量删除", notes = "今日头条广告组模板信息-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+    public Result<ByteDanceCampaignTemplate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<ByteDanceCampaignTemplate> result = new Result<ByteDanceCampaignTemplate>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+            this.byteDanceCampaignTemplateService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+    @AutoLog(value = "今日头条广告组模板信息-通过id查询")
+    @ApiOperation(value = "今日头条广告组模板信息-通过id查询", notes = "今日头条广告组模板信息-通过id查询")
+	@GetMapping(value = "/queryById")
+    public Result<ByteDanceCampaignTemplate> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<ByteDanceCampaignTemplate> result = new Result<ByteDanceCampaignTemplate>();
+        ByteDanceCampaignTemplate byteDanceCampaignTemplate = byteDanceCampaignTemplateService.getById(id);
+        if (byteDanceCampaignTemplate == null) {
+			result.error500("未找到对应实体");
+		}else {
+            result.setResult(byteDanceCampaignTemplate);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<ByteDanceCampaignTemplate> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              ByteDanceCampaignTemplate byteDanceCampaignTemplate = JSON.parseObject(deString, ByteDanceCampaignTemplate.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCampaignTemplate, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<ByteDanceCampaignTemplate> pageList = byteDanceCampaignTemplateService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条广告组模板信息列表");
+      mv.addObject(NormalExcelConstants.CLASS, ByteDanceCampaignTemplate.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("今日头条广告组模板信息列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+  /**
+      * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();// 获取上传文件对象
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<ByteDanceCampaignTemplate> listByteDanceCampaignTemplates = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceCampaignTemplate.class, params);
+              byteDanceCampaignTemplateService.saveBatch(listByteDanceCampaignTemplates);
+              return Result.ok("文件导入成功!数据行数:" + listByteDanceCampaignTemplates.size());
+          } catch (Exception e) {
+              log.error(e.getMessage(),e);
+              return Result.error("文件导入失败:"+e.getMessage());
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败!");
+  }
+
+}

+ 58 - 58
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CTopToutiaoCampaignController.java

@@ -12,8 +12,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.CTopToutiaoCampaign;
-import org.jeecg.modules.ctop.service.ICTopToutiaoCampaignService;
+import org.jeecg.modules.ctop.entity.ByteDanceCreative;
+import org.jeecg.modules.ctop.service.IByteDanceCreativeService;
 import java.util.Date;
 import java.util.Date;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -36,38 +36,38 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 
 
  /**
  /**
- * @Description: 头条广告主广告组信息
+  * @Description: 今日头条创意信息
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-07-10
+  * @Date: 2019-07-22
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 @Slf4j
 @Slf4j
-@Api(tags="头条广告主广告组信息")
+@Api(tags = "今日头条创意信息")
 @RestController
 @RestController
-@RequestMapping("/ctop/cTopToutiaoCampaign")
-public class CTopToutiaoCampaignController {
+@RequestMapping("/ctop/byteDanceCreative")
+public class ByteDanceCreativeController {
 	@Autowired
 	@Autowired
-	private ICTopToutiaoCampaignService cTopToutiaoCampaignService;
+    private IByteDanceCreativeService byteDanceCreativeService;
 	
 	
 	/**
 	/**
 	  * 分页列表查询
 	  * 分页列表查询
-	 * @param cTopToutiaoCampaign
+     * @param byteDanceCreative
 	 * @param pageNo
 	 * @param pageNo
 	 * @param pageSize
 	 * @param pageSize
 	 * @param req
 	 * @param req
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "头条广告主广告组信息-分页列表查询")
-	@ApiOperation(value="头条广告主广告组信息-分页列表查询", notes="头条广告主广告组信息-分页列表查询")
+    @AutoLog(value = "今日头条创意信息-分页列表查询")
+    @ApiOperation(value = "今日头条创意信息-分页列表查询", notes = "今日头条创意信息-分页列表查询")
 	@GetMapping(value = "/list")
 	@GetMapping(value = "/list")
-	public Result<IPage<CTopToutiaoCampaign>> queryPageList(CTopToutiaoCampaign cTopToutiaoCampaign,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<CTopToutiaoCampaign>> result = new Result<IPage<CTopToutiaoCampaign>>();
-		QueryWrapper<CTopToutiaoCampaign> queryWrapper = QueryGenerator.initQueryWrapper(cTopToutiaoCampaign, req.getParameterMap());
-		Page<CTopToutiaoCampaign> page = new Page<CTopToutiaoCampaign>(pageNo, pageSize);
-		IPage<CTopToutiaoCampaign> pageList = cTopToutiaoCampaignService.page(page, queryWrapper);
+    public Result<IPage<ByteDanceCreative>> queryPageList(ByteDanceCreative byteDanceCreative,
+                                                          @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                          @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                          HttpServletRequest req) {
+        Result<IPage<ByteDanceCreative>> result = new Result<IPage<ByteDanceCreative>>();
+        QueryWrapper<ByteDanceCreative> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCreative, req.getParameterMap());
+        Page<ByteDanceCreative> page = new Page<ByteDanceCreative>(pageNo, pageSize);
+        IPage<ByteDanceCreative> pageList = byteDanceCreativeService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		result.setResult(pageList);
 		return result;
 		return result;
@@ -75,16 +75,16 @@ public class CTopToutiaoCampaignController {
 	
 	
 	/**
 	/**
 	  *   添加
 	  *   添加
-	 * @param cTopToutiaoCampaign
+     * @param byteDanceCreative
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "头条广告主广告组信息-添加")
-	@ApiOperation(value="头条广告主广告组信息-添加", notes="头条广告主广告组信息-添加")
+    @AutoLog(value = "今日头条创意信息-添加")
+    @ApiOperation(value = "今日头条创意信息-添加", notes = "今日头条创意信息-添加")
 	@PostMapping(value = "/add")
 	@PostMapping(value = "/add")
-	public Result<CTopToutiaoCampaign> add(@RequestBody CTopToutiaoCampaign cTopToutiaoCampaign) {
-		Result<CTopToutiaoCampaign> result = new Result<CTopToutiaoCampaign>();
+    public Result<ByteDanceCreative> add(@RequestBody ByteDanceCreative byteDanceCreative) {
+        Result<ByteDanceCreative> result = new Result<ByteDanceCreative>();
 		try {
 		try {
-			cTopToutiaoCampaignService.save(cTopToutiaoCampaign);
+            byteDanceCreativeService.save(byteDanceCreative);
 			result.success("添加成功!");
 			result.success("添加成功!");
 		} catch (Exception e) {
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
 			log.error(e.getMessage(),e);
@@ -95,19 +95,19 @@ public class CTopToutiaoCampaignController {
 	
 	
 	/**
 	/**
 	  *  编辑
 	  *  编辑
-	 * @param cTopToutiaoCampaign
+     * @param byteDanceCreative
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "头条广告主广告组信息-编辑")
-	@ApiOperation(value="头条广告主广告组信息-编辑", notes="头条广告主广告组信息-编辑")
+    @AutoLog(value = "今日头条创意信息-编辑")
+    @ApiOperation(value = "今日头条创意信息-编辑", notes = "今日头条创意信息-编辑")
 	@PutMapping(value = "/edit")
 	@PutMapping(value = "/edit")
-	public Result<CTopToutiaoCampaign> edit(@RequestBody CTopToutiaoCampaign cTopToutiaoCampaign) {
-		Result<CTopToutiaoCampaign> result = new Result<CTopToutiaoCampaign>();
-		CTopToutiaoCampaign cTopToutiaoCampaignEntity = cTopToutiaoCampaignService.getById(cTopToutiaoCampaign.getId());
-		if(cTopToutiaoCampaignEntity==null) {
+    public Result<ByteDanceCreative> edit(@RequestBody ByteDanceCreative byteDanceCreative) {
+        Result<ByteDanceCreative> result = new Result<ByteDanceCreative>();
+        ByteDanceCreative byteDanceCreativeEntity = byteDanceCreativeService.getById(byteDanceCreative.getId());
+        if (byteDanceCreativeEntity == null) {
 			result.error500("未找到对应实体");
 			result.error500("未找到对应实体");
 		}else {
 		}else {
-			boolean ok = cTopToutiaoCampaignService.updateById(cTopToutiaoCampaign);
+            boolean ok = byteDanceCreativeService.updateById(byteDanceCreative);
 			//TODO 返回false说明什么?
 			//TODO 返回false说明什么?
 			if(ok) {
 			if(ok) {
 				result.success("修改成功!");
 				result.success("修改成功!");
@@ -122,12 +122,12 @@ public class CTopToutiaoCampaignController {
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "头条广告主广告组信息-通过id删除")
-	@ApiOperation(value="头条广告主广告组信息-通过id删除", notes="头条广告主广告组信息-通过id删除")
+    @AutoLog(value = "今日头条创意信息-通过id删除")
+    @ApiOperation(value = "今日头条创意信息-通过id删除", notes = "今日头条创意信息-通过id删除")
 	@DeleteMapping(value = "/delete")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		try {
 		try {
-			cTopToutiaoCampaignService.removeById(id);
+            byteDanceCreativeService.removeById(id);
 		} catch (Exception e) {
 		} catch (Exception e) {
 			log.error("删除失败",e.getMessage());
 			log.error("删除失败",e.getMessage());
 			return Result.error("删除失败!");
 			return Result.error("删除失败!");
@@ -140,15 +140,15 @@ public class CTopToutiaoCampaignController {
 	 * @param ids
 	 * @param ids
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "头条广告主广告组信息-批量删除")
-	@ApiOperation(value="头条广告主广告组信息-批量删除", notes="头条广告主广告组信息-批量删除")
+    @AutoLog(value = "今日头条创意信息-批量删除")
+    @ApiOperation(value = "今日头条创意信息-批量删除", notes = "今日头条创意信息-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
-	public Result<CTopToutiaoCampaign> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<CTopToutiaoCampaign> result = new Result<CTopToutiaoCampaign>();
+    public Result<ByteDanceCreative> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<ByteDanceCreative> result = new Result<ByteDanceCreative>();
 		if(ids==null || "".equals(ids.trim())) {
 		if(ids==null || "".equals(ids.trim())) {
 			result.error500("参数不识别!");
 			result.error500("参数不识别!");
 		}else {
 		}else {
-			this.cTopToutiaoCampaignService.removeByIds(Arrays.asList(ids.split(",")));
+            this.byteDanceCreativeService.removeByIds(Arrays.asList(ids.split(",")));
 			result.success("删除成功!");
 			result.success("删除成功!");
 		}
 		}
 		return result;
 		return result;
@@ -159,16 +159,16 @@ public class CTopToutiaoCampaignController {
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "头条广告主广告组信息-通过id查询")
-	@ApiOperation(value="头条广告主广告组信息-通过id查询", notes="头条广告主广告组信息-通过id查询")
+    @AutoLog(value = "今日头条创意信息-通过id查询")
+    @ApiOperation(value = "今日头条创意信息-通过id查询", notes = "今日头条创意信息-通过id查询")
 	@GetMapping(value = "/queryById")
 	@GetMapping(value = "/queryById")
-	public Result<CTopToutiaoCampaign> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<CTopToutiaoCampaign> result = new Result<CTopToutiaoCampaign>();
-		CTopToutiaoCampaign cTopToutiaoCampaign = cTopToutiaoCampaignService.getById(id);
-		if(cTopToutiaoCampaign==null) {
+    public Result<ByteDanceCreative> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<ByteDanceCreative> result = new Result<ByteDanceCreative>();
+        ByteDanceCreative byteDanceCreative = byteDanceCreativeService.getById(id);
+        if (byteDanceCreative == null) {
 			result.error500("未找到对应实体");
 			result.error500("未找到对应实体");
 		}else {
 		}else {
-			result.setResult(cTopToutiaoCampaign);
+            result.setResult(byteDanceCreative);
 			result.setSuccess(true);
 			result.setSuccess(true);
 		}
 		}
 		return result;
 		return result;
@@ -183,13 +183,13 @@ public class CTopToutiaoCampaignController {
   @RequestMapping(value = "/exportXls")
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
   public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
       // Step.1 组装查询条件
       // Step.1 组装查询条件
-      QueryWrapper<CTopToutiaoCampaign> queryWrapper = null;
+      QueryWrapper<ByteDanceCreative> queryWrapper = null;
       try {
       try {
           String paramsStr = request.getParameter("paramsStr");
           String paramsStr = request.getParameter("paramsStr");
           if (oConvertUtils.isNotEmpty(paramsStr)) {
           if (oConvertUtils.isNotEmpty(paramsStr)) {
               String deString = URLDecoder.decode(paramsStr, "UTF-8");
               String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              CTopToutiaoCampaign cTopToutiaoCampaign = JSON.parseObject(deString, CTopToutiaoCampaign.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(cTopToutiaoCampaign, request.getParameterMap());
+              ByteDanceCreative byteDanceCreative = JSON.parseObject(deString, ByteDanceCreative.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCreative, request.getParameterMap());
           }
           }
       } catch (UnsupportedEncodingException e) {
       } catch (UnsupportedEncodingException e) {
           e.printStackTrace();
           e.printStackTrace();
@@ -197,11 +197,11 @@ public class CTopToutiaoCampaignController {
 
 
       //Step.2 AutoPoi 导出Excel
       //Step.2 AutoPoi 导出Excel
       ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
       ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<CTopToutiaoCampaign> pageList = cTopToutiaoCampaignService.list(queryWrapper);
+      List<ByteDanceCreative> pageList = byteDanceCreativeService.list(queryWrapper);
       //导出文件名称
       //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "头条广告主广告组信息列表");
-      mv.addObject(NormalExcelConstants.CLASS, CTopToutiaoCampaign.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("头条广告主广告组信息列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条创意信息列表");
+      mv.addObject(NormalExcelConstants.CLASS, ByteDanceCreative.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("今日头条创意信息列表数据", "导出人:Jeecg", "导出信息"));
       mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
       mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
       return mv;
       return mv;
   }
   }
@@ -224,9 +224,9 @@ public class CTopToutiaoCampaignController {
           params.setHeadRows(1);
           params.setHeadRows(1);
           params.setNeedSave(true);
           params.setNeedSave(true);
           try {
           try {
-              List<CTopToutiaoCampaign> listCTopToutiaoCampaigns = ExcelImportUtil.importExcel(file.getInputStream(), CTopToutiaoCampaign.class, params);
-              cTopToutiaoCampaignService.saveBatch(listCTopToutiaoCampaigns);
-              return Result.ok("文件导入成功!数据行数:" + listCTopToutiaoCampaigns.size());
+              List<ByteDanceCreative> listByteDanceCreatives = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceCreative.class, params);
+              byteDanceCreativeService.saveBatch(listByteDanceCreatives);
+              return Result.ok("文件导入成功!数据行数:" + listByteDanceCreatives.size());
           } catch (Exception e) {
           } catch (Exception e) {
               log.error(e.getMessage(),e);
               log.error(e.getMessage(),e);
               return Result.error("文件导入失败:"+e.getMessage());
               return Result.error("文件导入失败:"+e.getMessage());

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

@@ -0,0 +1,253 @@
+package org.jeecg.modules.ctop.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.ctop.entity.ByteDanceCreativeMaterial;
+import org.jeecg.modules.ctop.service.IByteDanceCreativeMaterialService;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @Description: 今日头条创意素材信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags = "今日头条创意素材信息")
+@RestController
+@RequestMapping("/ctop/byteDanceCreativeMaterial")
+public class ByteDanceCreativeMaterialController {
+    @Autowired
+    private IByteDanceCreativeMaterialService byteDanceCreativeMaterialService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param byteDanceCreativeMaterial
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "今日头条创意素材信息-分页列表查询")
+    @ApiOperation(value = "今日头条创意素材信息-分页列表查询", notes = "今日头条创意素材信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<ByteDanceCreativeMaterial>> queryPageList(ByteDanceCreativeMaterial byteDanceCreativeMaterial,
+                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                  HttpServletRequest req) {
+        Result<IPage<ByteDanceCreativeMaterial>> result = new Result<IPage<ByteDanceCreativeMaterial>>();
+        QueryWrapper<ByteDanceCreativeMaterial> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCreativeMaterial, req.getParameterMap());
+        Page<ByteDanceCreativeMaterial> page = new Page<ByteDanceCreativeMaterial>(pageNo, pageSize);
+        IPage<ByteDanceCreativeMaterial> pageList = byteDanceCreativeMaterialService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param byteDanceCreativeMaterial
+     * @return
+     */
+    @AutoLog(value = "今日头条创意素材信息-添加")
+    @ApiOperation(value = "今日头条创意素材信息-添加", notes = "今日头条创意素材信息-添加")
+    @PostMapping(value = "/add")
+    public Result<ByteDanceCreativeMaterial> add(@RequestBody ByteDanceCreativeMaterial byteDanceCreativeMaterial) {
+        Result<ByteDanceCreativeMaterial> result = new Result<ByteDanceCreativeMaterial>();
+        try {
+            byteDanceCreativeMaterialService.save(byteDanceCreativeMaterial);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param byteDanceCreativeMaterial
+     * @return
+     */
+    @AutoLog(value = "今日头条创意素材信息-编辑")
+    @ApiOperation(value = "今日头条创意素材信息-编辑", notes = "今日头条创意素材信息-编辑")
+    @PutMapping(value = "/edit")
+    public Result<ByteDanceCreativeMaterial> edit(@RequestBody ByteDanceCreativeMaterial byteDanceCreativeMaterial) {
+        Result<ByteDanceCreativeMaterial> result = new Result<ByteDanceCreativeMaterial>();
+        ByteDanceCreativeMaterial byteDanceCreativeMaterialEntity = byteDanceCreativeMaterialService.getById(byteDanceCreativeMaterial.getId());
+        if (byteDanceCreativeMaterialEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = byteDanceCreativeMaterialService.updateById(byteDanceCreativeMaterial);
+            //TODO 返回false说明什么?
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "今日头条创意素材信息-通过id删除")
+    @ApiOperation(value = "今日头条创意素材信息-通过id删除", notes = "今日头条创意素材信息-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            byteDanceCreativeMaterialService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "今日头条创意素材信息-批量删除")
+    @ApiOperation(value = "今日头条创意素材信息-批量删除", notes = "今日头条创意素材信息-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<ByteDanceCreativeMaterial> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<ByteDanceCreativeMaterial> result = new Result<ByteDanceCreativeMaterial>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.byteDanceCreativeMaterialService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "今日头条创意素材信息-通过id查询")
+    @ApiOperation(value = "今日头条创意素材信息-通过id查询", notes = "今日头条创意素材信息-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<ByteDanceCreativeMaterial> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<ByteDanceCreativeMaterial> result = new Result<ByteDanceCreativeMaterial>();
+        ByteDanceCreativeMaterial byteDanceCreativeMaterial = byteDanceCreativeMaterialService.getById(id);
+        if (byteDanceCreativeMaterial == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(byteDanceCreativeMaterial);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<ByteDanceCreativeMaterial> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                ByteDanceCreativeMaterial byteDanceCreativeMaterial = JSON.parseObject(deString, ByteDanceCreativeMaterial.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCreativeMaterial, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<ByteDanceCreativeMaterial> pageList = byteDanceCreativeMaterialService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条创意素材信息列表");
+        mv.addObject(NormalExcelConstants.CLASS, ByteDanceCreativeMaterial.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("今日头条创意素材信息列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<ByteDanceCreativeMaterial> listByteDanceCreativeMaterials = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceCreativeMaterial.class, params);
+                byteDanceCreativeMaterialService.saveBatch(listByteDanceCreativeMaterials);
+                return Result.ok("文件导入成功!数据行数:" + listByteDanceCreativeMaterials.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
+
+}

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

@@ -1,244 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.CtopToutiaoAdvertiserBudget;
-import org.jeecg.modules.ctop.service.ICtopToutiaoAdvertiserBudgetService;
-import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
- /**
- * @Description: 头条广告主账户预算信息
- * @Author: jeecg-boot
- * @Date:   2019-07-10
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags="头条广告主账户预算信息")
-@RestController
-@RequestMapping("/ctop/ctopToutiaoAdvertiserBudget")
-public class CtopToutiaoAdvertiserBudgetController {
-	@Autowired
-	private ICtopToutiaoAdvertiserBudgetService ctopToutiaoAdvertiserBudgetService;
-	
-	/**
-	  * 分页列表查询
-	 * @param ctopToutiaoAdvertiserBudget
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "头条广告主账户预算信息-分页列表查询")
-	@ApiOperation(value="头条广告主账户预算信息-分页列表查询", notes="头条广告主账户预算信息-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<CtopToutiaoAdvertiserBudget>> queryPageList(CtopToutiaoAdvertiserBudget ctopToutiaoAdvertiserBudget,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<CtopToutiaoAdvertiserBudget>> result = new Result<IPage<CtopToutiaoAdvertiserBudget>>();
-		QueryWrapper<CtopToutiaoAdvertiserBudget> queryWrapper = QueryGenerator.initQueryWrapper(ctopToutiaoAdvertiserBudget, req.getParameterMap());
-		Page<CtopToutiaoAdvertiserBudget> page = new Page<CtopToutiaoAdvertiserBudget>(pageNo, pageSize);
-		IPage<CtopToutiaoAdvertiserBudget> pageList = ctopToutiaoAdvertiserBudgetService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param ctopToutiaoAdvertiserBudget
-	 * @return
-	 */
-	@AutoLog(value = "头条广告主账户预算信息-添加")
-	@ApiOperation(value="头条广告主账户预算信息-添加", notes="头条广告主账户预算信息-添加")
-	@PostMapping(value = "/add")
-	public Result<CtopToutiaoAdvertiserBudget> add(@RequestBody CtopToutiaoAdvertiserBudget ctopToutiaoAdvertiserBudget) {
-		Result<CtopToutiaoAdvertiserBudget> result = new Result<CtopToutiaoAdvertiserBudget>();
-		try {
-			ctopToutiaoAdvertiserBudgetService.save(ctopToutiaoAdvertiserBudget);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param ctopToutiaoAdvertiserBudget
-	 * @return
-	 */
-	@AutoLog(value = "头条广告主账户预算信息-编辑")
-	@ApiOperation(value="头条广告主账户预算信息-编辑", notes="头条广告主账户预算信息-编辑")
-	@PutMapping(value = "/edit")
-	public Result<CtopToutiaoAdvertiserBudget> edit(@RequestBody CtopToutiaoAdvertiserBudget ctopToutiaoAdvertiserBudget) {
-		Result<CtopToutiaoAdvertiserBudget> result = new Result<CtopToutiaoAdvertiserBudget>();
-		CtopToutiaoAdvertiserBudget ctopToutiaoAdvertiserBudgetEntity = ctopToutiaoAdvertiserBudgetService.getById(ctopToutiaoAdvertiserBudget.getId());
-		if(ctopToutiaoAdvertiserBudgetEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = ctopToutiaoAdvertiserBudgetService.updateById(ctopToutiaoAdvertiserBudget);
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "头条广告主账户预算信息-通过id删除")
-	@ApiOperation(value="头条广告主账户预算信息-通过id删除", notes="头条广告主账户预算信息-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
-			ctopToutiaoAdvertiserBudgetService.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "头条广告主账户预算信息-批量删除")
-	@ApiOperation(value="头条广告主账户预算信息-批量删除", notes="头条广告主账户预算信息-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<CtopToutiaoAdvertiserBudget> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<CtopToutiaoAdvertiserBudget> result = new Result<CtopToutiaoAdvertiserBudget>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.ctopToutiaoAdvertiserBudgetService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "头条广告主账户预算信息-通过id查询")
-	@ApiOperation(value="头条广告主账户预算信息-通过id查询", notes="头条广告主账户预算信息-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<CtopToutiaoAdvertiserBudget> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<CtopToutiaoAdvertiserBudget> result = new Result<CtopToutiaoAdvertiserBudget>();
-		CtopToutiaoAdvertiserBudget ctopToutiaoAdvertiserBudget = ctopToutiaoAdvertiserBudgetService.getById(id);
-		if(ctopToutiaoAdvertiserBudget==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(ctopToutiaoAdvertiserBudget);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<CtopToutiaoAdvertiserBudget> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              CtopToutiaoAdvertiserBudget ctopToutiaoAdvertiserBudget = JSON.parseObject(deString, CtopToutiaoAdvertiserBudget.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(ctopToutiaoAdvertiserBudget, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<CtopToutiaoAdvertiserBudget> pageList = ctopToutiaoAdvertiserBudgetService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "头条广告主账户预算信息列表");
-      mv.addObject(NormalExcelConstants.CLASS, CtopToutiaoAdvertiserBudget.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("头条广告主账户预算信息列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();// 获取上传文件对象
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<CtopToutiaoAdvertiserBudget> listCtopToutiaoAdvertiserBudgets = ExcelImportUtil.importExcel(file.getInputStream(), CtopToutiaoAdvertiserBudget.class, params);
-              ctopToutiaoAdvertiserBudgetService.saveBatch(listCtopToutiaoAdvertiserBudgets);
-              return Result.ok("文件导入成功!数据行数:" + listCtopToutiaoAdvertiserBudgets.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
-
-}

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

@@ -1,244 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.CtopToutiaoBudgetTemplate;
-import org.jeecg.modules.ctop.service.ICtopToutiaoBudgetTemplateService;
-import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
- /**
- * @Description: 预算与出价模块模板
- * @Author: jeecg-boot
- * @Date:   2019-07-17
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags="预算与出价模块模板")
-@RestController
-@RequestMapping("/ctop/ctopToutiaoBudgetTemplate")
-public class CtopToutiaoBudgetTemplateController {
-	@Autowired
-	private ICtopToutiaoBudgetTemplateService ctopToutiaoBudgetTemplateService;
-	
-	/**
-	  * 分页列表查询
-	 * @param ctopToutiaoBudgetTemplate
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "预算与出价模块模板-分页列表查询")
-	@ApiOperation(value="预算与出价模块模板-分页列表查询", notes="预算与出价模块模板-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<CtopToutiaoBudgetTemplate>> queryPageList(CtopToutiaoBudgetTemplate ctopToutiaoBudgetTemplate,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<CtopToutiaoBudgetTemplate>> result = new Result<IPage<CtopToutiaoBudgetTemplate>>();
-		QueryWrapper<CtopToutiaoBudgetTemplate> queryWrapper = QueryGenerator.initQueryWrapper(ctopToutiaoBudgetTemplate, req.getParameterMap());
-		Page<CtopToutiaoBudgetTemplate> page = new Page<CtopToutiaoBudgetTemplate>(pageNo, pageSize);
-		IPage<CtopToutiaoBudgetTemplate> pageList = ctopToutiaoBudgetTemplateService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param ctopToutiaoBudgetTemplate
-	 * @return
-	 */
-	@AutoLog(value = "预算与出价模块模板-添加")
-	@ApiOperation(value="预算与出价模块模板-添加", notes="预算与出价模块模板-添加")
-	@PostMapping(value = "/add")
-	public Result<CtopToutiaoBudgetTemplate> add(@RequestBody CtopToutiaoBudgetTemplate ctopToutiaoBudgetTemplate) {
-		Result<CtopToutiaoBudgetTemplate> result = new Result<CtopToutiaoBudgetTemplate>();
-		try {
-			ctopToutiaoBudgetTemplateService.save(ctopToutiaoBudgetTemplate);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param ctopToutiaoBudgetTemplate
-	 * @return
-	 */
-	@AutoLog(value = "预算与出价模块模板-编辑")
-	@ApiOperation(value="预算与出价模块模板-编辑", notes="预算与出价模块模板-编辑")
-	@PutMapping(value = "/edit")
-	public Result<CtopToutiaoBudgetTemplate> edit(@RequestBody CtopToutiaoBudgetTemplate ctopToutiaoBudgetTemplate) {
-		Result<CtopToutiaoBudgetTemplate> result = new Result<CtopToutiaoBudgetTemplate>();
-		CtopToutiaoBudgetTemplate ctopToutiaoBudgetTemplateEntity = ctopToutiaoBudgetTemplateService.getById(ctopToutiaoBudgetTemplate.getId());
-		if(ctopToutiaoBudgetTemplateEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = ctopToutiaoBudgetTemplateService.updateById(ctopToutiaoBudgetTemplate);
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "预算与出价模块模板-通过id删除")
-	@ApiOperation(value="预算与出价模块模板-通过id删除", notes="预算与出价模块模板-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
-			ctopToutiaoBudgetTemplateService.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "预算与出价模块模板-批量删除")
-	@ApiOperation(value="预算与出价模块模板-批量删除", notes="预算与出价模块模板-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<CtopToutiaoBudgetTemplate> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<CtopToutiaoBudgetTemplate> result = new Result<CtopToutiaoBudgetTemplate>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.ctopToutiaoBudgetTemplateService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "预算与出价模块模板-通过id查询")
-	@ApiOperation(value="预算与出价模块模板-通过id查询", notes="预算与出价模块模板-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<CtopToutiaoBudgetTemplate> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<CtopToutiaoBudgetTemplate> result = new Result<CtopToutiaoBudgetTemplate>();
-		CtopToutiaoBudgetTemplate ctopToutiaoBudgetTemplate = ctopToutiaoBudgetTemplateService.getById(id);
-		if(ctopToutiaoBudgetTemplate==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(ctopToutiaoBudgetTemplate);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<CtopToutiaoBudgetTemplate> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              CtopToutiaoBudgetTemplate ctopToutiaoBudgetTemplate = JSON.parseObject(deString, CtopToutiaoBudgetTemplate.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(ctopToutiaoBudgetTemplate, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<CtopToutiaoBudgetTemplate> pageList = ctopToutiaoBudgetTemplateService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "预算与出价模块模板列表");
-      mv.addObject(NormalExcelConstants.CLASS, CtopToutiaoBudgetTemplate.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("预算与出价模块模板列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();// 获取上传文件对象
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<CtopToutiaoBudgetTemplate> listCtopToutiaoBudgetTemplates = ExcelImportUtil.importExcel(file.getInputStream(), CtopToutiaoBudgetTemplate.class, params);
-              ctopToutiaoBudgetTemplateService.saveBatch(listCtopToutiaoBudgetTemplates);
-              return Result.ok("文件导入成功!数据行数:" + listCtopToutiaoBudgetTemplates.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
-
-}

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

@@ -1,244 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.ToutiaoCreativeMaterial;
-import org.jeecg.modules.ctop.service.IToutiaoCreativeMaterialService;
-import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
- /**
- * @Description: 头条创意素材信息
- * @Author: jeecg-boot
- * @Date:   2019-07-11
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags="头条创意素材信息")
-@RestController
-@RequestMapping("/ctop/toutiaoCreativeMaterial")
-public class ToutiaoCreativeMaterialController {
-	@Autowired
-	private IToutiaoCreativeMaterialService toutiaoCreativeMaterialService;
-	
-	/**
-	  * 分页列表查询
-	 * @param toutiaoCreativeMaterial
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "头条创意素材信息-分页列表查询")
-	@ApiOperation(value="头条创意素材信息-分页列表查询", notes="头条创意素材信息-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<ToutiaoCreativeMaterial>> queryPageList(ToutiaoCreativeMaterial toutiaoCreativeMaterial,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<ToutiaoCreativeMaterial>> result = new Result<IPage<ToutiaoCreativeMaterial>>();
-		QueryWrapper<ToutiaoCreativeMaterial> queryWrapper = QueryGenerator.initQueryWrapper(toutiaoCreativeMaterial, req.getParameterMap());
-		Page<ToutiaoCreativeMaterial> page = new Page<ToutiaoCreativeMaterial>(pageNo, pageSize);
-		IPage<ToutiaoCreativeMaterial> pageList = toutiaoCreativeMaterialService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param toutiaoCreativeMaterial
-	 * @return
-	 */
-	@AutoLog(value = "头条创意素材信息-添加")
-	@ApiOperation(value="头条创意素材信息-添加", notes="头条创意素材信息-添加")
-	@PostMapping(value = "/add")
-	public Result<ToutiaoCreativeMaterial> add(@RequestBody ToutiaoCreativeMaterial toutiaoCreativeMaterial) {
-		Result<ToutiaoCreativeMaterial> result = new Result<ToutiaoCreativeMaterial>();
-		try {
-			toutiaoCreativeMaterialService.save(toutiaoCreativeMaterial);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param toutiaoCreativeMaterial
-	 * @return
-	 */
-	@AutoLog(value = "头条创意素材信息-编辑")
-	@ApiOperation(value="头条创意素材信息-编辑", notes="头条创意素材信息-编辑")
-	@PutMapping(value = "/edit")
-	public Result<ToutiaoCreativeMaterial> edit(@RequestBody ToutiaoCreativeMaterial toutiaoCreativeMaterial) {
-		Result<ToutiaoCreativeMaterial> result = new Result<ToutiaoCreativeMaterial>();
-		ToutiaoCreativeMaterial toutiaoCreativeMaterialEntity = toutiaoCreativeMaterialService.getById(toutiaoCreativeMaterial.getId());
-		if(toutiaoCreativeMaterialEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = toutiaoCreativeMaterialService.updateById(toutiaoCreativeMaterial);
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "头条创意素材信息-通过id删除")
-	@ApiOperation(value="头条创意素材信息-通过id删除", notes="头条创意素材信息-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
-			toutiaoCreativeMaterialService.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "头条创意素材信息-批量删除")
-	@ApiOperation(value="头条创意素材信息-批量删除", notes="头条创意素材信息-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<ToutiaoCreativeMaterial> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<ToutiaoCreativeMaterial> result = new Result<ToutiaoCreativeMaterial>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.toutiaoCreativeMaterialService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "头条创意素材信息-通过id查询")
-	@ApiOperation(value="头条创意素材信息-通过id查询", notes="头条创意素材信息-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<ToutiaoCreativeMaterial> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<ToutiaoCreativeMaterial> result = new Result<ToutiaoCreativeMaterial>();
-		ToutiaoCreativeMaterial toutiaoCreativeMaterial = toutiaoCreativeMaterialService.getById(id);
-		if(toutiaoCreativeMaterial==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(toutiaoCreativeMaterial);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<ToutiaoCreativeMaterial> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              ToutiaoCreativeMaterial toutiaoCreativeMaterial = JSON.parseObject(deString, ToutiaoCreativeMaterial.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(toutiaoCreativeMaterial, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<ToutiaoCreativeMaterial> pageList = toutiaoCreativeMaterialService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "头条创意素材信息列表");
-      mv.addObject(NormalExcelConstants.CLASS, ToutiaoCreativeMaterial.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("头条创意素材信息列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();// 获取上传文件对象
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<ToutiaoCreativeMaterial> listToutiaoCreativeMaterials = ExcelImportUtil.importExcel(file.getInputStream(), ToutiaoCreativeMaterial.class, params);
-              toutiaoCreativeMaterialService.saveBatch(listToutiaoCreativeMaterials);
-              return Result.ok("文件导入成功!数据行数:" + listToutiaoCreativeMaterials.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
-
-}

+ 58 - 57
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/CTopToutiaoAdvertisePlan.java

@@ -3,7 +3,6 @@ package org.jeecg.modules.ctop.entity;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
-import java.util.function.LongFunction;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -20,20 +19,20 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 
 /**
 /**
- * @Description: 头条广告主广告计划信息
+ * @Description: 今日头条广告计划信息
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-07-11
+ * @Date: 2019-07-22
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 @Data
 @Data
-@TableName("ctop_toutiao_advertise_plan")
+@TableName("ctop_bytedance_advertise_plan")
 @EqualsAndHashCode(callSuper = false)
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @Accessors(chain = true)
-@ApiModel(value="ctop_toutiao_advertise_plan对象", description="头条广告主广告计划信息")
-public class CTopToutiaoAdvertisePlan {
+@ApiModel(value = "ctop_bytedance_advertise_plan对象", description = "今日头条广告计划信息")
+public class ByteDanceAdvertisePlan {
     
     
 	/**头条平台广告计划id*/
 	/**头条平台广告计划id*/
-	@TableId()
+    @TableId(type = IdType.UUID)
     @ApiModelProperty(value = "头条平台广告计划id")
     @ApiModelProperty(value = "头条平台广告计划id")
 	private Long id;
 	private Long id;
 	/**平台广告主id*/
 	/**平台广告主id*/
@@ -161,7 +160,7 @@ public class CTopToutiaoAdvertisePlan {
     @ApiModelProperty(value = "audience")
     @ApiModelProperty(value = "audience")
 	private Object audience;
 	private Object audience;
 
 
-	public CTopToutiaoAdvertisePlan(JSONObject dataObject, String accountId) {
+    public ByteDanceAdvertisePlan(JSONObject dataObject, String accountId) {
 		Long id = dataObject.getLong("id");
 		Long id = dataObject.getLong("id");
 		this.id=id;
 		this.id=id;
 		this.advertiserId = accountId;
 		this.advertiserId = accountId;
@@ -185,23 +184,23 @@ public class CTopToutiaoAdvertisePlan {
 		}
 		}
 
 
         String open_url = dataObject.getString("open_url");
         String open_url = dataObject.getString("open_url");
-        if (null!=open_url&&!"".equals(open_url.trim())){
-            this.openUrl =open_url;
+        if (null != open_url && !"".equals(open_url.trim())) {
+            this.openUrl = open_url;
         }
         }
 
 
         String ad_create_time = dataObject.getString("ad_create_time");
         String ad_create_time = dataObject.getString("ad_create_time");
-        if (null!=ad_create_time&&!"".equals(ad_create_time.trim())){
-            this.adCreateTime =ad_create_time;
+        if (null != ad_create_time && !"".equals(ad_create_time.trim())) {
+            this.adCreateTime = ad_create_time;
         }
         }
 
 
         String ad_modify_time = dataObject.getString("ad_modify_time");
         String ad_modify_time = dataObject.getString("ad_modify_time");
-        if (null!=ad_modify_time&&!"".equals(ad_modify_time.trim())){
-            this.adModifyTime =ad_modify_time;
+        if (null != ad_modify_time && !"".equals(ad_modify_time.trim())) {
+            this.adModifyTime = ad_modify_time;
         }
         }
 
 
         String audit_reject_reason = dataObject.getString("audit_reject_reason");
         String audit_reject_reason = dataObject.getString("audit_reject_reason");
-        if (null!=audit_reject_reason&&!"".equals(audit_reject_reason.trim())){
-            this.auditRejectReason =audit_reject_reason;
+        if (null != audit_reject_reason && !"".equals(audit_reject_reason.trim())) {
+            this.auditRejectReason = audit_reject_reason;
         }
         }
 
 
 //        String dpa_open_url_field = dataObject.getString("dpa_open_url_field");
 //        String dpa_open_url_field = dataObject.getString("dpa_open_url_field");
@@ -215,8 +214,8 @@ public class CTopToutiaoAdvertisePlan {
 //        }
 //        }
 
 
         String pricing = dataObject.getString("pricing");
         String pricing = dataObject.getString("pricing");
-        if (null!=pricing&&!"".equals(pricing.trim())){
-            this.pricing =pricing;
+        if (null != pricing && !"".equals(pricing.trim())) {
+            this.pricing = pricing;
         }
         }
 
 
 //        String dpa_open_url_type = dataObject.getString("dpa_open_url_type");
 //        String dpa_open_url_type = dataObject.getString("dpa_open_url_type");
@@ -230,8 +229,8 @@ public class CTopToutiaoAdvertisePlan {
 //        }
 //        }
 
 
         Integer hide_if_exists = dataObject.getInteger("hide_if_exists");
         Integer hide_if_exists = dataObject.getInteger("hide_if_exists");
-        if (null!=hide_if_exists){
-            this.hideIfExists =hide_if_exists;
+        if (null != hide_if_exists) {
+            this.hideIfExists = hide_if_exists;
         }
         }
 
 
 //        String open_url_params = dataObject.getString("open_url_params");
 //        String open_url_params = dataObject.getString("open_url_params");
@@ -250,13 +249,13 @@ public class CTopToutiaoAdvertisePlan {
 //        }
 //        }
 
 
         String app_type = dataObject.getString("app_type");
         String app_type = dataObject.getString("app_type");
-        if (null!=app_type&&!"".equals(app_type.trim())){
-            this.appType =app_type;
+        if (null != app_type && !"".equals(app_type.trim())) {
+            this.appType = app_type;
         }
         }
 
 
         String flow_control_mode = dataObject.getString("flow_control_mode");
         String flow_control_mode = dataObject.getString("flow_control_mode");
-        if (null!=flow_control_mode&&!"".equals(flow_control_mode.trim())){
-            this.flowControlMode =flow_control_mode;
+        if (null != flow_control_mode && !"".equals(flow_control_mode.trim())) {
+            this.flowControlMode = flow_control_mode;
         }
         }
 
 
 //        String union_video_type = dataObject.getString("union_video_type");
 //        String union_video_type = dataObject.getString("union_video_type");
@@ -270,8 +269,8 @@ public class CTopToutiaoAdvertisePlan {
 //        }
 //        }
 
 
         BigDecimal cpa_bid = dataObject.getBigDecimal("cpa_bid");
         BigDecimal cpa_bid = dataObject.getBigDecimal("cpa_bid");
-        if (null!=cpa_bid){
-            this.cpaBid =cpa_bid;
+        if (null != cpa_bid) {
+            this.cpaBid = cpa_bid;
         }
         }
 
 
 //        String dpa_products = dataObject.getString("dpa_products");
 //        String dpa_products = dataObject.getString("dpa_products");
@@ -300,23 +299,23 @@ public class CTopToutiaoAdvertisePlan {
 //        }
 //        }
 
 
         String start_time = dataObject.getString("start_time");
         String start_time = dataObject.getString("start_time");
-        if (null!=start_time&&!"".equals(start_time.trim())){
-            this.startTime =start_time;
+        if (null != start_time && !"".equals(start_time.trim())) {
+            this.startTime = start_time;
         }
         }
 
 
         String opt_status = dataObject.getString("opt_status");
         String opt_status = dataObject.getString("opt_status");
-        if (null!=opt_status&&!"".equals(opt_status.trim())){
-            this.optStatus =opt_status;
+        if (null != opt_status && !"".equals(opt_status.trim())) {
+            this.optStatus = opt_status;
         }
         }
 
 
         String end_time = dataObject.getString("end_time");
         String end_time = dataObject.getString("end_time");
-        if (null!=end_time&&!"".equals(end_time.trim())){
-            this.endTime =end_time;
+        if (null != end_time && !"".equals(end_time.trim())) {
+            this.endTime = end_time;
         }
         }
 
 
         String status = dataObject.getString("status");
         String status = dataObject.getString("status");
-        if (null!=status&&!"".equals(status.trim())){
-            this.toutiaoStatus =status;
+        if (null != status && !"".equals(status.trim())) {
+            this.toutiaoStatus = status;
         }
         }
 
 
 //        String dpa_product_target = dataObject.getString("dpa_product_target");
 //        String dpa_product_target = dataObject.getString("dpa_product_target");
@@ -330,8 +329,8 @@ public class CTopToutiaoAdvertisePlan {
 //        }
 //        }
 
 
         Long convert_id = dataObject.getLong("convert_id");
         Long convert_id = dataObject.getLong("convert_id");
-        if (null!=convert_id){
-            this.convertId =convert_id;
+        if (null != convert_id) {
+            this.convertId = convert_id;
         }
         }
 
 
 //        String adjust_cpa = dataObject.getString("adjust_cpa");
 //        String adjust_cpa = dataObject.getString("adjust_cpa");
@@ -340,8 +339,8 @@ public class CTopToutiaoAdvertisePlan {
 //        }
 //        }
 
 
         BigDecimal bid = dataObject.getBigDecimal("bid");
         BigDecimal bid = dataObject.getBigDecimal("bid");
-        if (null!=bid){
-            this.bid =bid;
+        if (null != bid) {
+            this.bid = bid;
         }
         }
 
 
 //        Long advertiser_id = dataObject.getLong("advertiser_id");
 //        Long advertiser_id = dataObject.getLong("advertiser_id");
@@ -365,18 +364,18 @@ public class CTopToutiaoAdvertisePlan {
 //        }
 //        }
 
 
         String hide_if_converted = dataObject.getString("hide_if_converted");
         String hide_if_converted = dataObject.getString("hide_if_converted");
-        if (null!=hide_if_converted&&!"".equals(hide_if_converted.trim())){
-            this.hideIfConverted =hide_if_converted;
+        if (null != hide_if_converted && !"".equals(hide_if_converted.trim())) {
+            this.hideIfConverted = hide_if_converted;
         }
         }
 
 
         String toutiaoPackage = dataObject.getString("package");
         String toutiaoPackage = dataObject.getString("package");
-        if (null!=toutiaoPackage&&!"".equals(toutiaoPackage.trim())){
-            this.toutiaoPackage =toutiaoPackage;
+        if (null != toutiaoPackage && !"".equals(toutiaoPackage.trim())) {
+            this.toutiaoPackage = toutiaoPackage;
         }
         }
 
 
         String delivery_range = dataObject.getString("delivery_range");
         String delivery_range = dataObject.getString("delivery_range");
-        if (null!=delivery_range&&!"".equals(delivery_range.trim())){
-            this.deliveryRange =delivery_range;
+        if (null != delivery_range && !"".equals(delivery_range.trim())) {
+            this.deliveryRange = delivery_range;
         }
         }
 
 
 //        String params_type = dataObject.getString("params_type");
 //        String params_type = dataObject.getString("params_type");
@@ -385,18 +384,18 @@ public class CTopToutiaoAdvertisePlan {
 //        }
 //        }
 
 
         BigDecimal budget = dataObject.getBigDecimal("budget");
         BigDecimal budget = dataObject.getBigDecimal("budget");
-        if (null!=budget){
-            this.budget =budget;
+        if (null != budget) {
+            this.budget = budget;
         }
         }
 
 
         String schedule_type = dataObject.getString("schedule_type");
         String schedule_type = dataObject.getString("schedule_type");
-        if (null!=schedule_type&&!"".equals(schedule_type.trim())){
-            this.scheduleType =schedule_type;
+        if (null != schedule_type && !"".equals(schedule_type.trim())) {
+            this.scheduleType = schedule_type;
         }
         }
 
 
         String schedule_time = dataObject.getString("schedule_time");
         String schedule_time = dataObject.getString("schedule_time");
-        if (null!=schedule_time&&!"".equals(schedule_time.trim())){
-            this.scheduleTime =schedule_time;
+        if (null != schedule_time && !"".equals(schedule_time.trim())) {
+            this.scheduleTime = schedule_time;
         }
         }
 //
 //
 //        String modify_time = dataObject.getString("modify_time");
 //        String modify_time = dataObject.getString("modify_time");
@@ -415,17 +414,19 @@ public class CTopToutiaoAdvertisePlan {
 //        }
 //        }
 
 
         String download_type = dataObject.getString("download_type");
         String download_type = dataObject.getString("download_type");
-        if (null!=download_type&&!"".equals(download_type.trim())){
-            this.downloadType =download_type;
+        if (null != download_type && !"".equals(download_type.trim())) {
+            this.downloadType = download_type;
         }
         }
 
 
         String external_url = dataObject.getString("external_url");
         String external_url = dataObject.getString("external_url");
-        if (null!=external_url&&!"".equals(external_url.trim())){
-            this.externalUrl =external_url;
+        if (null != external_url && !"".equals(external_url.trim())) {
+            this.externalUrl = external_url;
         }
         }
-	}
+    }
+
+    public ByteDanceAdvertisePlan() {
+
+    }
 
 
-	public CTopToutiaoAdvertisePlan() {
 
 
-	}
 }
 }

+ 8 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/CTopToutiaoAdvertiser.java

@@ -19,20 +19,20 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 
 /**
 /**
- * @Description: 头条广告主信息
+ * @Description: 今日头条广告主信息
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-07-10
+ * @Date: 2019-07-22
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 @Data
 @Data
-@TableName("ctop_toutiao_advertiser")
+@TableName("ctop_bytedance_advertiser")
 @EqualsAndHashCode(callSuper = false)
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @Accessors(chain = true)
-@ApiModel(value="ctop_toutiao_advertiser对象", description="头条广告主信息")
-public class CTopToutiaoAdvertiser {
+@ApiModel(value = "ctop_bytedance_advertiser对象", description = "今日头条广告主信息")
+public class ByteDanceAdvertiser {
     
     
 	/**外部平台头条id*/
 	/**外部平台头条id*/
-	@TableId()
+	@TableId(type = IdType.UUID)
     @ApiModelProperty(value = "外部平台头条id")
     @ApiModelProperty(value = "外部平台头条id")
 	private Long id;
 	private Long id;
 	/**本平台id*/
 	/**本平台id*/
@@ -140,7 +140,7 @@ public class CTopToutiaoAdvertiser {
     @ApiModelProperty(value = "updateTime")
     @ApiModelProperty(value = "updateTime")
 	private java.util.Date updateTime;
 	private java.util.Date updateTime;
 
 
-	public CTopToutiaoAdvertiser(JSONObject dataObject,String accountId) {
+	public ByteDanceAdvertiser(JSONObject dataObject, String accountId) {
 		Long id = dataObject.getLong("id");
 		Long id = dataObject.getLong("id");
 		this.id=id;
 		this.id=id;
 		this.advertiserId = accountId;
 		this.advertiserId = accountId;
@@ -238,6 +238,6 @@ public class CTopToutiaoAdvertiser {
 		}
 		}
 	}
 	}
 
 
-	public CTopToutiaoAdvertiser() {
+	public ByteDanceAdvertiser() {
 	}
 	}
 }
 }

+ 14 - 12
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/CtopToutiaoAdvertiserBudget.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.ctop.entity;
 package org.jeecg.modules.ctop.entity;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
@@ -10,33 +11,34 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 
+import java.math.BigDecimal;
+
 /**
 /**
- * @Description: 头条广告主账户预算信息
+ * @Description: 今日头条广告主预算信息
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-07-10
+ * @Date: 2019-07-22
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 @Data
 @Data
-@TableName("ctop_toutiao_advertiser_budget")
+@TableName("ctop_bytedance_advertiser_budget")
 @EqualsAndHashCode(callSuper = false)
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @Accessors(chain = true)
-@ApiModel(value="ctop_toutiao_advertiser_budget对象", description="头条广告主账户预算信息")
-public class CtopToutiaoAdvertiserBudget {
+@ApiModel(value = "ctop_bytedance_advertiser_budget对象", description = "今日头条广告主预算信息")
+public class ByteDanceAdvertiserBudget {
     
     
 	/**头条广告主id*/
 	/**头条广告主id*/
-	@TableId()
+	@TableId(type = IdType.UUID)
     @ApiModelProperty(value = "头条广告主id")
     @ApiModelProperty(value = "头条广告主id")
 	private Long id;
 	private Long id;
 	/**平台账号id*/
 	/**平台账号id*/
 	@Excel(name = "平台账号id", width = 15)
 	@Excel(name = "平台账号id", width = 15)
     @ApiModelProperty(value = "平台账号id")
     @ApiModelProperty(value = "平台账号id")
 	private String advertiserId;
 	private String advertiserId;
-	@Excel(name = "预算类型", width = 15)
-    @ApiModelProperty(value = "预算类型")
+	@Excel(name = "预算类型")
 	private java.lang.String budgetMode;
 	private java.lang.String budgetMode;
 	@Excel(name = "预算数量", width = 15)
 	@Excel(name = "预算数量", width = 15)
     @ApiModelProperty(value = "预算数量")
     @ApiModelProperty(value = "预算数量")
-	private Integer budget;
+	private java.math.BigDecimal budget;
 	/**createTime*/
 	/**createTime*/
     @ApiModelProperty(value = "createTime")
     @ApiModelProperty(value = "createTime")
 	private java.util.Date createTime;
 	private java.util.Date createTime;
@@ -44,10 +46,10 @@ public class CtopToutiaoAdvertiserBudget {
     @ApiModelProperty(value = "updateTime")
     @ApiModelProperty(value = "updateTime")
 	private java.util.Date updateTime;
 	private java.util.Date updateTime;
 
 
-	public CtopToutiaoAdvertiserBudget() {
+	public ByteDanceAdvertiserBudget() {
 	}
 	}
 
 
-	public CtopToutiaoAdvertiserBudget(JSONObject dataObject, String accountId) {
+	public ByteDanceAdvertiserBudget(JSONObject dataObject, String accountId) {
 		Long advertiserId = dataObject.getLong("advertiser_id");
 		Long advertiserId = dataObject.getLong("advertiser_id");
 		this.id = advertiserId;
 		this.id = advertiserId;
 		this.advertiserId = accountId;
 		this.advertiserId = accountId;
@@ -55,7 +57,7 @@ public class CtopToutiaoAdvertiserBudget {
 		if (null!=budget_mode&&!"".equals(budget_mode.trim())){
 		if (null!=budget_mode&&!"".equals(budget_mode.trim())){
 			this.budgetMode =budget_mode;
 			this.budgetMode =budget_mode;
 		}
 		}
-		Integer budget = dataObject.getInteger("budget");
+		BigDecimal budget = dataObject.getBigDecimal("budget");
 		if (null!=budget){
 		if (null!=budget){
 			this.budget =budget;
 			this.budget =budget;
 		}
 		}

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

@@ -0,0 +1,138 @@
+package org.jeecg.modules.ctop.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: 今日头条预算模板信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+@Data
+@TableName("ctop_bytedance_budget_template")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_bytedance_budget_template对象", description = "今日头条预算模板信息")
+public class ByteDanceBudgetTemplate {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.UUID)
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    /**
+     * 广告主id
+     */
+    @Excel(name = "广告主id", width = 15)
+    @ApiModelProperty(value = "广告主id")
+    private String advertiserId;
+    /**
+     * 头条账号id
+     */
+    @Excel(name = "头条账号id", width = 15)
+    @ApiModelProperty(value = "头条账号id")
+    private Integer toutiaoId;
+    /**
+     * bidType
+     */
+    @Excel(name = "bidType", width = 15)
+    @ApiModelProperty(value = "bidType")
+    private String bidType;
+    /**
+     * flowControlMode
+     */
+    @Excel(name = "flowControlMode", width = 15)
+    @ApiModelProperty(value = "flowControlMode")
+    private String flowControlMode;
+    /**
+     * budgetPrice
+     */
+    @Excel(name = "budgetPrice", width = 15)
+    @ApiModelProperty(value = "budgetPrice")
+    private String budgetPrice;
+    /**
+     * budgetMode
+     */
+    @Excel(name = "budgetMode", width = 15)
+    @ApiModelProperty(value = "budgetMode")
+    private String budgetMode;
+    /**
+     * flowDateType
+     */
+    @Excel(name = "flowDateType", width = 15)
+    @ApiModelProperty(value = "flowDateType")
+    private String flowDateType;
+    /**
+     * startDate
+     */
+    @Excel(name = "startDate", width = 15)
+    @ApiModelProperty(value = "startDate")
+    private String startDate;
+    /**
+     * endDate
+     */
+    @Excel(name = "endDate", width = 15)
+    @ApiModelProperty(value = "endDate")
+    private String endDate;
+    /**
+     * dateQuantum
+     */
+    @Excel(name = "dateQuantum", width = 15)
+    @ApiModelProperty(value = "dateQuantum")
+    private String dateQuantum;
+    /**
+     * dateQuantumRange
+     */
+    @Excel(name = "dateQuantumRange", width = 15)
+    @ApiModelProperty(value = "dateQuantumRange")
+    private String dateQuantumRange;
+    /**
+     * priceType
+     */
+    @Excel(name = "priceType", width = 15)
+    @ApiModelProperty(value = "priceType")
+    private String priceType;
+    /**
+     * convertPrice
+     */
+    @Excel(name = "convertPrice", width = 15)
+    @ApiModelProperty(value = "convertPrice")
+    private String convertPrice;
+    /**
+     * filterType
+     */
+    @Excel(name = "filterType", width = 15)
+    @ApiModelProperty(value = "filterType")
+    private String filterType;
+    /**
+     * status
+     */
+    @Excel(name = "status", width = 15)
+    @ApiModelProperty(value = "status")
+    private Integer status;
+    /**
+     * createTime
+     */
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+    /**
+     * updateTime
+     */
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+}

+ 25 - 19
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/CTopToutiaoCampaign.java

@@ -1,33 +1,38 @@
 package org.jeecg.modules.ctop.entity;
 package org.jeecg.modules.ctop.entity;
 
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
 /**
- * @Description: 头条广告主广告组信息
+ * @Description: 今日头条广告组信息
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-07-10
+ * @Date: 2019-07-22
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 @Data
 @Data
-@TableName("ctop_toutiao_campaign")
+@TableName("ctop_bytedance_campaign")
 @EqualsAndHashCode(callSuper = false)
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @Accessors(chain = true)
-@ApiModel(value="ctop_toutiao_campaign对象", description="头条广告主广告组信息")
-public class CTopToutiaoCampaign {
+@ApiModel(value = "ctop_bytedance_campaign对象", description = "今日头条广告组信息")
+public class ByteDanceCampaign {
     
     
 	/**今日头条广告组id*/
 	/**今日头条广告组id*/
-	@TableId()
+	@TableId(type = IdType.UUID)
     @ApiModelProperty(value = "今日头条广告组id")
     @ApiModelProperty(value = "今日头条广告组id")
 	private Long id;
 	private Long id;
 	/**平台用户id*/
 	/**平台用户id*/
@@ -60,12 +65,13 @@ public class CTopToutiaoCampaign {
 	private String modifyTime;
 	private String modifyTime;
 	@Excel(name = "广告组状态", width = 15)
 	@Excel(name = "广告组状态", width = 15)
     @ApiModelProperty(value = "广告组状态")
     @ApiModelProperty(value = "广告组状态")
-	private String status;
-
-	@Excel(name = "广告组状态", width = 15)
-	@ApiModelProperty(value = "广告组状态")
-	private String optStatus;
-
+	private java.lang.String status;
+	/**
+	 * optStatus
+	 */
+	@Excel(name = "optStatus", width = 15)
+	@ApiModelProperty(value = "optStatus")
+	private java.lang.String optStatus;
 	/**广告组创建时间*/
 	/**广告组创建时间*/
 	@Excel(name = "广告组创建时间", width = 15)
 	@Excel(name = "广告组创建时间", width = 15)
     @ApiModelProperty(value = "广告组创建时间")
     @ApiModelProperty(value = "广告组创建时间")
@@ -81,10 +87,10 @@ public class CTopToutiaoCampaign {
     @ApiModelProperty(value = "updateTime")
     @ApiModelProperty(value = "updateTime")
 	private java.util.Date updateTime;
 	private java.util.Date updateTime;
 
 
-	public CTopToutiaoCampaign() {
+	public ByteDanceCampaign() {
 	}
 	}
 
 
-	public CTopToutiaoCampaign(Long id, String advertiserId, Long toutiaoId, String name, BigDecimal budget, String budgetMode, String landingType, String modifyTime, String status, String optStatus, String campaignCreateTime, String campaignModifyTime, Date createTime, Date updateTime) {
+	public ByteDanceCampaign(Long id, String advertiserId, Long toutiaoId, String name, BigDecimal budget, String budgetMode, String landingType, String modifyTime, String status, String optStatus, String campaignCreateTime, String campaignModifyTime, Date createTime, Date updateTime) {
 		this.id = id;
 		this.id = id;
 		this.advertiserId = advertiserId;
 		this.advertiserId = advertiserId;
 		this.toutiaoId = toutiaoId;
 		this.toutiaoId = toutiaoId;
@@ -101,7 +107,7 @@ public class CTopToutiaoCampaign {
 		this.updateTime = updateTime;
 		this.updateTime = updateTime;
 	}
 	}
 
 
-	public CTopToutiaoCampaign(JSONObject dataObject, String accountId) {
+	public ByteDanceCampaign(JSONObject dataObject, String accountId) {
 		Long id = dataObject.getLong("id");
 		Long id = dataObject.getLong("id");
 		this.id = id;
 		this.id = id;
 		this.advertiserId = accountId;
 		this.advertiserId = accountId;
@@ -147,7 +153,7 @@ public class CTopToutiaoCampaign {
 		}
 		}
 	}
 	}
 
 
-	public CTopToutiaoCampaign(Long id,  CTopOauthToken oauthToken, String campaignName, String budgetMode, Integer budget, String landingType) {
+	public ByteDanceCampaign(Long id, CTopOauthToken oauthToken, String campaignName, String budgetMode, Integer budget, String landingType) {
 		this.id = id;
 		this.id = id;
 		this.advertiserId = oauthToken.getAdvertiserId();
 		this.advertiserId = oauthToken.getAdvertiserId();
 		this.name = campaignName;
 		this.name = campaignName;

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

@@ -0,0 +1,84 @@
+package org.jeecg.modules.ctop.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: 今日头条广告组模板信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+@Data
+@TableName("ctop_bytedance_campaign_template")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_bytedance_campaign_template对象", description = "今日头条广告组模板信息")
+public class ByteDanceCampaignTemplate {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.UUID)
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    /**
+     * accountId
+     */
+    @Excel(name = "accountId", width = 15)
+    @ApiModelProperty(value = "accountId")
+    private String accountId;
+    /**
+     * 投放目标
+     */
+    @Excel(name = "投放目标", width = 15)
+    @ApiModelProperty(value = "投放目标")
+    private String promationPurpuse;
+    /**
+     * 投放方式
+     */
+    @Excel(name = "投放方式", width = 15)
+    @ApiModelProperty(value = "投放方式")
+    private String campaignBudget;
+    /**
+     * 日预算
+     */
+    @Excel(name = "日预算", width = 15)
+    @ApiModelProperty(value = "日预算")
+    private String budgetDaily;
+    /**
+     * 广告组名称
+     */
+    @Excel(name = "广告组名称", width = 15)
+    @ApiModelProperty(value = "广告组名称")
+    private String campaignName;
+    /**
+     * 模板状态
+     */
+    @Excel(name = "模板状态", width = 15)
+    @ApiModelProperty(value = "模板状态")
+    private Integer status;
+    /**
+     * createTime
+     */
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+    /**
+     * updateTime
+     */
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+}

+ 7 - 7
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ToutiaoCreative.java

@@ -18,17 +18,17 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 
 /**
 /**
- * @Description: 广告创意信息
+ * @Description: 今日头条创意信息
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-07-11
+ * @Date: 2019-07-22
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 @Data
 @Data
-@TableName("ctop_toutiao_creative")
+@TableName("ctop_bytedance_creative")
 @EqualsAndHashCode(callSuper = false)
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @Accessors(chain = true)
-@ApiModel(value="ctop_toutiao_creative对象", description="广告创意信息")
-public class ToutiaoCreative {
+@ApiModel(value = "ctop_bytedance_creative对象", description = "今日头条创意信息")
+public class ByteDanceCreative {
     
     
 	/**创意id*/
 	/**创意id*/
 	@TableId(type = IdType.UUID)
 	@TableId(type = IdType.UUID)
@@ -101,7 +101,7 @@ public class ToutiaoCreative {
     @ApiModelProperty(value = "updateTime")
     @ApiModelProperty(value = "updateTime")
 	private Date updateTime;
 	private Date updateTime;
 
 
-	public ToutiaoCreative(JSONObject dataObject, String accountId) {
+    public ByteDanceCreative(JSONObject dataObject, String accountId) {
 		this.id = dataObject.getLong("creative_id");
 		this.id = dataObject.getLong("creative_id");
 		this.planId = dataObject.getLong("ad_id");
 		this.planId = dataObject.getLong("ad_id");
 		this.toutiaoId = dataObject.getLong("advertiser_id");
 		this.toutiaoId = dataObject.getLong("advertiser_id");
@@ -160,6 +160,6 @@ public class ToutiaoCreative {
 //		}
 //		}
 	}
 	}
 
 
-	public ToutiaoCreative() {
+    public ByteDanceCreative() {
 	}
 	}
 }
 }

+ 14 - 10
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ToutiaoCreativeMaterial.java

@@ -18,17 +18,17 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 
 /**
 /**
- * @Description: 头条创意素材信息
+ * @Description: 今日头条创意素材信息
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-07-11
+ * @Date: 2019-07-22
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 @Data
 @Data
-@TableName("ctop_toutiao_creative_material")
+@TableName("ctop_bytedance_creative_material")
 @EqualsAndHashCode(callSuper = false)
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @Accessors(chain = true)
-@ApiModel(value="ctop_toutiao_creative_material对象", description="头条创意素材信息")
-public class ToutiaoCreativeMaterial {
+@ApiModel(value = "ctop_bytedance_creative_material对象", description = "今日头条创意素材信息")
+public class ByteDanceCreativeMaterial {
     
     
 	/**素材id*/
 	/**素材id*/
 	@TableId(type = IdType.UUID)
 	@TableId(type = IdType.UUID)
@@ -53,12 +53,13 @@ public class ToutiaoCreativeMaterial {
 	/**创意状态*/
 	/**创意状态*/
 	@Excel(name = "创意状态", width = 15)
 	@Excel(name = "创意状态", width = 15)
     @ApiModelProperty(value = "创意状态")
     @ApiModelProperty(value = "创意状态")
-	private String optStatus;
-
+	private String status;
+	/**
+	 * 创意状态
+	 */
 	@Excel(name = "创意状态", width = 15)
 	@Excel(name = "创意状态", width = 15)
 	@ApiModelProperty(value = "创意状态")
 	@ApiModelProperty(value = "创意状态")
-	private String status;
-
+	private String optStatus;
 	/**创意类型*/
 	/**创意类型*/
 	@Excel(name = "创意类型", width = 15)
 	@Excel(name = "创意类型", width = 15)
     @ApiModelProperty(value = "创意类型")
     @ApiModelProperty(value = "创意类型")
@@ -74,7 +75,10 @@ public class ToutiaoCreativeMaterial {
     @ApiModelProperty(value = "updateTime")
     @ApiModelProperty(value = "updateTime")
 	private Date updateTime;
 	private Date updateTime;
 
 
-	public ToutiaoCreativeMaterial(JSONObject dataObject, String accountId) {
+	public ByteDanceCreativeMaterial() {
+	}
+
+	public ByteDanceCreativeMaterial(JSONObject dataObject, String accountId) {
 		this.id = dataObject.getLong("id");
 		this.id = dataObject.getLong("id");
 		this.toutiaoId = dataObject.getLong("advertiser_id");
 		this.toutiaoId = dataObject.getLong("advertiser_id");
 
 

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

@@ -1,97 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-/**
- * @Description: 预算与出价模块模板
- * @Author: jeecg-boot
- * @Date:   2019-07-17
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_toutiao_budget_template")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="ctop_toutiao_budget_template对象", description="预算与出价模块模板")
-public class CtopToutiaoBudgetTemplate {
-    
-	/**id*/
-	@TableId(type = IdType.UUID)
-    @ApiModelProperty(value = "id")
-	private Integer id;
-	/**广告主id*/
-	@Excel(name = "广告主id", width = 15)
-    @ApiModelProperty(value = "广告主id")
-	private String advertiserId;
-	/**头条账号id*/
-	@Excel(name = "头条账号id", width = 15)
-    @ApiModelProperty(value = "头条账号id")
-	private Integer toutiaoId;
-	/**bidType*/
-	@Excel(name = "bidType", width = 15)
-    @ApiModelProperty(value = "bidType")
-	private String bidType;
-	/**flowcontrolmode*/
-	@Excel(name = "flowcontrolmode", width = 15)
-    @ApiModelProperty(value = "flowcontrolmode")
-	private String flowcontrolmode;
-	/**budgetprice*/
-	@Excel(name = "budgetprice", width = 15)
-    @ApiModelProperty(value = "budgetprice")
-	private String budgetprice;
-	/**budgetmode*/
-	@Excel(name = "budgetmode", width = 15)
-    @ApiModelProperty(value = "budgetmode")
-	private String budgetmode;
-	/**flowdate*/
-	@Excel(name = "flowdate", width = 15)
-    @ApiModelProperty(value = "flowdate")
-	private String flowdate;
-	/**dateflowrange*/
-	@Excel(name = "dateflowrange", width = 15)
-    @ApiModelProperty(value = "dateflowrange")
-	private String dateflowrange;
-	/**datequantum*/
-	@Excel(name = "datequantum", width = 15)
-    @ApiModelProperty(value = "datequantum")
-	private String datequantum;
-	/**datequantumrange*/
-	@Excel(name = "datequantumrange", width = 15)
-    @ApiModelProperty(value = "datequantumrange")
-	private String datequantumrange;
-	/**pricetype*/
-	@Excel(name = "pricetype", width = 15)
-    @ApiModelProperty(value = "pricetype")
-	private String pricetype;
-	/**convertprice*/
-	@Excel(name = "convertprice", width = 15)
-    @ApiModelProperty(value = "convertprice")
-	private String convertprice;
-	/**filtertype*/
-	@Excel(name = "filtertype", width = 15)
-    @ApiModelProperty(value = "filtertype")
-	private String filtertype;
-	/**status*/
-	@Excel(name = "status", width = 15)
-    @ApiModelProperty(value = "status")
-	private Integer status;
-	/**createTime*/
-    @ApiModelProperty(value = "createTime")
-	private Date createTime;
-	/**updateTime*/
-    @ApiModelProperty(value = "updateTime")
-	private Date updateTime;
-}

+ 17 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceAdvertisePlanMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.ctop.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.ctop.entity.ByteDanceAdvertisePlan;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 今日头条广告计划信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+public interface ByteDanceAdvertisePlanMapper extends BaseMapper<ByteDanceAdvertisePlan> {
+
+}

+ 17 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceAdvertiserBudgetMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.ctop.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.ctop.entity.ByteDanceAdvertiserBudget;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 今日头条广告主预算信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+public interface ByteDanceAdvertiserBudgetMapper extends BaseMapper<ByteDanceAdvertiserBudget> {
+
+}

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/CTopToutiaoAdvertiserMapper.java

@@ -3,15 +3,15 @@ package org.jeecg.modules.ctop.mapper;
 import java.util.List;
 import java.util.List;
 
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.ctop.entity.CTopToutiaoAdvertiser;
+import org.jeecg.modules.ctop.entity.ByteDanceAdvertiser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**
- * @Description: 头条广告主信息
+ * @Description: 今日头条广告主信息
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-07-10
+ * @Date: 2019-07-22
  * @Version: V1.0
  * @Version: V1.0
  */
  */
-public interface CTopToutiaoAdvertiserMapper extends BaseMapper<CTopToutiaoAdvertiser> {
+public interface ByteDanceAdvertiserMapper extends BaseMapper<ByteDanceAdvertiser> {
 
 
 }
 }

+ 17 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceBudgetTemplateMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.ctop.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.ctop.entity.ByteDanceBudgetTemplate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 今日头条预算模板信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+public interface ByteDanceBudgetTemplateMapper extends BaseMapper<ByteDanceBudgetTemplate> {
+
+}

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/CTopToutiaoCampaignMapper.java

@@ -3,15 +3,15 @@ package org.jeecg.modules.ctop.mapper;
 import java.util.List;
 import java.util.List;
 
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.ctop.entity.CTopToutiaoCampaign;
+import org.jeecg.modules.ctop.entity.ByteDanceCampaign;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**
- * @Description: 头条广告主广告组信息
+ * @Description: 今日头条广告组信息
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-07-10
+ * @Date: 2019-07-22
  * @Version: V1.0
  * @Version: V1.0
  */
  */
-public interface CTopToutiaoCampaignMapper extends BaseMapper<CTopToutiaoCampaign> {
+public interface ByteDanceCampaignMapper extends BaseMapper<ByteDanceCampaign> {
 
 
 }
 }

+ 17 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceCampaignTemplateMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.ctop.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 今日头条广告组模板信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+public interface ByteDanceCampaignTemplateMapper extends BaseMapper<ByteDanceCampaignTemplate> {
+
+}

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ToutiaoCreativeMapper.java

@@ -3,15 +3,15 @@ package org.jeecg.modules.ctop.mapper;
 import java.util.List;
 import java.util.List;
 
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.ctop.entity.ToutiaoCreative;
+import org.jeecg.modules.ctop.entity.ByteDanceCreative;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**
- * @Description: 广告创意信息
+ * @Description: 今日头条创意信息
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-07-11
+ * @Date: 2019-07-22
  * @Version: V1.0
  * @Version: V1.0
  */
  */
-public interface ToutiaoCreativeMapper extends BaseMapper<ToutiaoCreative> {
+public interface ByteDanceCreativeMapper extends BaseMapper<ByteDanceCreative> {
 
 
 }
 }

+ 17 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceCreativeMaterialMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.ctop.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.ctop.entity.ByteDanceCreativeMaterial;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 今日头条创意素材信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+public interface ByteDanceCreativeMaterialMapper extends BaseMapper<ByteDanceCreativeMaterial> {
+
+}

+ 0 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/CTopToutiaoAdvertisePlanMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.ctop.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.ctop.entity.CTopToutiaoAdvertisePlan;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 头条广告主广告计划信息
- * @Author: jeecg-boot
- * @Date:   2019-07-10
- * @Version: V1.0
- */
-public interface CTopToutiaoAdvertisePlanMapper extends BaseMapper<CTopToutiaoAdvertisePlan> {
-
-}

+ 0 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/CtopToutiaoAdvertiserBudgetMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.ctop.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.ctop.entity.CtopToutiaoAdvertiserBudget;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 头条广告主账户预算信息
- * @Author: jeecg-boot
- * @Date:   2019-07-10
- * @Version: V1.0
- */
-public interface CtopToutiaoAdvertiserBudgetMapper extends BaseMapper<CtopToutiaoAdvertiserBudget> {
-
-}

+ 0 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/CtopToutiaoBudgetTemplateMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.ctop.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.ctop.entity.CtopToutiaoBudgetTemplate;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 预算与出价模块模板
- * @Author: jeecg-boot
- * @Date:   2019-07-17
- * @Version: V1.0
- */
-public interface CtopToutiaoBudgetTemplateMapper extends BaseMapper<CtopToutiaoBudgetTemplate> {
-
-}

+ 0 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ToutiaoCreativeMaterialMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.ctop.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.ctop.entity.ToutiaoCreativeMaterial;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 头条创意素材信息
- * @Author: jeecg-boot
- * @Date:   2019-07-11
- * @Version: V1.0
- */
-public interface ToutiaoCreativeMaterialMapper extends BaseMapper<ToutiaoCreativeMaterial> {
-
-}

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/ToutiaoCreativeMaterialMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.ToutiaoCreativeMaterialMapper">
+<mapper namespace="org.jeecg.modules.ctop.mapper.ByteDanceAdvertisePlanMapper">
 
 
 </mapper>
 </mapper>

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/CtopToutiaoBudgetTemplateMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.CtopToutiaoBudgetTemplateMapper">
+<mapper namespace="org.jeecg.modules.ctop.mapper.ByteDanceAdvertiserBudgetMapper">
 
 
 </mapper>
 </mapper>

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/CTopToutiaoCampaignMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.CTopToutiaoCampaignMapper">
+<mapper namespace="org.jeecg.modules.ctop.mapper.ByteDanceAdvertiserMapper">
 
 
 </mapper>
 </mapper>

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/ByteDanceBudgetTemplateMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.ctop.mapper.ByteDanceBudgetTemplateMapper">
+
+</mapper>

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/ToutiaoCreativeMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.ToutiaoCreativeMapper">
+<mapper namespace="org.jeecg.modules.ctop.mapper.ByteDanceCampaignMapper">
 
 
 </mapper>
 </mapper>

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/CTopToutiaoAdvertisePlanMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.CTopToutiaoAdvertisePlanMapper">
+<mapper namespace="org.jeecg.modules.ctop.mapper.ByteDanceCampaignTemplateMapper">
 
 
 </mapper>
 </mapper>

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/CTopToutiaoAdvertiserMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.CTopToutiaoAdvertiserMapper">
+<mapper namespace="org.jeecg.modules.ctop.mapper.ByteDanceCreativeMapper">
 
 
 </mapper>
 </mapper>

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/ByteDanceCreativeMaterialMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.ctop.mapper.ByteDanceCreativeMaterialMapper">
+
+</mapper>

+ 0 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/CtopToutiaoAdvertiserBudgetMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.CtopToutiaoAdvertiserBudgetMapper">
-
-</mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.ctop.service;
+
+import org.jeecg.modules.ctop.entity.ByteDanceAdvertisePlan;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 今日头条广告计划信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+public interface IByteDanceAdvertisePlanService extends IService<ByteDanceAdvertisePlan> {
+
+}

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.ctop.service;
+
+import org.jeecg.modules.ctop.entity.ByteDanceAdvertiserBudget;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 今日头条广告主预算信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+public interface IByteDanceAdvertiserBudgetService extends IService<ByteDanceAdvertiserBudget> {
+
+}

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

@@ -2,7 +2,7 @@ package org.jeecg.modules.ctop.service;
 
 
 import java.util.Map;
 import java.util.Map;
 
 
-public interface ITouTiaoAdvertiserService {
+public interface IByteDanceAdvertiserDataService {
     Map<String, Object> getAdvertiserInfo(String accountId);
     Map<String, Object> getAdvertiserInfo(String accountId);
 
 
     Map<String, Object> getAdvertiserPlan(String accountId,String ids);
     Map<String, Object> getAdvertiserPlan(String accountId,String ids);

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.ctop.service;
+
+import org.jeecg.modules.ctop.entity.ByteDanceAdvertiser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 今日头条广告主信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+public interface IByteDanceAdvertiserService extends IService<ByteDanceAdvertiser> {
+
+}

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.ctop.service;
+
+import org.jeecg.modules.ctop.entity.ByteDanceBudgetTemplate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * @Description: 今日头条预算模板信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+public interface IByteDanceBudgetTemplateService extends IService<ByteDanceBudgetTemplate> {
+
+    Map<String, Object> insertTemplate(ByteDanceBudgetTemplate template);
+}

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.ctop.service;
+
+import org.jeecg.modules.ctop.entity.ByteDanceCampaign;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 今日头条广告组信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+public interface IByteDanceCampaignService extends IService<ByteDanceCampaign> {
+
+}

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.ctop.service;
+
+import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 今日头条广告组模板信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+public interface IByteDanceCampaignTemplateService extends IService<ByteDanceCampaignTemplate> {
+
+}

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.ctop.service;
+
+import org.jeecg.modules.ctop.entity.ByteDanceCreativeMaterial;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 今日头条创意素材信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+public interface IByteDanceCreativeMaterialService extends IService<ByteDanceCreativeMaterial> {
+
+}

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.ctop.service;
+
+import org.jeecg.modules.ctop.entity.ByteDanceCreative;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 今日头条创意信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+public interface IByteDanceCreativeService extends IService<ByteDanceCreative> {
+
+}

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

@@ -1,14 +0,0 @@
-package org.jeecg.modules.ctop.service;
-
-import org.jeecg.modules.ctop.entity.CTopToutiaoAdvertisePlan;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 头条广告主广告计划信息
- * @Author: jeecg-boot
- * @Date:   2019-07-10
- * @Version: V1.0
- */
-public interface ICTopToutiaoAdvertisePlanService extends IService<CTopToutiaoAdvertisePlan> {
-
-}

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

@@ -1,14 +0,0 @@
-package org.jeecg.modules.ctop.service;
-
-import org.jeecg.modules.ctop.entity.CTopToutiaoAdvertiser;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 头条广告主信息
- * @Author: jeecg-boot
- * @Date:   2019-07-10
- * @Version: V1.0
- */
-public interface ICTopToutiaoAdvertiserService extends IService<CTopToutiaoAdvertiser> {
-
-}

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

@@ -1,14 +0,0 @@
-package org.jeecg.modules.ctop.service;
-
-import org.jeecg.modules.ctop.entity.CTopToutiaoCampaign;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 头条广告主广告组信息
- * @Author: jeecg-boot
- * @Date:   2019-07-10
- * @Version: V1.0
- */
-public interface ICTopToutiaoCampaignService extends IService<CTopToutiaoCampaign> {
-
-}

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

@@ -1,14 +0,0 @@
-package org.jeecg.modules.ctop.service;
-
-import org.jeecg.modules.ctop.entity.CtopToutiaoAdvertiserBudget;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 头条广告主账户预算信息
- * @Author: jeecg-boot
- * @Date:   2019-07-10
- * @Version: V1.0
- */
-public interface ICtopToutiaoAdvertiserBudgetService extends IService<CtopToutiaoAdvertiserBudget> {
-
-}

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

@@ -1,14 +0,0 @@
-package org.jeecg.modules.ctop.service;
-
-import org.jeecg.modules.ctop.entity.CtopToutiaoBudgetTemplate;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 预算与出价模块模板
- * @Author: jeecg-boot
- * @Date:   2019-07-17
- * @Version: V1.0
- */
-public interface ICtopToutiaoBudgetTemplateService extends IService<CtopToutiaoBudgetTemplate> {
-
-}

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

@@ -1,14 +0,0 @@
-package org.jeecg.modules.ctop.service;
-
-import org.jeecg.modules.ctop.entity.ToutiaoCreativeMaterial;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 头条创意素材信息
- * @Author: jeecg-boot
- * @Date:   2019-07-11
- * @Version: V1.0
- */
-public interface IToutiaoCreativeMaterialService extends IService<ToutiaoCreativeMaterial> {
-
-}

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

@@ -1,14 +0,0 @@
-package org.jeecg.modules.ctop.service;
-
-import org.jeecg.modules.ctop.entity.ToutiaoCreative;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 广告创意信息
- * @Author: jeecg-boot
- * @Date:   2019-07-11
- * @Version: V1.0
- */
-public interface IToutiaoCreativeService extends IService<ToutiaoCreative> {
-
-}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.ctop.service.impl;
+
+import org.jeecg.modules.ctop.entity.ByteDanceAdvertisePlan;
+import org.jeecg.modules.ctop.mapper.ByteDanceAdvertisePlanMapper;
+import org.jeecg.modules.ctop.service.IByteDanceAdvertisePlanService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 今日头条广告计划信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+@Service
+public class ByteDanceAdvertisePlanServiceImpl extends ServiceImpl<ByteDanceAdvertisePlanMapper, ByteDanceAdvertisePlan> implements IByteDanceAdvertisePlanService {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.ctop.service.impl;
+
+import org.jeecg.modules.ctop.entity.ByteDanceAdvertiserBudget;
+import org.jeecg.modules.ctop.mapper.ByteDanceAdvertiserBudgetMapper;
+import org.jeecg.modules.ctop.service.IByteDanceAdvertiserBudgetService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 今日头条广告主预算信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+@Service
+public class ByteDanceAdvertiserBudgetServiceImpl extends ServiceImpl<ByteDanceAdvertiserBudgetMapper, ByteDanceAdvertiserBudget> implements IByteDanceAdvertiserBudgetService {
+
+}

+ 63 - 55
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/TouTiaoAdvertiserServiceImpl.java

@@ -7,7 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.jeecg.modules.ctop.entity.*;
 import org.jeecg.modules.ctop.entity.*;
 import org.jeecg.modules.ctop.mapper.*;
 import org.jeecg.modules.ctop.mapper.*;
-import org.jeecg.modules.ctop.service.ITouTiaoAdvertiserService;
+import org.jeecg.modules.ctop.service.IByteDanceAdvertiserDataService;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,17 +18,22 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.TreeMap;
 
 
+/**
+ * @author 宋英豪
+ */
 @Service
 @Service
-public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
-    private static final Logger logger = LoggerFactory.getLogger(TouTiaoAdvertiserServiceImpl.class);
+public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserDataService {
+    private static final Logger logger = LoggerFactory.getLogger(ByteDanceAdvertiserDataServiceImpl.class);
     @Autowired
     @Autowired
     private CTopOauthTokenMapper cTopOauthTokenMapper;
     private CTopOauthTokenMapper cTopOauthTokenMapper;
+
     private CTopOauthToken getOAuthTokenByAccountId(String accountId){
     private CTopOauthToken getOAuthTokenByAccountId(String accountId){
         QueryWrapper<CTopOauthToken> queryWrapper = new QueryWrapper<>();
         QueryWrapper<CTopOauthToken> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("advertiser_id", accountId).orderByDesc("create_time");
         queryWrapper.eq("advertiser_id", accountId).orderByDesc("create_time");
         CTopOauthToken cTopOauthToken = cTopOauthTokenMapper.selectOne(queryWrapper);
         CTopOauthToken cTopOauthToken = cTopOauthTokenMapper.selectOne(queryWrapper);
         return cTopOauthToken;
         return cTopOauthToken;
     }
     }
+
     @Override
     @Override
     public Map<String, Object> getAdvertiserInfo(String accountId) {
     public Map<String, Object> getAdvertiserInfo(String accountId) {
         Map<String,Object>resultMap = new HashMap<>();
         Map<String,Object>resultMap = new HashMap<>();
@@ -56,19 +61,19 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
             resultMap.put("message","广告主信息不存在");
             resultMap.put("message","广告主信息不存在");
             return resultMap;
             return resultMap;
         }
         }
-        for (int i=0;i<data.size();i++){
+        for (int i = 0; i<data.size(); i++){
             JSONObject dataObject = data.getJSONObject(i);
             JSONObject dataObject = data.getJSONObject(i);
-            CTopToutiaoAdvertiser toutiaoAdvertiser = new CTopToutiaoAdvertiser(dataObject,accountId);
+            ByteDanceAdvertiser advertiser = new ByteDanceAdvertiser(dataObject, accountId);
             //清除清数据,插入新数据
             //清除清数据,插入新数据
-            cTopToutiaoAdvertiserMapper.deleteById(toutiaoAdvertiser.getId());
-            cTopToutiaoAdvertiserMapper.insert(toutiaoAdvertiser);
+            advertiserMapper.deleteById(advertiser.getId());
+            advertiserMapper.insert(advertiser);
         }
         }
         resultMap.put("code",0);
         resultMap.put("code",0);
         resultMap.put("message","获取广告主信息成功");
         resultMap.put("message","获取广告主信息成功");
         return resultMap;
         return resultMap;
     }
     }
 
 
-    private void getAdvertiserPlanByPageNumber(String accountId, Integer pageNumber,String ids){
+    private void getAdvertiserPlanByPageNumber(String accountId, Integer pageNumber, String ids){
         CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
         CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config","bytedance_api_url")+PropertiesUtils.getValue("bytedance_config","bytedance_v2_ad_get");
         String url = PropertiesUtils.getValue("bytedance_config","bytedance_api_url")+PropertiesUtils.getValue("bytedance_config","bytedance_v2_ad_get");
@@ -83,7 +88,7 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
         if(null!=ids&&!"".equals(ids.trim())){
         if(null!=ids&&!"".equals(ids.trim())){
             String[] idsArray = ids.split(",");
             String[] idsArray = ids.split(",");
             JSONArray filterIdsArray = new JSONArray();
             JSONArray filterIdsArray = new JSONArray();
-            for (int i=0;i<idsArray.length;i++){
+            for (int i=0; i<idsArray.length; i++){
                 Long id = Long.parseLong(idsArray[i]);
                 Long id = Long.parseLong(idsArray[i]);
                 filterIdsArray.add(id);
                 filterIdsArray.add(id);
             }
             }
@@ -104,19 +109,21 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
             logger.info("获取广告主广告计划信息不存在==》accountId:{},message:{}",accountId,jsonObject.getString("message"));
             logger.info("获取广告主广告计划信息不存在==》accountId:{},message:{}",accountId,jsonObject.getString("message"));
             return ;
             return ;
         }
         }
-        for (int i=0;i<data.size();i++){
+        for (int i = 0; i<data.size(); i++){
             JSONObject dataObject = data.getJSONObject(i);
             JSONObject dataObject = data.getJSONObject(i);
-            CTopToutiaoAdvertisePlan toutiaoAdvertisePlan = new CTopToutiaoAdvertisePlan(dataObject,accountId);
+            ByteDanceAdvertisePlan advertisePlan = new ByteDanceAdvertisePlan(dataObject, accountId);
             //清除清数据,插入新数据
             //清除清数据,插入新数据
-            cTopToutiaoAdvertisePlanMapper.deleteById(toutiaoAdvertisePlan.getId());
-            cTopToutiaoAdvertisePlanMapper.insert(toutiaoAdvertisePlan);
+            advertisePlanMapper.deleteById(advertisePlan.getId());
+            advertisePlanMapper.insert(advertisePlan);
         }
         }
         getAdvertiserPlanByPageNumber(accountId,pageNumber+1,ids);
         getAdvertiserPlanByPageNumber(accountId,pageNumber+1,ids);
     }
     }
+
     @Autowired
     @Autowired
-    private CTopToutiaoAdvertisePlanMapper cTopToutiaoAdvertisePlanMapper;
+    private ByteDanceAdvertisePlanMapper advertisePlanMapper;
+
     @Override
     @Override
-    public Map<String, Object> getAdvertiserPlan(String accountId,String ids) {
+    public Map<String, Object> getAdvertiserPlan(String accountId, String ids) {
         getAdvertiserPlanByPageNumber(accountId,1,ids);
         getAdvertiserPlanByPageNumber(accountId,1,ids);
         Map<String,Object>resultMap = new HashMap<>();
         Map<String,Object>resultMap = new HashMap<>();
         resultMap.put("code",0);
         resultMap.put("code",0);
@@ -125,7 +132,7 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
     }
     }
 
 
     @Override
     @Override
-    public Map<String, Object> getAdvertiserCampaign(String accountId,String ids) {
+    public Map<String, Object> getAdvertiserCampaign(String accountId, String ids) {
         getAdvertiserCampaignByPageNumber(accountId,1,ids);
         getAdvertiserCampaignByPageNumber(accountId,1,ids);
         Map<String,Object>resultMap = new HashMap<>();
         Map<String,Object>resultMap = new HashMap<>();
         resultMap.put("code",0);
         resultMap.put("code",0);
@@ -162,12 +169,12 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
             resultMap.put("message","获取广告主预算信息完成");
             resultMap.put("message","获取广告主预算信息完成");
             return resultMap;
             return resultMap;
         }
         }
-        for (int i=0;i<data.size();i++){
+        for (int i = 0; i<data.size(); i++){
             JSONObject dataObject = data.getJSONObject(i);
             JSONObject dataObject = data.getJSONObject(i);
-            CtopToutiaoAdvertiserBudget budget = new CtopToutiaoAdvertiserBudget(dataObject,accountId);
+            ByteDanceAdvertiserBudget advertiserBudget = new ByteDanceAdvertiserBudget(dataObject, accountId);
             //清除清数据,插入新数据
             //清除清数据,插入新数据
-            ctopToutiaoAdvertiserBudgetMapper.deleteById(budget.getId());
-            ctopToutiaoAdvertiserBudgetMapper.insert(budget);
+            advertiserBudgetMapper.deleteById(advertiserBudget.getId());
+            advertiserBudgetMapper.insert(advertiserBudget);
         }
         }
         resultMap.put("code",0);
         resultMap.put("code",0);
         resultMap.put("message","获取广告预算信息完成");
         resultMap.put("message","获取广告预算信息完成");
@@ -175,7 +182,7 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
     }
     }
 
 
     @Override
     @Override
-    public Map<String, Object> getAdvertiserCreative(String accountId,String ids) {
+    public Map<String, Object> getAdvertiserCreative(String accountId, String ids) {
         Map<String,Object>resultMap = new HashMap<>();
         Map<String,Object>resultMap = new HashMap<>();
         getAdvertiserCreativeByPageNumber(accountId,1,ids);
         getAdvertiserCreativeByPageNumber(accountId,1,ids);
         resultMap.put("code",0);
         resultMap.put("code",0);
@@ -213,12 +220,12 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
             resultMap.put("message","获取广告主预算信息完成");
             resultMap.put("message","获取广告主预算信息完成");
             return resultMap;
             return resultMap;
         }
         }
-        for (int i=0;i<data.size();i++){
+        for (int i = 0; i<data.size(); i++){
             JSONObject dataObject = data.getJSONObject(i);
             JSONObject dataObject = data.getJSONObject(i);
-            ToutiaoCreativeMaterial material = new ToutiaoCreativeMaterial(dataObject,accountId);
+            ByteDanceCreativeMaterial material = new ByteDanceCreativeMaterial(dataObject, accountId);
             //清除清数据,插入新数据
             //清除清数据,插入新数据
-            toutiaoCreativeMaterialMapper.deleteById(material.getId());
-            toutiaoCreativeMaterialMapper.insert(material);
+            creativeMaterialMapper.deleteById(material.getId());
+            creativeMaterialMapper.insert(material);
         }
         }
         resultMap.put("code",0);
         resultMap.put("code",0);
         resultMap.put("message","获取广告主预算信息完成");
         resultMap.put("message","获取广告主预算信息完成");
@@ -259,9 +266,9 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
             return resultMap;
             return resultMap;
         }
         }
         Long id =  data.getLong("campaign_id");
         Long id =  data.getLong("campaign_id");
-        CTopToutiaoCampaign campaign = new CTopToutiaoCampaign(id,cTopOauthToken,campaignName,budgetMode,budget,landingType);
+        ByteDanceCampaign campaign = new ByteDanceCampaign(id, cTopOauthToken, campaignName, budgetMode, budget, landingType);
         //清除清数据,插入新数据
         //清除清数据,插入新数据
-        cTopToutiaoCampaignMapper.insert(campaign);
+        campaignMapper.insert(campaign);
         resultMap.put("code",0);
         resultMap.put("code",0);
         resultMap.put("message","广告组创建成功");
         resultMap.put("message","广告组创建成功");
         return resultMap;
         return resultMap;
@@ -273,7 +280,7 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
         JSONArray ids = new JSONArray();
         JSONArray ids = new JSONArray();
         String [] getIds = campaignIds.split(",");
         String [] getIds = campaignIds.split(",");
         if(null!=getIds&&getIds.length>0){
         if(null!=getIds&&getIds.length>0){
-            for(int i=0;i<getIds.length;i++){
+            for(int i = 0; i<getIds.length; i++){
                 ids.add(Long.parseLong(getIds[i]));
                 ids.add(Long.parseLong(getIds[i]));
             }
             }
         }
         }
@@ -307,13 +314,13 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
         }
         }
         JSONArray getCampaignIds =  data.getJSONArray("campaign_ids");
         JSONArray getCampaignIds =  data.getJSONArray("campaign_ids");
         if(null!=getCampaignIds&&getCampaignIds.size()>0){
         if(null!=getCampaignIds&&getCampaignIds.size()>0){
-            for(int i=0;i<getCampaignIds.size();i++){
+            for(int i = 0; i<getCampaignIds.size(); i++){
                 Long id = getCampaignIds.getLong(i);
                 Long id = getCampaignIds.getLong(i);
-                CTopToutiaoCampaign campaign = cTopToutiaoCampaignMapper.selectById(id);
+                ByteDanceCampaign campaign = campaignMapper.selectById(id);
                 if(null!=campaign){
                 if(null!=campaign){
                     campaign.setOptStatus(optStatus);
                     campaign.setOptStatus(optStatus);
                 }
                 }
-                cTopToutiaoCampaignMapper.updateById(campaign);
+                campaignMapper.updateById(campaign);
             }
             }
         }
         }
         resultMap.put("code",0);
         resultMap.put("code",0);
@@ -322,10 +329,10 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
     }
     }
 
 
     @Override
     @Override
-    public Map<String, Object> advertiserCampaignUpdate(String accountId, Long campaignId, String budgetMode, Integer budget,String campaignName) {
+    public Map<String, Object> advertiserCampaignUpdate(String accountId, Long campaignId, String budgetMode, Integer budget, String campaignName) {
         Map<String,Object>resultMap = new HashMap<>();
         Map<String,Object>resultMap = new HashMap<>();
         CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
         CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
-        CTopToutiaoCampaign campaign = cTopToutiaoCampaignMapper.selectById(campaignId);
+        ByteDanceCampaign campaign = campaignMapper.selectById(campaignId);
         //2: 根据token以及用户id获取用户信息数据
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config","bytedance_api_url")+PropertiesUtils.getValue("bytedance_config","bytedance_v2_campaign_update");
         String url = PropertiesUtils.getValue("bytedance_config","bytedance_api_url")+PropertiesUtils.getValue("bytedance_config","bytedance_v2_campaign_update");
         Map<String,String> headers = new HashMap<>();
         Map<String,String> headers = new HashMap<>();
@@ -373,7 +380,7 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
         if(null!=budget){
         if(null!=budget){
             campaign.setBudget(new BigDecimal(budget));
             campaign.setBudget(new BigDecimal(budget));
         }
         }
-        cTopToutiaoCampaignMapper.updateById(campaign);
+        campaignMapper.updateById(campaign);
 
 
         resultMap.put("code",0);
         resultMap.put("code",0);
         resultMap.put("message","广告组信息修改成功");
         resultMap.put("message","广告组信息修改成功");
@@ -386,7 +393,7 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
         JSONArray ids = new JSONArray();
         JSONArray ids = new JSONArray();
         String [] getIds = adIds.split(",");
         String [] getIds = adIds.split(",");
         if(null!=getIds&&getIds.length>0){
         if(null!=getIds&&getIds.length>0){
-            for(int i=0;i<getIds.length;i++){
+            for(int i = 0; i<getIds.length; i++){
                 ids.add(Long.parseLong(getIds[i]));
                 ids.add(Long.parseLong(getIds[i]));
             }
             }
         }
         }
@@ -436,7 +443,7 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
         String [] getadIds = adIds.split(",");
         String [] getadIds = adIds.split(",");
         String [] getBids = bids.split(",");
         String [] getBids = bids.split(",");
         if(null!=getadIds&&getadIds.length>0){
         if(null!=getadIds&&getadIds.length>0){
-            for(int i=0;i<getadIds.length;i++){
+            for(int i=0; i<getadIds.length; i++){
                 JSONObject object = new JSONObject();
                 JSONObject object = new JSONObject();
                 Long ad_id = Long.parseLong(getadIds[i]);
                 Long ad_id = Long.parseLong(getadIds[i]);
                 Long bid = Long.parseLong(getBids[i]);
                 Long bid = Long.parseLong(getBids[i]);
@@ -490,7 +497,7 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
         String [] getadIds = adIds.split(",");
         String [] getadIds = adIds.split(",");
         String [] getBudgets = budgets.split(",");
         String [] getBudgets = budgets.split(",");
         if(null!=getadIds&&getadIds.length>0){
         if(null!=getadIds&&getadIds.length>0){
-            for(int i=0;i<getadIds.length;i++){
+            for(int i=0; i<getadIds.length; i++){
                 JSONObject object = new JSONObject();
                 JSONObject object = new JSONObject();
                 Long ad_id = Long.parseLong(getadIds[i]);
                 Long ad_id = Long.parseLong(getadIds[i]);
                 Long budget = Long.parseLong(getBudgets[i]);
                 Long budget = Long.parseLong(getBudgets[i]);
@@ -541,7 +548,7 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
         JSONArray ids = new JSONArray();
         JSONArray ids = new JSONArray();
         String [] getCreativeIds = creativeIds.split(",");
         String [] getCreativeIds = creativeIds.split(",");
         if(null!=getCreativeIds&&getCreativeIds.length>0){
         if(null!=getCreativeIds&&getCreativeIds.length>0){
-            for(int i=0;i<getCreativeIds.length;i++){
+            for(int i=0; i<getCreativeIds.length; i++){
                 ids.add(Long.parseLong(getCreativeIds[i]));
                 ids.add(Long.parseLong(getCreativeIds[i]));
             }
             }
         }
         }
@@ -584,9 +591,9 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
     }
     }
 
 
     @Autowired
     @Autowired
-    private ToutiaoCreativeMaterialMapper toutiaoCreativeMaterialMapper;
+    private ByteDanceCreativeMaterialMapper creativeMaterialMapper;
 
 
-    private void getAdvertiserCreativeByPageNumber(String accountId, Integer pageNumber,String ids){
+    private void getAdvertiserCreativeByPageNumber(String accountId, Integer pageNumber, String ids){
         CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
         CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config","bytedance_api_url")+PropertiesUtils.getValue("bytedance_config","bytedance_v2_creative_get");
         String url = PropertiesUtils.getValue("bytedance_config","bytedance_api_url")+PropertiesUtils.getValue("bytedance_config","bytedance_v2_creative_get");
@@ -599,7 +606,7 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
         if(null!=ids&&!"".equals(ids.trim())){
         if(null!=ids&&!"".equals(ids.trim())){
             String[] idsArray = ids.split(",");
             String[] idsArray = ids.split(",");
             JSONArray filterIdsArray = new JSONArray();
             JSONArray filterIdsArray = new JSONArray();
-            for (int i=0;i<idsArray.length;i++){
+            for (int i=0; i<idsArray.length; i++){
                 Long id = Long.parseLong(idsArray[i]);
                 Long id = Long.parseLong(idsArray[i]);
                 filterIdsArray.add(id);
                 filterIdsArray.add(id);
             }
             }
@@ -621,22 +628,22 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
             logger.info("广告主广告创意信息不存在==》accountId:{},message:{}",accountId,jsonObject.getString("message"));
             logger.info("广告主广告创意信息不存在==》accountId:{},message:{}",accountId,jsonObject.getString("message"));
             return ;
             return ;
         }
         }
-        for (int i=0;i<data.size();i++){
+        for (int i = 0; i<data.size(); i++){
             JSONObject dataObject = data.getJSONObject(i);
             JSONObject dataObject = data.getJSONObject(i);
-            ToutiaoCreative creative = new ToutiaoCreative(dataObject,accountId);
+            ByteDanceCreative creative = new ByteDanceCreative(dataObject, accountId);
             //清除清数据,插入新数据
             //清除清数据,插入新数据
-            toutiaoCreativeMapper.deleteById(creative.getId());
-            toutiaoCreativeMapper.insert(creative);
+            creativeMapper.deleteById(creative.getId());
+            creativeMapper.insert(creative);
         }
         }
         getAdvertiserCreativeByPageNumber(accountId,pageNumber+1,ids);
         getAdvertiserCreativeByPageNumber(accountId,pageNumber+1,ids);
     }
     }
 
 
     @Autowired
     @Autowired
-    private ToutiaoCreativeMapper toutiaoCreativeMapper;
+    private ByteDanceCreativeMapper creativeMapper;
     @Autowired
     @Autowired
-    private CtopToutiaoAdvertiserBudgetMapper ctopToutiaoAdvertiserBudgetMapper;
+    private ByteDanceAdvertiserBudgetMapper advertiserBudgetMapper;
 
 
-    private void getAdvertiserCampaignByPageNumber(String accountId, Integer pageNumber,String ids){
+    private void getAdvertiserCampaignByPageNumber(String accountId, Integer pageNumber, String ids){
         CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
         CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config","bytedance_api_url")+PropertiesUtils.getValue("bytedance_config","bytedance_v2_campaign_get");
         String url = PropertiesUtils.getValue("bytedance_config","bytedance_api_url")+PropertiesUtils.getValue("bytedance_config","bytedance_v2_campaign_get");
@@ -649,7 +656,7 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
         if(null!=ids&&!"".equals(ids.trim())){
         if(null!=ids&&!"".equals(ids.trim())){
             String[] idsArray = ids.split(",");
             String[] idsArray = ids.split(",");
             JSONArray filterIdsArray = new JSONArray();
             JSONArray filterIdsArray = new JSONArray();
-            for (int i=0;i<idsArray.length;i++){
+            for (int i=0; i<idsArray.length; i++){
                 Long id = Long.parseLong(idsArray[i]);
                 Long id = Long.parseLong(idsArray[i]);
                 filterIdsArray.add(id);
                 filterIdsArray.add(id);
             }
             }
@@ -671,18 +678,19 @@ public class TouTiaoAdvertiserServiceImpl implements ITouTiaoAdvertiserService {
             logger.info("获取广告主广告组信息不存在==》accountId:{},message:{}",accountId,jsonObject.getString("message"));
             logger.info("获取广告主广告组信息不存在==》accountId:{},message:{}",accountId,jsonObject.getString("message"));
             return ;
             return ;
         }
         }
-        for (int i=0;i<data.size();i++){
+        for (int i = 0; i<data.size(); i++){
             JSONObject dataObject = data.getJSONObject(i);
             JSONObject dataObject = data.getJSONObject(i);
-            CTopToutiaoCampaign toutiaoCampaign = new CTopToutiaoCampaign(dataObject,accountId);
+            ByteDanceCampaign campaign = new ByteDanceCampaign(dataObject, accountId);
             //清除清数据,插入新数据
             //清除清数据,插入新数据
-            cTopToutiaoCampaignMapper.deleteById(toutiaoCampaign.getId());
-            cTopToutiaoCampaignMapper.insert(toutiaoCampaign);
+            campaignMapper.deleteById(campaign.getId());
+            campaignMapper.insert(campaign);
         }
         }
         getAdvertiserCampaignByPageNumber(accountId,pageNumber+1,ids);
         getAdvertiserCampaignByPageNumber(accountId,pageNumber+1,ids);
     }
     }
+
     @Autowired
     @Autowired
-    private CTopToutiaoCampaignMapper cTopToutiaoCampaignMapper;
+    private ByteDanceCampaignMapper campaignMapper;
 
 
     @Autowired
     @Autowired
-    private CTopToutiaoAdvertiserMapper cTopToutiaoAdvertiserMapper;
+    private ByteDanceAdvertiserMapper advertiserMapper;
 }
 }

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.ctop.service.impl;
+
+import org.jeecg.modules.ctop.entity.ByteDanceAdvertiser;
+import org.jeecg.modules.ctop.mapper.ByteDanceAdvertiserMapper;
+import org.jeecg.modules.ctop.service.IByteDanceAdvertiserService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 今日头条广告主信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+@Service
+public class ByteDanceAdvertiserServiceImpl extends ServiceImpl<ByteDanceAdvertiserMapper, ByteDanceAdvertiser> implements IByteDanceAdvertiserService {
+
+}

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

@@ -0,0 +1,35 @@
+package org.jeecg.modules.ctop.service.impl;
+
+import org.jeecg.modules.ctop.entity.ByteDanceBudgetTemplate;
+import org.jeecg.modules.ctop.mapper.ByteDanceBudgetTemplateMapper;
+import org.jeecg.modules.ctop.service.IByteDanceBudgetTemplateService;
+import org.omg.CORBA.OBJ_ADAPTER;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Description: 今日头条预算模板信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+@Service
+public class ByteDanceBudgetTemplateServiceImpl extends ServiceImpl<ByteDanceBudgetTemplateMapper, ByteDanceBudgetTemplate> implements IByteDanceBudgetTemplateService {
+
+    @Override
+    public Map<String, Object> insertTemplate(ByteDanceBudgetTemplate template) {
+        Map<String, Object> resultMap = new HashMap<>();
+        budgetTemplateMapper.insert(template);
+        resultMap.put("success", true);
+        resultMap.put("message", "模板保存成功");
+        return resultMap;
+    }
+
+    @Autowired
+    private ByteDanceBudgetTemplateMapper budgetTemplateMapper;
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.ctop.service.impl;
+
+import org.jeecg.modules.ctop.entity.ByteDanceCampaign;
+import org.jeecg.modules.ctop.mapper.ByteDanceCampaignMapper;
+import org.jeecg.modules.ctop.service.IByteDanceCampaignService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 今日头条广告组信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+@Service
+public class ByteDanceCampaignServiceImpl extends ServiceImpl<ByteDanceCampaignMapper, ByteDanceCampaign> implements IByteDanceCampaignService {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.ctop.service.impl;
+
+import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
+import org.jeecg.modules.ctop.mapper.ByteDanceCampaignTemplateMapper;
+import org.jeecg.modules.ctop.service.IByteDanceCampaignTemplateService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 今日头条广告组模板信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+@Service
+public class ByteDanceCampaignTemplateServiceImpl extends ServiceImpl<ByteDanceCampaignTemplateMapper, ByteDanceCampaignTemplate> implements IByteDanceCampaignTemplateService {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.ctop.service.impl;
+
+import org.jeecg.modules.ctop.entity.ByteDanceCreativeMaterial;
+import org.jeecg.modules.ctop.mapper.ByteDanceCreativeMaterialMapper;
+import org.jeecg.modules.ctop.service.IByteDanceCreativeMaterialService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 今日头条创意素材信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+@Service
+public class ByteDanceCreativeMaterialServiceImpl extends ServiceImpl<ByteDanceCreativeMaterialMapper, ByteDanceCreativeMaterial> implements IByteDanceCreativeMaterialService {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.ctop.service.impl;
+
+import org.jeecg.modules.ctop.entity.ByteDanceCreative;
+import org.jeecg.modules.ctop.mapper.ByteDanceCreativeMapper;
+import org.jeecg.modules.ctop.service.IByteDanceCreativeService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 今日头条创意信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-22
+ * @Version: V1.0
+ */
+@Service
+public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeMapper, ByteDanceCreative> implements IByteDanceCreativeService {
+
+}

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

@@ -1,19 +0,0 @@
-package org.jeecg.modules.ctop.service.impl;
-
-import org.jeecg.modules.ctop.entity.CTopToutiaoAdvertisePlan;
-import org.jeecg.modules.ctop.mapper.CTopToutiaoAdvertisePlanMapper;
-import org.jeecg.modules.ctop.service.ICTopToutiaoAdvertisePlanService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 头条广告主广告计划信息
- * @Author: jeecg-boot
- * @Date:   2019-07-10
- * @Version: V1.0
- */
-@Service
-public class CTopToutiaoAdvertisePlanServiceImpl extends ServiceImpl<CTopToutiaoAdvertisePlanMapper, CTopToutiaoAdvertisePlan> implements ICTopToutiaoAdvertisePlanService {
-
-}

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

@@ -1,19 +0,0 @@
-package org.jeecg.modules.ctop.service.impl;
-
-import org.jeecg.modules.ctop.entity.CTopToutiaoAdvertiser;
-import org.jeecg.modules.ctop.mapper.CTopToutiaoAdvertiserMapper;
-import org.jeecg.modules.ctop.service.ICTopToutiaoAdvertiserService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 头条广告主信息
- * @Author: jeecg-boot
- * @Date:   2019-07-10
- * @Version: V1.0
- */
-@Service
-public class CTopToutiaoAdvertiserServiceImpl extends ServiceImpl<CTopToutiaoAdvertiserMapper, CTopToutiaoAdvertiser> implements ICTopToutiaoAdvertiserService {
-
-}

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

@@ -1,19 +0,0 @@
-package org.jeecg.modules.ctop.service.impl;
-
-import org.jeecg.modules.ctop.entity.CTopToutiaoCampaign;
-import org.jeecg.modules.ctop.mapper.CTopToutiaoCampaignMapper;
-import org.jeecg.modules.ctop.service.ICTopToutiaoCampaignService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 头条广告主广告组信息
- * @Author: jeecg-boot
- * @Date:   2019-07-10
- * @Version: V1.0
- */
-@Service
-public class CTopToutiaoCampaignServiceImpl extends ServiceImpl<CTopToutiaoCampaignMapper, CTopToutiaoCampaign> implements ICTopToutiaoCampaignService {
-
-}

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

@@ -1,19 +0,0 @@
-package org.jeecg.modules.ctop.service.impl;
-
-import org.jeecg.modules.ctop.entity.CtopToutiaoAdvertiserBudget;
-import org.jeecg.modules.ctop.mapper.CtopToutiaoAdvertiserBudgetMapper;
-import org.jeecg.modules.ctop.service.ICtopToutiaoAdvertiserBudgetService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 头条广告主账户预算信息
- * @Author: jeecg-boot
- * @Date:   2019-07-10
- * @Version: V1.0
- */
-@Service
-public class CtopToutiaoAdvertiserBudgetServiceImpl extends ServiceImpl<CtopToutiaoAdvertiserBudgetMapper, CtopToutiaoAdvertiserBudget> implements ICtopToutiaoAdvertiserBudgetService {
-
-}

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

@@ -1,19 +0,0 @@
-package org.jeecg.modules.ctop.service.impl;
-
-import org.jeecg.modules.ctop.entity.CtopToutiaoBudgetTemplate;
-import org.jeecg.modules.ctop.mapper.CtopToutiaoBudgetTemplateMapper;
-import org.jeecg.modules.ctop.service.ICtopToutiaoBudgetTemplateService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 预算与出价模块模板
- * @Author: jeecg-boot
- * @Date:   2019-07-17
- * @Version: V1.0
- */
-@Service
-public class CtopToutiaoBudgetTemplateServiceImpl extends ServiceImpl<CtopToutiaoBudgetTemplateMapper, CtopToutiaoBudgetTemplate> implements ICtopToutiaoBudgetTemplateService {
-
-}

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

@@ -1,19 +0,0 @@
-package org.jeecg.modules.ctop.service.impl;
-
-import org.jeecg.modules.ctop.entity.ToutiaoCreativeMaterial;
-import org.jeecg.modules.ctop.mapper.ToutiaoCreativeMaterialMapper;
-import org.jeecg.modules.ctop.service.IToutiaoCreativeMaterialService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 头条创意素材信息
- * @Author: jeecg-boot
- * @Date:   2019-07-11
- * @Version: V1.0
- */
-@Service
-public class ToutiaoCreativeMaterialServiceImpl extends ServiceImpl<ToutiaoCreativeMaterialMapper, ToutiaoCreativeMaterial> implements IToutiaoCreativeMaterialService {
-
-}

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

@@ -1,19 +0,0 @@
-package org.jeecg.modules.ctop.service.impl;
-
-import org.jeecg.modules.ctop.entity.ToutiaoCreative;
-import org.jeecg.modules.ctop.mapper.ToutiaoCreativeMapper;
-import org.jeecg.modules.ctop.service.IToutiaoCreativeService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 广告创意信息
- * @Author: jeecg-boot
- * @Date:   2019-07-11
- * @Version: V1.0
- */
-@Service
-public class ToutiaoCreativeServiceImpl extends ServiceImpl<ToutiaoCreativeMapper, ToutiaoCreative> implements IToutiaoCreativeService {
-
-}

+ 324 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/ByteDanceAdvertisePlanList.vue

@@ -0,0 +1,324 @@
+<template>
+    <a-card :bordered="false">
+
+        <!-- 查询区域 -->
+        <div class="table-page-search-wrapper">
+            <a-form layout="inline">
+                <a-row :gutter="24">
+
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="平台广告主id">
+                            <a-input placeholder="请输入平台广告主id" v-model="queryParam.advertiserId"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="头条广告主id">
+                            <a-input placeholder="请输入头条广告主id" v-model="queryParam.toutiaoId"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <template v-if="toggleSearchStatus">
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="计划名称">
+                                <a-input placeholder="请输入计划名称" v-model="queryParam.name"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="广告组id">
+                                <a-input placeholder="请输入广告组id" v-model="queryParam.campaignId"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="上次修改时间戳(用于更新时提交,服务端判断是否基于最新信息修改)">
+                                <a-input placeholder="请输入上次修改时间戳(用于更新时提交,服务端判断是否基于最新信息修改)"
+                                         v-model="queryParam.planModifyTime"></a-input>
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                    <a-col :md="6" :sm="8">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+                    </a-col>
+
+                </a-row>
+            </a-form>
+        </div>
+
+        <!-- 操作按钮区域 -->
+        <div class="table-operator">
+            <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('今日头条广告计划信息')">导出</a-button>
+            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
+                      :action="importExcelUrl" @change="handleImportExcel">
+                <a-button type="primary" icon="import">导入</a-button>
+            </a-upload>
+            <a-dropdown v-if="selectedRowKeys.length > 0">
+                <a-menu slot="overlay">
+                    <a-menu-item key="1" @click="batchDel">
+                        <a-icon type="delete"/>
+                        删除
+                    </a-menu-item>
+                </a-menu>
+                <a-button style="margin-left: 8px"> 批量操作
+                    <a-icon type="down"/>
+                </a-button>
+            </a-dropdown>
+        </div>
+
+        <!-- table区域-begin -->
+        <div>
+            <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+                <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
+                selectedRowKeys.length }}</a>项
+                <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+            </div>
+
+            <a-table
+                    ref="table"
+                    size="middle"
+                    bordered
+                    rowKey="id"
+                    :columns="columns"
+                    :dataSource="dataSource"
+                    :pagination="ipagination"
+                    :loading="loading"
+                    :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+                    @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical"/>
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+            </a-table>
+        </div>
+        <!-- table区域-end -->
+
+        <!-- 表单区域 -->
+        <byteDanceAdvertisePlan-modal ref="modalForm" @ok="modalFormOk"></byteDanceAdvertisePlan-modal>
+    </a-card>
+</template>
+
+<script>
+    import ByteDanceAdvertisePlanModal from './modules/ByteDanceAdvertisePlanModal'
+    import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+
+    export default {
+        name: "ByteDanceAdvertisePlanList",
+        mixins: [JeecgListMixin],
+        components: {
+            ByteDanceAdvertisePlanModal
+        },
+        data() {
+            return {
+                description: '今日头条广告计划信息管理页面',
+                // 表头
+                columns: [
+                    {
+                        title: '#',
+                        dataIndex: '',
+                        key: 'rowIndex',
+                        width: 60,
+                        align: "center",
+                        customRender: function (t, r, index) {
+                            return parseInt(index) + 1;
+                        }
+                    },
+                    {
+                        title: '平台广告主id',
+                        align: "center",
+                        dataIndex: 'advertiserId'
+                    },
+                    {
+                        title: '头条广告主id',
+                        align: "center",
+                        dataIndex: 'toutiaoId'
+                    },
+                    {
+                        title: '计划名称',
+                        align: "center",
+                        dataIndex: 'name'
+                    },
+                    {
+                        title: '广告组id',
+                        align: "center",
+                        dataIndex: 'campaignId'
+                    },
+                    {
+                        title: '上次修改时间戳(用于更新时提交,服务端判断是否基于最新信息修改)',
+                        align: "center",
+                        dataIndex: 'planModifyTime'
+                    },
+                    {
+                        title: '投放范围',
+                        align: "center",
+                        dataIndex: 'deliveryRange'
+                    },
+                    {
+                        title: '计划上次修改时间',
+                        align: "center",
+                        dataIndex: 'adModifyTime'
+                    },
+                    {
+                        title: '计划创建时间',
+                        align: "center",
+                        dataIndex: 'adCreateTime'
+                    },
+                    {
+                        title: '广告预算类型',
+                        align: "center",
+                        dataIndex: 'budgetMode'
+                    },
+                    {
+                        title: '广告预算',
+                        align: "center",
+                        dataIndex: 'budget'
+                    },
+                    {
+                        title: '广告计划投放状态',
+                        align: "center",
+                        dataIndex: 'toutiaoStatus'
+                    },
+                    {
+                        title: '广告计划操作状态',
+                        align: "center",
+                        dataIndex: 'optStatus'
+                    },
+                    {
+                        title: '广告投放起始时间',
+                        align: "center",
+                        dataIndex: 'startTime'
+                    },
+                    {
+                        title: '广告投放结束时间',
+                        align: "center",
+                        dataIndex: 'endTime'
+                    },
+                    {
+                        title: '广告出价',
+                        align: "center",
+                        dataIndex: 'bid'
+                    },
+                    {
+                        title: '广告出价类型',
+                        align: "center",
+                        dataIndex: 'pricing'
+                    },
+                    {
+                        title: '广告投放时间类型',
+                        align: "center",
+                        dataIndex: 'scheduleType'
+                    },
+                    {
+                        title: '广告投放时段',
+                        align: "center",
+                        dataIndex: 'scheduleTime'
+                    },
+                    {
+                        title: '广告投放速度类型',
+                        align: "center",
+                        dataIndex: 'flowControlMode'
+                    },
+                    {
+                        title: '应用直达链接',
+                        align: "center",
+                        dataIndex: 'openUrl'
+                    },
+                    {
+                        title: '应用下载方式',
+                        align: "center",
+                        dataIndex: 'downloadType'
+                    },
+                    {
+                        title: '广告落地页链接',
+                        align: "center",
+                        dataIndex: 'externalUrl'
+                    },
+                    {
+                        title: '广告应用下载包名',
+                        align: "center",
+                        dataIndex: 'toutiaoPackage'
+                    },
+                    {
+                        title: '广告应用下载类型',
+                        align: "center",
+                        dataIndex: 'appType'
+                    },
+                    {
+                        title: '广告计划审核不通过原因',
+                        align: "center",
+                        dataIndex: 'auditRejectReason'
+                    },
+                    {
+                        title: 'ocpc广告转化出价',
+                        align: "center",
+                        dataIndex: 'cpaBid'
+                    },
+                    {
+                        title: 'ocpc广告是否跳过第一阶段',
+                        align: "center",
+                        dataIndex: 'cpaSkipFirstPhrase'
+                    },
+                    {
+                        title: '转化类型广告的转化工具id',
+                        align: "center",
+                        dataIndex: 'convertId'
+                    },
+                    {
+                        title: '过滤已转化用户类型字段',
+                        align: "center",
+                        dataIndex: 'hideIfConverted'
+                    },
+                    {
+                        title: '过滤已安装,当推广目标为安卓应用下载时可填',
+                        align: "center",
+                        dataIndex: 'hideIfExists'
+                    },
+                    {
+                        title: 'audience',
+                        align: "center",
+                        dataIndex: 'audience'
+                    },
+                    {
+                        title: '操作',
+                        dataIndex: 'action',
+                        align: "center",
+                        scopedSlots: {customRender: 'action'},
+                    }
+                ],
+                url: {
+                    list: "/ctop/byteDanceAdvertisePlan/list",
+                    delete: "/ctop/byteDanceAdvertisePlan/delete",
+                    deleteBatch: "/ctop/byteDanceAdvertisePlan/deleteBatch",
+                    exportXlsUrl: "ctop/byteDanceAdvertisePlan/exportXls",
+                    importExcelUrl: "ctop/byteDanceAdvertisePlan/importExcel",
+                },
+            }
+        },
+        computed: {
+            importExcelUrl: function () {
+                return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+            }
+        },
+        methods: {}
+    }
+</script>
+<style scoped>
+    @import '~@assets/less/common.less'
+</style>

+ 11 - 11
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/CtopToutiaoAdvertiserBudgetList.vue

@@ -49,7 +49,7 @@ BUDGET_MODE_TOTAL 	总预算" v-model="queryParam.budgetMode"></a-input>
         <!-- 操作按钮区域 -->
         <!-- 操作按钮区域 -->
         <div class="table-operator">
         <div class="table-operator">
             <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
             <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-            <a-button type="primary" icon="download" @click="handleExportXls('头条广告主账户预算信息')">导出</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('今日头条广告主预算信息')">导出</a-button>
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
                       :action="importExcelUrl" @change="handleImportExcel">
                       :action="importExcelUrl" @change="handleImportExcel">
                 <a-button type="primary" icon="import">导入</a-button>
                 <a-button type="primary" icon="import">导入</a-button>
@@ -108,23 +108,23 @@ BUDGET_MODE_TOTAL 	总预算" v-model="queryParam.budgetMode"></a-input>
         <!-- table区域-end -->
         <!-- table区域-end -->
 
 
         <!-- 表单区域 -->
         <!-- 表单区域 -->
-        <ctopToutiaoAdvertiserBudget-modal ref="modalForm" @ok="modalFormOk"></ctopToutiaoAdvertiserBudget-modal>
+        <byteDanceAdvertiserBudget-modal ref="modalForm" @ok="modalFormOk"></byteDanceAdvertiserBudget-modal>
     </a-card>
     </a-card>
 </template>
 </template>
 
 
 <script>
 <script>
-    import CtopToutiaoAdvertiserBudgetModal from './modules/CtopToutiaoAdvertiserBudgetModal'
+    import ByteDanceAdvertiserBudgetModal from './modules/ByteDanceAdvertiserBudgetModal'
     import {JeecgListMixin} from '@/mixins/JeecgListMixin'
     import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
 
     export default {
     export default {
-        name: "CtopToutiaoAdvertiserBudgetList",
+        name: "ByteDanceAdvertiserBudgetList",
         mixins: [JeecgListMixin],
         mixins: [JeecgListMixin],
         components: {
         components: {
-            CtopToutiaoAdvertiserBudgetModal
+            ByteDanceAdvertiserBudgetModal
         },
         },
         data() {
         data() {
             return {
             return {
-                description: '头条广告主账户预算信息管理页面',
+                description: '今日头条广告主预算信息管理页面',
                 // 表头
                 // 表头
                 columns: [
                 columns: [
                     {
                     {
@@ -182,19 +182,19 @@ BUDGET_MODE_TOTAL 	总预算" v-model="queryParam.budgetMode"></a-input>
             }
             }
         ],
         ],
             url: {
             url: {
-                list: "/ctop/ctopToutiaoAdvertiserBudget/list",
+                list: "/ctop/byteDanceAdvertiserBudget/list",
                     delete
                     delete
             :
             :
-                "/ctop/ctopToutiaoAdvertiserBudget/delete",
+                "/ctop/byteDanceAdvertiserBudget/delete",
                     deleteBatch
                     deleteBatch
             :
             :
-                "/ctop/ctopToutiaoAdvertiserBudget/deleteBatch",
+                "/ctop/byteDanceAdvertiserBudget/deleteBatch",
                     exportXlsUrl
                     exportXlsUrl
             :
             :
-                "ctop/ctopToutiaoAdvertiserBudget/exportXls",
+                "ctop/byteDanceAdvertiserBudget/exportXls",
                     importExcelUrl
                     importExcelUrl
             :
             :
-                "ctop/ctopToutiaoAdvertiserBudget/importExcel",
+                "ctop/byteDanceAdvertiserBudget/importExcel",
             }
             }
         ,
         ,
         }
         }

+ 11 - 11
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/CTopToutiaoAdvertiserList.vue

@@ -51,7 +51,7 @@
         <!-- 操作按钮区域 -->
         <!-- 操作按钮区域 -->
         <div class="table-operator">
         <div class="table-operator">
             <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
             <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-            <a-button type="primary" icon="download" @click="handleExportXls('头条广告主信息')">导出</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('今日头条广告主信息')">导出</a-button>
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
                       :action="importExcelUrl" @change="handleImportExcel">
                       :action="importExcelUrl" @change="handleImportExcel">
                 <a-button type="primary" icon="import">导入</a-button>
                 <a-button type="primary" icon="import">导入</a-button>
@@ -110,23 +110,23 @@
         <!-- table区域-end -->
         <!-- table区域-end -->
 
 
         <!-- 表单区域 -->
         <!-- 表单区域 -->
-        <cTopToutiaoAdvertiser-modal ref="modalForm" @ok="modalFormOk"></cTopToutiaoAdvertiser-modal>
+        <byteDanceAdvertiser-modal ref="modalForm" @ok="modalFormOk"></byteDanceAdvertiser-modal>
     </a-card>
     </a-card>
 </template>
 </template>
 
 
 <script>
 <script>
-    import CTopToutiaoAdvertiserModal from './modules/CTopToutiaoAdvertiserModal'
+    import ByteDanceAdvertiserModal from './modules/ByteDanceAdvertiserModal'
     import {JeecgListMixin} from '@/mixins/JeecgListMixin'
     import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
 
     export default {
     export default {
-        name: "CTopToutiaoAdvertiserList",
+        name: "ByteDanceAdvertiserList",
         mixins: [JeecgListMixin],
         mixins: [JeecgListMixin],
         components: {
         components: {
-            CTopToutiaoAdvertiserModal
+            ByteDanceAdvertiserModal
         },
         },
         data() {
         data() {
             return {
             return {
-                description: '头条广告主信息管理页面',
+                description: '今日头条广告主信息管理页面',
                 // 表头
                 // 表头
                 columns: [
                 columns: [
                     {
                     {
@@ -396,19 +396,19 @@ ROLE_CHILD_AGENT
             }
             }
         ],
         ],
             url: {
             url: {
-                list: "/ctop/cTopToutiaoAdvertiser/list",
+                list: "/ctop/byteDanceAdvertiser/list",
                     delete
                     delete
             :
             :
-                "/ctop/cTopToutiaoAdvertiser/delete",
+                "/ctop/byteDanceAdvertiser/delete",
                     deleteBatch
                     deleteBatch
             :
             :
-                "/ctop/cTopToutiaoAdvertiser/deleteBatch",
+                "/ctop/byteDanceAdvertiser/deleteBatch",
                     exportXlsUrl
                     exportXlsUrl
             :
             :
-                "ctop/cTopToutiaoAdvertiser/exportXls",
+                "ctop/byteDanceAdvertiser/exportXls",
                     importExcelUrl
                     importExcelUrl
             :
             :
-                "ctop/cTopToutiaoAdvertiser/importExcel",
+                "ctop/byteDanceAdvertiser/importExcel",
             }
             }
         ,
         ,
         }
         }

+ 41 - 36
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/CtopToutiaoBudgetTemplateList.vue

@@ -23,14 +23,14 @@
                             </a-form-item>
                             </a-form-item>
                         </a-col>
                         </a-col>
                         <a-col :md="6" :sm="8">
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="flowcontrolmode">
-                                <a-input placeholder="请输入flowcontrolmode"
-                                         v-model="queryParam.flowcontrolmode"></a-input>
+                            <a-form-item label="flowControlMode">
+                                <a-input placeholder="请输入flowControlMode"
+                                         v-model="queryParam.flowControlMode"></a-input>
                             </a-form-item>
                             </a-form-item>
                         </a-col>
                         </a-col>
                         <a-col :md="6" :sm="8">
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="budgetprice">
-                                <a-input placeholder="请输入budgetprice" v-model="queryParam.budgetprice"></a-input>
+                            <a-form-item label="budgetPrice">
+                                <a-input placeholder="请输入budgetPrice" v-model="queryParam.budgetPrice"></a-input>
                             </a-form-item>
                             </a-form-item>
                         </a-col>
                         </a-col>
                     </template>
                     </template>
@@ -52,7 +52,7 @@
         <!-- 操作按钮区域 -->
         <!-- 操作按钮区域 -->
         <div class="table-operator">
         <div class="table-operator">
             <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
             <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-            <a-button type="primary" icon="download" @click="handleExportXls('预算与出价模块模板')">导出</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('今日头条预算模板信息')">导出</a-button>
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
                       :action="importExcelUrl" @change="handleImportExcel">
                       :action="importExcelUrl" @change="handleImportExcel">
                 <a-button type="primary" icon="import">导入</a-button>
                 <a-button type="primary" icon="import">导入</a-button>
@@ -111,23 +111,23 @@
         <!-- table区域-end -->
         <!-- table区域-end -->
 
 
         <!-- 表单区域 -->
         <!-- 表单区域 -->
-        <ctopToutiaoBudgetTemplate-modal ref="modalForm" @ok="modalFormOk"></ctopToutiaoBudgetTemplate-modal>
+        <byteDanceBudgetTemplate-modal ref="modalForm" @ok="modalFormOk"></byteDanceBudgetTemplate-modal>
     </a-card>
     </a-card>
 </template>
 </template>
 
 
 <script>
 <script>
-    import CtopToutiaoBudgetTemplateModal from './modules/CtopToutiaoBudgetTemplateModal'
+    import ByteDanceBudgetTemplateModal from './modules/ByteDanceBudgetTemplateModal'
     import {JeecgListMixin} from '@/mixins/JeecgListMixin'
     import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
 
     export default {
     export default {
-        name: "CtopToutiaoBudgetTemplateList",
+        name: "ByteDanceBudgetTemplateList",
         mixins: [JeecgListMixin],
         mixins: [JeecgListMixin],
         components: {
         components: {
-            CtopToutiaoBudgetTemplateModal
+            ByteDanceBudgetTemplateModal
         },
         },
         data() {
         data() {
             return {
             return {
-                description: '预算与出价模块模板管理页面',
+                description: '今日头条预算模板信息管理页面',
                 // 表头
                 // 表头
                 columns: [
                 columns: [
                     {
                     {
@@ -156,54 +156,59 @@
                         dataIndex: 'bidType'
                         dataIndex: 'bidType'
                     },
                     },
                     {
                     {
-                        title: 'flowcontrolmode',
+                        title: 'flowControlMode',
                         align: "center",
                         align: "center",
-                        dataIndex: 'flowcontrolmode'
+                        dataIndex: 'flowControlMode'
                     },
                     },
                     {
                     {
-                        title: 'budgetprice',
+                        title: 'budgetPrice',
                         align: "center",
                         align: "center",
-                        dataIndex: 'budgetprice'
+                        dataIndex: 'budgetPrice'
                     },
                     },
                     {
                     {
-                        title: 'budgetmode',
+                        title: 'budgetMode',
                         align: "center",
                         align: "center",
-                        dataIndex: 'budgetmode'
+                        dataIndex: 'budgetMode'
                     },
                     },
                     {
                     {
-                        title: 'flowdate',
+                        title: 'flowDateType',
                         align: "center",
                         align: "center",
-                        dataIndex: 'flowdate'
+                        dataIndex: 'flowDateType'
                     },
                     },
                     {
                     {
-                        title: 'dateflowrange',
+                        title: 'startDate',
                         align: "center",
                         align: "center",
-                        dataIndex: 'dateflowrange'
+                        dataIndex: 'startDate'
                     },
                     },
                     {
                     {
-                        title: 'datequantum',
+                        title: 'endDate',
                         align: "center",
                         align: "center",
-                        dataIndex: 'datequantum'
+                        dataIndex: 'endDate'
                     },
                     },
                     {
                     {
-                        title: 'datequantumrange',
+                        title: 'dateQuantum',
                         align: "center",
                         align: "center",
-                        dataIndex: 'datequantumrange'
+                        dataIndex: 'dateQuantum'
                     },
                     },
                     {
                     {
-                        title: 'pricetype',
+                        title: 'dateQuantumRange',
                         align: "center",
                         align: "center",
-                        dataIndex: 'pricetype'
+                        dataIndex: 'dateQuantumRange'
                     },
                     },
                     {
                     {
-                        title: 'convertprice',
+                        title: 'priceType',
                         align: "center",
                         align: "center",
-                        dataIndex: 'convertprice'
+                        dataIndex: 'priceType'
                     },
                     },
                     {
                     {
-                        title: 'filtertype',
+                        title: 'convertPrice',
                         align: "center",
                         align: "center",
-                        dataIndex: 'filtertype'
+                        dataIndex: 'convertPrice'
+                    },
+                    {
+                        title: 'filterType',
+                        align: "center",
+                        dataIndex: 'filterType'
                     },
                     },
                     {
                     {
                         title: 'status',
                         title: 'status',
@@ -218,11 +223,11 @@
                     }
                     }
                 ],
                 ],
                 url: {
                 url: {
-                    list: "/ctop/ctopToutiaoBudgetTemplate/list",
-                    delete: "/ctop/ctopToutiaoBudgetTemplate/delete",
-                    deleteBatch: "/ctop/ctopToutiaoBudgetTemplate/deleteBatch",
-                    exportXlsUrl: "ctop/ctopToutiaoBudgetTemplate/exportXls",
-                    importExcelUrl: "ctop/ctopToutiaoBudgetTemplate/importExcel",
+                    list: "/ctop/byteDanceBudgetTemplate/list",
+                    delete: "/ctop/byteDanceBudgetTemplate/delete",
+                    deleteBatch: "/ctop/byteDanceBudgetTemplate/deleteBatch",
+                    exportXlsUrl: "ctop/byteDanceBudgetTemplate/exportXls",
+                    importExcelUrl: "ctop/byteDanceBudgetTemplate/importExcel",
                 },
                 },
             }
             }
         },
         },

+ 21 - 11
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/CTopToutiaoCampaignList.vue

@@ -51,7 +51,7 @@
         <!-- 操作按钮区域 -->
         <!-- 操作按钮区域 -->
         <div class="table-operator">
         <div class="table-operator">
             <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
             <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-            <a-button type="primary" icon="download" @click="handleExportXls('头条广告主广告组信息')">导出</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('今日头条广告组信息')">导出</a-button>
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
                       :action="importExcelUrl" @change="handleImportExcel">
                       :action="importExcelUrl" @change="handleImportExcel">
                 <a-button type="primary" icon="import">导入</a-button>
                 <a-button type="primary" icon="import">导入</a-button>
@@ -110,23 +110,23 @@
         <!-- table区域-end -->
         <!-- table区域-end -->
 
 
         <!-- 表单区域 -->
         <!-- 表单区域 -->
-        <cTopToutiaoCampaign-modal ref="modalForm" @ok="modalFormOk"></cTopToutiaoCampaign-modal>
+        <byteDanceCampaign-modal ref="modalForm" @ok="modalFormOk"></byteDanceCampaign-modal>
     </a-card>
     </a-card>
 </template>
 </template>
 
 
 <script>
 <script>
-    import CTopToutiaoCampaignModal from './modules/CTopToutiaoCampaignModal'
+    import ByteDanceCampaignModal from './modules/ByteDanceCampaignModal'
     import {JeecgListMixin} from '@/mixins/JeecgListMixin'
     import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
 
     export default {
     export default {
-        name: "CTopToutiaoCampaignList",
+        name: "ByteDanceCampaignList",
         mixins: [JeecgListMixin],
         mixins: [JeecgListMixin],
         components: {
         components: {
-            CTopToutiaoCampaignModal
+            ByteDanceCampaignModal
         },
         },
         data() {
         data() {
             return {
             return {
-                description: '头条广告主广告组信息管理页面',
+                description: '今日头条广告组信息管理页面',
                 // 表头
                 // 表头
                 columns: [
                 columns: [
                     {
                     {
@@ -190,6 +190,16 @@ CAMPAIGN_STATUS_ADVERTISER_BUDGET_EXCEED
             'status'
             'status'
         },
         },
             {
             {
+                title: 'optStatus',
+                    align
+            :
+                "center",
+                    dataIndex
+            :
+                'optStatus'
+            }
+        ,
+            {
                 title: '广告组创建时间',
                 title: '广告组创建时间',
                     align
                     align
             :
             :
@@ -226,19 +236,19 @@ CAMPAIGN_STATUS_ADVERTISER_BUDGET_EXCEED
             }
             }
         ],
         ],
             url: {
             url: {
-                list: "/ctop/cTopToutiaoCampaign/list",
+                list: "/ctop/byteDanceCampaign/list",
                     delete
                     delete
             :
             :
-                "/ctop/cTopToutiaoCampaign/delete",
+                "/ctop/byteDanceCampaign/delete",
                     deleteBatch
                     deleteBatch
             :
             :
-                "/ctop/cTopToutiaoCampaign/deleteBatch",
+                "/ctop/byteDanceCampaign/deleteBatch",
                     exportXlsUrl
                     exportXlsUrl
             :
             :
-                "ctop/cTopToutiaoCampaign/exportXls",
+                "ctop/byteDanceCampaign/exportXls",
                     importExcelUrl
                     importExcelUrl
             :
             :
-                "ctop/cTopToutiaoCampaign/importExcel",
+                "ctop/byteDanceCampaign/importExcel",
             }
             }
         ,
         ,
         }
         }

+ 33 - 44
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/CTopToutiaoAdvertisePlanList.vue

@@ -7,30 +7,29 @@
                 <a-row :gutter="24">
                 <a-row :gutter="24">
 
 
                     <a-col :md="6" :sm="8">
                     <a-col :md="6" :sm="8">
-                        <a-form-item label="平台广告主id">
-                            <a-input placeholder="请输入平台广告主id" v-model="queryParam.advertiserId"></a-input>
+                        <a-form-item label="accountId">
+                            <a-input placeholder="请输入accountId" v-model="queryParam.accountId"></a-input>
                         </a-form-item>
                         </a-form-item>
                     </a-col>
                     </a-col>
                     <a-col :md="6" :sm="8">
                     <a-col :md="6" :sm="8">
-                        <a-form-item label="头条广告主id">
-                            <a-input placeholder="请输入头条广告主id" v-model="queryParam.toutiaoId"></a-input>
+                        <a-form-item label="投放目标">
+                            <a-input placeholder="请输入投放目标" v-model="queryParam.promationPurpuse"></a-input>
                         </a-form-item>
                         </a-form-item>
                     </a-col>
                     </a-col>
                     <template v-if="toggleSearchStatus">
                     <template v-if="toggleSearchStatus">
                         <a-col :md="6" :sm="8">
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="计划名称">
-                                <a-input placeholder="请输入计划名称" v-model="queryParam.name"></a-input>
+                            <a-form-item label="投放方式">
+                                <a-input placeholder="请输入投放方式" v-model="queryParam.campaignBudget"></a-input>
                             </a-form-item>
                             </a-form-item>
                         </a-col>
                         </a-col>
                         <a-col :md="6" :sm="8">
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="广告组id">
-                                <a-input placeholder="请输入广告组id" v-model="queryParam.campaignId"></a-input>
+                            <a-form-item label="日预算">
+                                <a-input placeholder="请输入日预算" v-model="queryParam.budgetDaily"></a-input>
                             </a-form-item>
                             </a-form-item>
                         </a-col>
                         </a-col>
                         <a-col :md="6" :sm="8">
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="上次修改时间戳(用于更新时提交,服务端判断是否基于最新信息修改)">
-                                <a-input placeholder="请输入上次修改时间戳(用于更新时提交,服务端判断是否基于最新信息修改)"
-                                         v-model="queryParam.planModifyTime"></a-input>
+                            <a-form-item label="广告组名称">
+                                <a-input placeholder="请输入广告组名称" v-model="queryParam.campaignName"></a-input>
                             </a-form-item>
                             </a-form-item>
                         </a-col>
                         </a-col>
                     </template>
                     </template>
@@ -52,7 +51,7 @@
         <!-- 操作按钮区域 -->
         <!-- 操作按钮区域 -->
         <div class="table-operator">
         <div class="table-operator">
             <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
             <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-            <a-button type="primary" icon="download" @click="handleExportXls('头条广告主广告计划信息')">导出</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('今日头条广告组模板信息')">导出</a-button>
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
                       :action="importExcelUrl" @change="handleImportExcel">
                       :action="importExcelUrl" @change="handleImportExcel">
                 <a-button type="primary" icon="import">导入</a-button>
                 <a-button type="primary" icon="import">导入</a-button>
@@ -111,23 +110,23 @@
         <!-- table区域-end -->
         <!-- table区域-end -->
 
 
         <!-- 表单区域 -->
         <!-- 表单区域 -->
-        <cTopToutiaoAdvertisePlan-modal ref="modalForm" @ok="modalFormOk"></cTopToutiaoAdvertisePlan-modal>
+        <byteDanceCampaignTemplate-modal ref="modalForm" @ok="modalFormOk"></byteDanceCampaignTemplate-modal>
     </a-card>
     </a-card>
 </template>
 </template>
 
 
 <script>
 <script>
-    import CTopToutiaoAdvertisePlanModal from './modules/CTopToutiaoAdvertisePlanModal'
+    import ByteDanceCampaignTemplateModal from './modules/ByteDanceCampaignTemplateModal'
     import {JeecgListMixin} from '@/mixins/JeecgListMixin'
     import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
 
     export default {
     export default {
-        name: "CTopToutiaoAdvertisePlanList",
+        name: "ByteDanceCampaignTemplateList",
         mixins: [JeecgListMixin],
         mixins: [JeecgListMixin],
         components: {
         components: {
-            CTopToutiaoAdvertisePlanModal
+            ByteDanceCampaignTemplateModal
         },
         },
         data() {
         data() {
             return {
             return {
-                description: '头条广告主广告计划信息管理页面',
+                description: '今日头条广告组模板信息管理页面',
                 // 表头
                 // 表头
                 columns: [
                 columns: [
                     {
                     {
@@ -141,44 +140,34 @@
                         }
                         }
                     },
                     },
                     {
                     {
-                        title: '平台广告主id',
+                        title: 'accountId',
                         align: "center",
                         align: "center",
-                        dataIndex: 'advertiserId'
+                        dataIndex: 'accountId'
                     },
                     },
                     {
                     {
-                        title: '头条广告主id',
+                        title: '投放目标',
                         align: "center",
                         align: "center",
-                        dataIndex: 'toutiaoId'
+                        dataIndex: 'promationPurpuse'
                     },
                     },
                     {
                     {
-                        title: '计划名称',
+                        title: '投放方式',
                         align: "center",
                         align: "center",
-                        dataIndex: 'name'
+                        dataIndex: 'campaignBudget'
                     },
                     },
                     {
                     {
-                        title: '广告组id',
+                        title: '日预算',
                         align: "center",
                         align: "center",
-                        dataIndex: 'campaignId'
+                        dataIndex: 'budgetDaily'
                     },
                     },
                     {
                     {
-                        title: '上次修改时间戳(用于更新时提交,服务端判断是否基于最新信息修改)',
+                        title: '广告组名称',
                         align: "center",
                         align: "center",
-                        dataIndex: 'planModifyTime'
+                        dataIndex: 'campaignName'
                     },
                     },
                     {
                     {
-                        title: '投放范围',
+                        title: '模板状态',
                         align: "center",
                         align: "center",
-                        dataIndex: 'deliveryRange'
-                    },
-                    {
-                        title: '计划上次修改时间',
-                        align: "center",
-                        dataIndex: 'adModifyTime'
-                    },
-                    {
-                        title: '计划创建时间',
-                        align: "center",
-                        dataIndex: 'adCreateTime'
+                        dataIndex: 'status'
                     },
                     },
                     {
                     {
                         title: '操作',
                         title: '操作',
@@ -188,11 +177,11 @@
                     }
                     }
                 ],
                 ],
                 url: {
                 url: {
-                    list: "/ctop/cTopToutiaoAdvertisePlan/list",
-                    delete: "/ctop/cTopToutiaoAdvertisePlan/delete",
-                    deleteBatch: "/ctop/cTopToutiaoAdvertisePlan/deleteBatch",
-                    exportXlsUrl: "ctop/cTopToutiaoAdvertisePlan/exportXls",
-                    importExcelUrl: "ctop/cTopToutiaoAdvertisePlan/importExcel",
+                    list: "/ctop/byteDanceCampaignTemplate/list",
+                    delete: "/ctop/byteDanceCampaignTemplate/delete",
+                    deleteBatch: "/ctop/byteDanceCampaignTemplate/deleteBatch",
+                    exportXlsUrl: "ctop/byteDanceCampaignTemplate/exportXls",
+                    importExcelUrl: "ctop/byteDanceCampaignTemplate/importExcel",
                 },
                 },
             }
             }
         },
         },

+ 11 - 11
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/ToutiaoCreativeList.vue

@@ -51,7 +51,7 @@
         <!-- 操作按钮区域 -->
         <!-- 操作按钮区域 -->
         <div class="table-operator">
         <div class="table-operator">
             <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
             <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-            <a-button type="primary" icon="download" @click="handleExportXls('广告创意信息')">导出</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('今日头条创意信息')">导出</a-button>
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
                       :action="importExcelUrl" @change="handleImportExcel">
                       :action="importExcelUrl" @change="handleImportExcel">
                 <a-button type="primary" icon="import">导入</a-button>
                 <a-button type="primary" icon="import">导入</a-button>
@@ -110,23 +110,23 @@
         <!-- table区域-end -->
         <!-- table区域-end -->
 
 
         <!-- 表单区域 -->
         <!-- 表单区域 -->
-        <toutiaoCreative-modal ref="modalForm" @ok="modalFormOk"></toutiaoCreative-modal>
+        <byteDanceCreative-modal ref="modalForm" @ok="modalFormOk"></byteDanceCreative-modal>
     </a-card>
     </a-card>
 </template>
 </template>
 
 
 <script>
 <script>
-    import ToutiaoCreativeModal from './modules/ToutiaoCreativeModal'
+    import ByteDanceCreativeModal from './modules/ByteDanceCreativeModal'
     import {JeecgListMixin} from '@/mixins/JeecgListMixin'
     import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
 
     export default {
     export default {
-        name: "ToutiaoCreativeList",
+        name: "ByteDanceCreativeList",
         mixins: [JeecgListMixin],
         mixins: [JeecgListMixin],
         components: {
         components: {
-            ToutiaoCreativeModal
+            ByteDanceCreativeModal
         },
         },
         data() {
         data() {
             return {
             return {
-                description: '广告创意信息管理页面',
+                description: '今日头条创意信息管理页面',
                 // 表头
                 // 表头
                 columns: [
                 columns: [
                     {
                     {
@@ -222,11 +222,11 @@
                     }
                     }
                 ],
                 ],
                 url: {
                 url: {
-                    list: "/ctop/toutiaoCreative/list",
-                    delete: "/ctop/toutiaoCreative/delete",
-                    deleteBatch: "/ctop/toutiaoCreative/deleteBatch",
-                    exportXlsUrl: "ctop/toutiaoCreative/exportXls",
-                    importExcelUrl: "ctop/toutiaoCreative/importExcel",
+                    list: "/ctop/byteDanceCreative/list",
+                    delete: "/ctop/byteDanceCreative/delete",
+                    deleteBatch: "/ctop/byteDanceCreative/deleteBatch",
+                    exportXlsUrl: "ctop/byteDanceCreative/exportXls",
+                    importExcelUrl: "ctop/byteDanceCreative/importExcel",
                 },
                 },
             }
             }
         },
         },

+ 17 - 12
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/ToutiaoCreativeMaterialList.vue

@@ -29,7 +29,7 @@
                         </a-col>
                         </a-col>
                         <a-col :md="6" :sm="8">
                         <a-col :md="6" :sm="8">
                             <a-form-item label="创意状态">
                             <a-form-item label="创意状态">
-                                <a-input placeholder="请输入创意状态" v-model="queryParam.optStatus"></a-input>
+                                <a-input placeholder="请输入创意状态" v-model="queryParam.status"></a-input>
                             </a-form-item>
                             </a-form-item>
                         </a-col>
                         </a-col>
                     </template>
                     </template>
@@ -51,7 +51,7 @@
         <!-- 操作按钮区域 -->
         <!-- 操作按钮区域 -->
         <div class="table-operator">
         <div class="table-operator">
             <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
             <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-            <a-button type="primary" icon="download" @click="handleExportXls('头条创意素材信息')">导出</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('今日头条创意素材信息')">导出</a-button>
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
                       :action="importExcelUrl" @change="handleImportExcel">
                       :action="importExcelUrl" @change="handleImportExcel">
                 <a-button type="primary" icon="import">导入</a-button>
                 <a-button type="primary" icon="import">导入</a-button>
@@ -110,23 +110,23 @@
         <!-- table区域-end -->
         <!-- table区域-end -->
 
 
         <!-- 表单区域 -->
         <!-- 表单区域 -->
-        <toutiaoCreativeMaterial-modal ref="modalForm" @ok="modalFormOk"></toutiaoCreativeMaterial-modal>
+        <byteDanceCreativeMaterial-modal ref="modalForm" @ok="modalFormOk"></byteDanceCreativeMaterial-modal>
     </a-card>
     </a-card>
 </template>
 </template>
 
 
 <script>
 <script>
-    import ToutiaoCreativeMaterialModal from './modules/ToutiaoCreativeMaterialModal'
+    import ByteDanceCreativeMaterialModal from './modules/ByteDanceCreativeMaterialModal'
     import {JeecgListMixin} from '@/mixins/JeecgListMixin'
     import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
 
     export default {
     export default {
-        name: "ToutiaoCreativeMaterialList",
+        name: "ByteDanceCreativeMaterialList",
         mixins: [JeecgListMixin],
         mixins: [JeecgListMixin],
         components: {
         components: {
-            ToutiaoCreativeMaterialModal
+            ByteDanceCreativeMaterialModal
         },
         },
         data() {
         data() {
             return {
             return {
-                description: '头条创意素材信息管理页面',
+                description: '今日头条创意素材信息管理页面',
                 // 表头
                 // 表头
                 columns: [
                 columns: [
                     {
                     {
@@ -162,6 +162,11 @@
                     {
                     {
                         title: '创意状态',
                         title: '创意状态',
                         align: "center",
                         align: "center",
+                        dataIndex: 'status'
+                    },
+                    {
+                        title: '创意状态',
+                        align: "center",
                         dataIndex: 'optStatus'
                         dataIndex: 'optStatus'
                     },
                     },
                     {
                     {
@@ -182,11 +187,11 @@
                     }
                     }
                 ],
                 ],
                 url: {
                 url: {
-                    list: "/ctop/toutiaoCreativeMaterial/list",
-                    delete: "/ctop/toutiaoCreativeMaterial/delete",
-                    deleteBatch: "/ctop/toutiaoCreativeMaterial/deleteBatch",
-                    exportXlsUrl: "ctop/toutiaoCreativeMaterial/exportXls",
-                    importExcelUrl: "ctop/toutiaoCreativeMaterial/importExcel",
+                    list: "/ctop/byteDanceCreativeMaterial/list",
+                    delete: "/ctop/byteDanceCreativeMaterial/delete",
+                    deleteBatch: "/ctop/byteDanceCreativeMaterial/deleteBatch",
+                    exportXlsUrl: "ctop/byteDanceCreativeMaterial/exportXls",
+                    importExcelUrl: "ctop/byteDanceCreativeMaterial/importExcel",
                 },
                 },
             }
             }
         },
         },

File diff suppressed because it is too large
+ 302 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/ByteDanceAdvertisePlanModal.vue


File diff suppressed because it is too large
+ 309 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/ByteDanceAdvertisePlanModal__Style#Drawer.vue


+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CtopToutiaoAdvertiserBudgetModal.vue

@@ -48,7 +48,7 @@ BUDGET_MODE_TOTAL 	总预算" v-decorator="['budgetMode', {}]"/>
     import moment from "moment"
     import moment from "moment"
 
 
     export default {
     export default {
-        name: "CtopToutiaoAdvertiserBudgetModal",
+        name: "ByteDanceAdvertiserBudgetModal",
         data() {
         data() {
             return {
             return {
                 title: "操作",
                 title: "操作",
@@ -69,8 +69,8 @@ BUDGET_MODE_TOTAL 	总预算" v-decorator="['budgetMode', {}]"/>
                     advertiserId: {rules: [{required: true, message: '请输入平台账号id!'}]},
                     advertiserId: {rules: [{required: true, message: '请输入平台账号id!'}]},
                 },
                 },
                 url: {
                 url: {
-                    add: "/ctop/ctopToutiaoAdvertiserBudget/add",
-                    edit: "/ctop/ctopToutiaoAdvertiserBudget/edit",
+                    add: "/ctop/byteDanceAdvertiserBudget/add",
+                    edit: "/ctop/byteDanceAdvertiserBudget/edit",
                 },
                 },
             }
             }
         },
         },

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CtopToutiaoAdvertiserBudgetModal__Style#Drawer.vue

@@ -50,7 +50,7 @@ BUDGET_MODE_TOTAL 	总预算" v-decorator="['budgetMode', {}]"/>
     import moment from "moment"
     import moment from "moment"
 
 
     export default {
     export default {
-        name: "CtopToutiaoAdvertiserBudgetModal",
+        name: "ByteDanceAdvertiserBudgetModal",
         data() {
         data() {
             return {
             return {
                 title: "操作",
                 title: "操作",
@@ -71,8 +71,8 @@ BUDGET_MODE_TOTAL 	总预算" v-decorator="['budgetMode', {}]"/>
                     advertiserId: {rules: [{required: true, message: '请输入平台账号id!'}]},
                     advertiserId: {rules: [{required: true, message: '请输入平台账号id!'}]},
                 },
                 },
                 url: {
                 url: {
-                    add: "/ctop/ctopToutiaoAdvertiserBudget/add",
-                    edit: "/ctop/ctopToutiaoAdvertiserBudget/edit",
+                    add: "/ctop/byteDanceAdvertiserBudget/add",
+                    edit: "/ctop/byteDanceAdvertiserBudget/edit",
                 },
                 },
             }
             }
         },
         },

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CTopToutiaoAdvertiserModal.vue

@@ -197,7 +197,7 @@ STATUS_CONFIRM_MODIFY_FAIL 	修改审核不通过" v-decorator="['toutiaoStatus'
     import moment from "moment"
     import moment from "moment"
 
 
     export default {
     export default {
-        name: "CTopToutiaoAdvertiserModal",
+        name: "ByteDanceAdvertiserModal",
         data() {
         data() {
             return {
             return {
                 title: "操作",
                 title: "操作",
@@ -218,8 +218,8 @@ STATUS_CONFIRM_MODIFY_FAIL 	修改审核不通过" v-decorator="['toutiaoStatus'
                     advertiserId: {rules: [{required: true, message: '请输入本平台id!'}]},
                     advertiserId: {rules: [{required: true, message: '请输入本平台id!'}]},
                 },
                 },
                 url: {
                 url: {
-                    add: "/ctop/cTopToutiaoAdvertiser/add",
-                    edit: "/ctop/cTopToutiaoAdvertiser/edit",
+                    add: "/ctop/byteDanceAdvertiser/add",
+                    edit: "/ctop/byteDanceAdvertiser/edit",
                 },
                 },
             }
             }
         },
         },

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CTopToutiaoAdvertiserModal__Style#Drawer.vue

@@ -199,7 +199,7 @@ STATUS_CONFIRM_MODIFY_FAIL 	修改审核不通过" v-decorator="['toutiaoStatus'
     import moment from "moment"
     import moment from "moment"
 
 
     export default {
     export default {
-        name: "CTopToutiaoAdvertiserModal",
+        name: "ByteDanceAdvertiserModal",
         data() {
         data() {
             return {
             return {
                 title: "操作",
                 title: "操作",
@@ -220,8 +220,8 @@ STATUS_CONFIRM_MODIFY_FAIL 	修改审核不通过" v-decorator="['toutiaoStatus'
                     advertiserId: {rules: [{required: true, message: '请输入本平台id!'}]},
                     advertiserId: {rules: [{required: true, message: '请输入本平台id!'}]},
                 },
                 },
                 url: {
                 url: {
-                    add: "/ctop/cTopToutiaoAdvertiser/add",
-                    edit: "/ctop/cTopToutiaoAdvertiser/edit",
+                    add: "/ctop/byteDanceAdvertiser/add",
+                    edit: "/ctop/byteDanceAdvertiser/edit",
                 },
                 },
             }
             }
         },
         },

+ 30 - 24
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CtopToutiaoBudgetTemplateModal.vue

@@ -32,62 +32,68 @@
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="flowcontrolmode">
-                    <a-input placeholder="请输入flowcontrolmode" v-decorator="['flowcontrolmode', {}]"/>
+                        label="flowControlMode">
+                    <a-input placeholder="请输入flowControlMode" v-decorator="['flowControlMode', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="budgetprice">
-                    <a-input placeholder="请输入budgetprice" v-decorator="['budgetprice', {}]"/>
+                        label="budgetPrice">
+                    <a-input placeholder="请输入budgetPrice" v-decorator="['budgetPrice', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="budgetmode">
-                    <a-input placeholder="请输入budgetmode" v-decorator="['budgetmode', {}]"/>
+                        label="budgetMode">
+                    <a-input placeholder="请输入budgetMode" v-decorator="['budgetMode', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="flowdate">
-                    <a-input placeholder="请输入flowdate" v-decorator="['flowdate', {}]"/>
+                        label="flowDateType">
+                    <a-input placeholder="请输入flowDateType" v-decorator="['flowDateType', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="dateflowrange">
-                    <a-input placeholder="请输入dateflowrange" v-decorator="['dateflowrange', {}]"/>
+                        label="startDate">
+                    <a-input placeholder="请输入startDate" v-decorator="['startDate', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="datequantum">
-                    <a-input placeholder="请输入datequantum" v-decorator="['datequantum', {}]"/>
+                        label="endDate">
+                    <a-input placeholder="请输入endDate" v-decorator="['endDate', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="datequantumrange">
-                    <a-input placeholder="请输入datequantumrange" v-decorator="['datequantumrange', {}]"/>
+                        label="dateQuantum">
+                    <a-input placeholder="请输入dateQuantum" v-decorator="['dateQuantum', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="pricetype">
-                    <a-input placeholder="请输入pricetype" v-decorator="['pricetype', {}]"/>
+                        label="dateQuantumRange">
+                    <a-input placeholder="请输入dateQuantumRange" v-decorator="['dateQuantumRange', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="convertprice">
-                    <a-input placeholder="请输入convertprice" v-decorator="['convertprice', {}]"/>
+                        label="priceType">
+                    <a-input placeholder="请输入priceType" v-decorator="['priceType', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="filtertype">
-                    <a-input placeholder="请输入filtertype" v-decorator="['filtertype', {}]"/>
+                        label="convertPrice">
+                    <a-input placeholder="请输入convertPrice" v-decorator="['convertPrice', {}]"/>
+                </a-form-item>
+                <a-form-item
+                        :labelCol="labelCol"
+                        :wrapperCol="wrapperCol"
+                        label="filterType">
+                    <a-input placeholder="请输入filterType" v-decorator="['filterType', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
@@ -107,7 +113,7 @@
     import moment from "moment"
     import moment from "moment"
 
 
     export default {
     export default {
-        name: "CtopToutiaoBudgetTemplateModal",
+        name: "ByteDanceBudgetTemplateModal",
         data() {
         data() {
             return {
             return {
                 title: "操作",
                 title: "操作",
@@ -129,8 +135,8 @@
                     toutiaoId: {rules: [{required: true, message: '请输入头条账号id!'}]},
                     toutiaoId: {rules: [{required: true, message: '请输入头条账号id!'}]},
                 },
                 },
                 url: {
                 url: {
-                    add: "/ctop/ctopToutiaoBudgetTemplate/add",
-                    edit: "/ctop/ctopToutiaoBudgetTemplate/edit",
+                    add: "/ctop/byteDanceBudgetTemplate/add",
+                    edit: "/ctop/byteDanceBudgetTemplate/edit",
                 },
                 },
             }
             }
         },
         },
@@ -145,7 +151,7 @@
                 this.model = Object.assign({}, record);
                 this.model = Object.assign({}, record);
                 this.visible = true;
                 this.visible = true;
                 this.$nextTick(() => {
                 this.$nextTick(() => {
-                    this.form.setFieldsValue(pick(this.model, 'advertiserId', 'toutiaoId', 'bidType', 'flowcontrolmode', 'budgetprice', 'budgetmode', 'flowdate', 'dateflowrange', 'datequantum', 'datequantumrange', 'pricetype', 'convertprice', 'filtertype', 'status'))
+                    this.form.setFieldsValue(pick(this.model, 'advertiserId', 'toutiaoId', 'bidType', 'flowControlMode', 'budgetPrice', 'budgetMode', 'flowDateType', 'startDate', 'endDate', 'dateQuantum', 'dateQuantumRange', 'priceType', 'convertPrice', 'filterType', 'status'))
                     //时间格式化
                     //时间格式化
                 });
                 });
 
 

+ 30 - 24
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CtopToutiaoBudgetTemplateModal__Style#Drawer.vue

@@ -32,62 +32,68 @@
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="flowcontrolmode">
-                    <a-input placeholder="请输入flowcontrolmode" v-decorator="['flowcontrolmode', {}]"/>
+                        label="flowControlMode">
+                    <a-input placeholder="请输入flowControlMode" v-decorator="['flowControlMode', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="budgetprice">
-                    <a-input placeholder="请输入budgetprice" v-decorator="['budgetprice', {}]"/>
+                        label="budgetPrice">
+                    <a-input placeholder="请输入budgetPrice" v-decorator="['budgetPrice', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="budgetmode">
-                    <a-input placeholder="请输入budgetmode" v-decorator="['budgetmode', {}]"/>
+                        label="budgetMode">
+                    <a-input placeholder="请输入budgetMode" v-decorator="['budgetMode', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="flowdate">
-                    <a-input placeholder="请输入flowdate" v-decorator="['flowdate', {}]"/>
+                        label="flowDateType">
+                    <a-input placeholder="请输入flowDateType" v-decorator="['flowDateType', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="dateflowrange">
-                    <a-input placeholder="请输入dateflowrange" v-decorator="['dateflowrange', {}]"/>
+                        label="startDate">
+                    <a-input placeholder="请输入startDate" v-decorator="['startDate', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="datequantum">
-                    <a-input placeholder="请输入datequantum" v-decorator="['datequantum', {}]"/>
+                        label="endDate">
+                    <a-input placeholder="请输入endDate" v-decorator="['endDate', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="datequantumrange">
-                    <a-input placeholder="请输入datequantumrange" v-decorator="['datequantumrange', {}]"/>
+                        label="dateQuantum">
+                    <a-input placeholder="请输入dateQuantum" v-decorator="['dateQuantum', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="pricetype">
-                    <a-input placeholder="请输入pricetype" v-decorator="['pricetype', {}]"/>
+                        label="dateQuantumRange">
+                    <a-input placeholder="请输入dateQuantumRange" v-decorator="['dateQuantumRange', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="convertprice">
-                    <a-input placeholder="请输入convertprice" v-decorator="['convertprice', {}]"/>
+                        label="priceType">
+                    <a-input placeholder="请输入priceType" v-decorator="['priceType', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="filtertype">
-                    <a-input placeholder="请输入filtertype" v-decorator="['filtertype', {}]"/>
+                        label="convertPrice">
+                    <a-input placeholder="请输入convertPrice" v-decorator="['convertPrice', {}]"/>
+                </a-form-item>
+                <a-form-item
+                        :labelCol="labelCol"
+                        :wrapperCol="wrapperCol"
+                        label="filterType">
+                    <a-input placeholder="请输入filterType" v-decorator="['filterType', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
@@ -109,7 +115,7 @@
     import moment from "moment"
     import moment from "moment"
 
 
     export default {
     export default {
-        name: "CtopToutiaoBudgetTemplateModal",
+        name: "ByteDanceBudgetTemplateModal",
         data() {
         data() {
             return {
             return {
                 title: "操作",
                 title: "操作",
@@ -131,8 +137,8 @@
                     toutiaoId: {rules: [{required: true, message: '请输入头条账号id!'}]},
                     toutiaoId: {rules: [{required: true, message: '请输入头条账号id!'}]},
                 },
                 },
                 url: {
                 url: {
-                    add: "/ctop/ctopToutiaoBudgetTemplate/add",
-                    edit: "/ctop/ctopToutiaoBudgetTemplate/edit",
+                    add: "/ctop/byteDanceBudgetTemplate/add",
+                    edit: "/ctop/byteDanceBudgetTemplate/edit",
                 },
                 },
             }
             }
         },
         },
@@ -147,7 +153,7 @@
                 this.model = Object.assign({}, record);
                 this.model = Object.assign({}, record);
                 this.visible = true;
                 this.visible = true;
                 this.$nextTick(() => {
                 this.$nextTick(() => {
-                    this.form.setFieldsValue(pick(this.model, 'advertiserId', 'toutiaoId', 'bidType', 'flowcontrolmode', 'budgetprice', 'budgetmode', 'flowdate', 'dateflowrange', 'datequantum', 'datequantumrange', 'pricetype', 'convertprice', 'filtertype', 'status'))
+                    this.form.setFieldsValue(pick(this.model, 'advertiserId', 'toutiaoId', 'bidType', 'flowControlMode', 'budgetPrice', 'budgetMode', 'flowDateType', 'startDate', 'endDate', 'dateQuantum', 'dateQuantumRange', 'priceType', 'convertPrice', 'filterType', 'status'))
                     //时间格式化
                     //时间格式化
                 });
                 });
 
 

+ 11 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CTopToutiaoCampaignModal.vue

@@ -74,6 +74,12 @@ CAMPAIGN_STATUS_ADVERTISER_BUDGET_EXCEED 	超出账户日预算" v-decorator="['
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
+                        label="optStatus">
+                    <a-input placeholder="请输入optStatus" v-decorator="['optStatus', validatorRules.optStatus ]"/>
+                </a-form-item>
+                <a-form-item
+                        :labelCol="labelCol"
+                        :wrapperCol="wrapperCol"
                         label="广告组创建时间">
                         label="广告组创建时间">
                     <a-input placeholder="请输入广告组创建时间" v-decorator="['campaignCreateTime', {}]"/>
                     <a-input placeholder="请输入广告组创建时间" v-decorator="['campaignCreateTime', {}]"/>
                 </a-form-item>
                 </a-form-item>
@@ -95,7 +101,7 @@ CAMPAIGN_STATUS_ADVERTISER_BUDGET_EXCEED 	超出账户日预算" v-decorator="['
     import moment from "moment"
     import moment from "moment"
 
 
     export default {
     export default {
-        name: "CTopToutiaoCampaignModal",
+        name: "ByteDanceCampaignModal",
         data() {
         data() {
             return {
             return {
                 title: "操作",
                 title: "操作",
@@ -114,10 +120,11 @@ CAMPAIGN_STATUS_ADVERTISER_BUDGET_EXCEED 	超出账户日预算" v-decorator="['
                 form: this.$form.createForm(this),
                 form: this.$form.createForm(this),
                 validatorRules: {
                 validatorRules: {
                     toutiaoId: {rules: [{required: true, message: '请输入头条账号id!'}]},
                     toutiaoId: {rules: [{required: true, message: '请输入头条账号id!'}]},
+                    optStatus: {rules: [{required: true, message: '请输入optStatus!'}]},
                 },
                 },
                 url: {
                 url: {
-                    add: "/ctop/cTopToutiaoCampaign/add",
-                    edit: "/ctop/cTopToutiaoCampaign/edit",
+                    add: "/ctop/byteDanceCampaign/add",
+                    edit: "/ctop/byteDanceCampaign/edit",
                 },
                 },
             }
             }
         },
         },
@@ -132,7 +139,7 @@ CAMPAIGN_STATUS_ADVERTISER_BUDGET_EXCEED 	超出账户日预算" v-decorator="['
                 this.model = Object.assign({}, record);
                 this.model = Object.assign({}, record);
                 this.visible = true;
                 this.visible = true;
                 this.$nextTick(() => {
                 this.$nextTick(() => {
-                    this.form.setFieldsValue(pick(this.model, 'advertiserId', 'toutiaoId', 'name', 'budget', 'budgetMode', 'landingType', 'modifyTime', 'status', 'campaignCreateTime', 'campaignModifyTime'))
+                    this.form.setFieldsValue(pick(this.model, 'advertiserId', 'toutiaoId', 'name', 'budget', 'budgetMode', 'landingType', 'modifyTime', 'status', 'optStatus', 'campaignCreateTime', 'campaignModifyTime'))
                     //时间格式化
                     //时间格式化
                 });
                 });
 
 

+ 11 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CTopToutiaoCampaignModal__Style#Drawer.vue

@@ -74,6 +74,12 @@ CAMPAIGN_STATUS_ADVERTISER_BUDGET_EXCEED 	超出账户日预算" v-decorator="['
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
+                        label="optStatus">
+                    <a-input placeholder="请输入optStatus" v-decorator="['optStatus', validatorRules.optStatus ]"/>
+                </a-form-item>
+                <a-form-item
+                        :labelCol="labelCol"
+                        :wrapperCol="wrapperCol"
                         label="广告组创建时间">
                         label="广告组创建时间">
                     <a-input placeholder="请输入广告组创建时间" v-decorator="['campaignCreateTime', {}]"/>
                     <a-input placeholder="请输入广告组创建时间" v-decorator="['campaignCreateTime', {}]"/>
                 </a-form-item>
                 </a-form-item>
@@ -97,7 +103,7 @@ CAMPAIGN_STATUS_ADVERTISER_BUDGET_EXCEED 	超出账户日预算" v-decorator="['
     import moment from "moment"
     import moment from "moment"
 
 
     export default {
     export default {
-        name: "CTopToutiaoCampaignModal",
+        name: "ByteDanceCampaignModal",
         data() {
         data() {
             return {
             return {
                 title: "操作",
                 title: "操作",
@@ -116,10 +122,11 @@ CAMPAIGN_STATUS_ADVERTISER_BUDGET_EXCEED 	超出账户日预算" v-decorator="['
                 form: this.$form.createForm(this),
                 form: this.$form.createForm(this),
                 validatorRules: {
                 validatorRules: {
                     toutiaoId: {rules: [{required: true, message: '请输入头条账号id!'}]},
                     toutiaoId: {rules: [{required: true, message: '请输入头条账号id!'}]},
+                    optStatus: {rules: [{required: true, message: '请输入optStatus!'}]},
                 },
                 },
                 url: {
                 url: {
-                    add: "/ctop/cTopToutiaoCampaign/add",
-                    edit: "/ctop/cTopToutiaoCampaign/edit",
+                    add: "/ctop/byteDanceCampaign/add",
+                    edit: "/ctop/byteDanceCampaign/edit",
                 },
                 },
             }
             }
         },
         },
@@ -134,7 +141,7 @@ CAMPAIGN_STATUS_ADVERTISER_BUDGET_EXCEED 	超出账户日预算" v-decorator="['
                 this.model = Object.assign({}, record);
                 this.model = Object.assign({}, record);
                 this.visible = true;
                 this.visible = true;
                 this.$nextTick(() => {
                 this.$nextTick(() => {
-                    this.form.setFieldsValue(pick(this.model, 'advertiserId', 'toutiaoId', 'name', 'budget', 'budgetMode', 'landingType', 'modifyTime', 'status', 'campaignCreateTime', 'campaignModifyTime'))
+                    this.form.setFieldsValue(pick(this.model, 'advertiserId', 'toutiaoId', 'name', 'budget', 'budgetMode', 'landingType', 'modifyTime', 'status', 'optStatus', 'campaignCreateTime', 'campaignModifyTime'))
                     //时间格式化
                     //时间格式化
                 });
                 });
 
 

+ 20 - 29
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CTopToutiaoAdvertisePlanModal.vue

@@ -14,50 +14,38 @@
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="平台广告主id">
-                    <a-input placeholder="请输入平台广告主id" v-decorator="['advertiserId', {}]"/>
+                        label="accountId">
+                    <a-input placeholder="请输入accountId" v-decorator="['accountId', validatorRules.accountId ]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="头条广告主id">
-                    <a-input placeholder="请输入头条广告主id" v-decorator="['toutiaoId', {}]"/>
+                        label="投放目标">
+                    <a-input placeholder="请输入投放目标" v-decorator="['promationPurpuse', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="计划名称">
-                    <a-input placeholder="请输入计划名称" v-decorator="['name', {}]"/>
+                        label="投放方式">
+                    <a-input placeholder="请输入投放方式" v-decorator="['campaignBudget', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="广告组id">
-                    <a-input placeholder="请输入广告组id" v-decorator="['campaignId', {}]"/>
+                        label="日预算">
+                    <a-input placeholder="请输入日预算" v-decorator="['budgetDaily', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="上次修改时间戳(用于更新时提交,服务端判断是否基于最新信息修改)">
-                    <a-input placeholder="请输入上次修改时间戳(用于更新时提交,服务端判断是否基于最新信息修改)" v-decorator="['planModifyTime', {}]"/>
+                        label="广告组名称">
+                    <a-input placeholder="请输入广告组名称" v-decorator="['campaignName', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="投放范围">
-                    <a-input placeholder="请输入投放范围" v-decorator="['deliveryRange', {}]"/>
-                </a-form-item>
-                <a-form-item
-                        :labelCol="labelCol"
-                        :wrapperCol="wrapperCol"
-                        label="计划上次修改时间">
-                    <a-input placeholder="请输入计划上次修改时间" v-decorator="['adModifyTime', {}]"/>
-                </a-form-item>
-                <a-form-item
-                        :labelCol="labelCol"
-                        :wrapperCol="wrapperCol"
-                        label="计划创建时间">
-                    <a-input placeholder="请输入计划创建时间" v-decorator="['adCreateTime', {}]"/>
+                        label="模板状态">
+                    <a-input-number v-decorator="[ 'status', validatorRules.status ]"/>
                 </a-form-item>
                 </a-form-item>
 
 
             </a-form>
             </a-form>
@@ -71,7 +59,7 @@
     import moment from "moment"
     import moment from "moment"
 
 
     export default {
     export default {
-        name: "CTopToutiaoAdvertisePlanModal",
+        name: "ByteDanceCampaignTemplateModal",
         data() {
         data() {
             return {
             return {
                 title: "操作",
                 title: "操作",
@@ -88,10 +76,13 @@
 
 
                 confirmLoading: false,
                 confirmLoading: false,
                 form: this.$form.createForm(this),
                 form: this.$form.createForm(this),
-                validatorRules: {},
+                validatorRules: {
+                    accountId: {rules: [{required: true, message: '请输入accountId!'}]},
+                    status: {rules: [{required: true, message: '请输入模板状态!'}]},
+                },
                 url: {
                 url: {
-                    add: "/ctop/cTopToutiaoAdvertisePlan/add",
-                    edit: "/ctop/cTopToutiaoAdvertisePlan/edit",
+                    add: "/ctop/byteDanceCampaignTemplate/add",
+                    edit: "/ctop/byteDanceCampaignTemplate/edit",
                 },
                 },
             }
             }
         },
         },
@@ -106,7 +97,7 @@
                 this.model = Object.assign({}, record);
                 this.model = Object.assign({}, record);
                 this.visible = true;
                 this.visible = true;
                 this.$nextTick(() => {
                 this.$nextTick(() => {
-                    this.form.setFieldsValue(pick(this.model, 'advertiserId', 'toutiaoId', 'name', 'campaignId', 'planModifyTime', 'deliveryRange', 'adModifyTime', 'adCreateTime'))
+                    this.form.setFieldsValue(pick(this.model, 'accountId', 'promationPurpuse', 'campaignBudget', 'budgetDaily', 'campaignName', 'status'))
                     //时间格式化
                     //时间格式化
                 });
                 });
 
 

+ 20 - 29
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/CTopToutiaoAdvertisePlanModal__Style#Drawer.vue

@@ -14,50 +14,38 @@
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="平台广告主id">
-                    <a-input placeholder="请输入平台广告主id" v-decorator="['advertiserId', {}]"/>
+                        label="accountId">
+                    <a-input placeholder="请输入accountId" v-decorator="['accountId', validatorRules.accountId ]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="头条广告主id">
-                    <a-input placeholder="请输入头条广告主id" v-decorator="['toutiaoId', {}]"/>
+                        label="投放目标">
+                    <a-input placeholder="请输入投放目标" v-decorator="['promationPurpuse', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="计划名称">
-                    <a-input placeholder="请输入计划名称" v-decorator="['name', {}]"/>
+                        label="投放方式">
+                    <a-input placeholder="请输入投放方式" v-decorator="['campaignBudget', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="广告组id">
-                    <a-input placeholder="请输入广告组id" v-decorator="['campaignId', {}]"/>
+                        label="日预算">
+                    <a-input placeholder="请输入日预算" v-decorator="['budgetDaily', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="上次修改时间戳(用于更新时提交,服务端判断是否基于最新信息修改)">
-                    <a-input placeholder="请输入上次修改时间戳(用于更新时提交,服务端判断是否基于最新信息修改)" v-decorator="['planModifyTime', {}]"/>
+                        label="广告组名称">
+                    <a-input placeholder="请输入广告组名称" v-decorator="['campaignName', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
-                        label="投放范围">
-                    <a-input placeholder="请输入投放范围" v-decorator="['deliveryRange', {}]"/>
-                </a-form-item>
-                <a-form-item
-                        :labelCol="labelCol"
-                        :wrapperCol="wrapperCol"
-                        label="计划上次修改时间">
-                    <a-input placeholder="请输入计划上次修改时间" v-decorator="['adModifyTime', {}]"/>
-                </a-form-item>
-                <a-form-item
-                        :labelCol="labelCol"
-                        :wrapperCol="wrapperCol"
-                        label="计划创建时间">
-                    <a-input placeholder="请输入计划创建时间" v-decorator="['adCreateTime', {}]"/>
+                        label="模板状态">
+                    <a-input-number v-decorator="[ 'status', validatorRules.status ]"/>
                 </a-form-item>
                 </a-form-item>
 
 
             </a-form>
             </a-form>
@@ -73,7 +61,7 @@
     import moment from "moment"
     import moment from "moment"
 
 
     export default {
     export default {
-        name: "CTopToutiaoAdvertisePlanModal",
+        name: "ByteDanceCampaignTemplateModal",
         data() {
         data() {
             return {
             return {
                 title: "操作",
                 title: "操作",
@@ -90,10 +78,13 @@
 
 
                 confirmLoading: false,
                 confirmLoading: false,
                 form: this.$form.createForm(this),
                 form: this.$form.createForm(this),
-                validatorRules: {},
+                validatorRules: {
+                    accountId: {rules: [{required: true, message: '请输入accountId!'}]},
+                    status: {rules: [{required: true, message: '请输入模板状态!'}]},
+                },
                 url: {
                 url: {
-                    add: "/ctop/cTopToutiaoAdvertisePlan/add",
-                    edit: "/ctop/cTopToutiaoAdvertisePlan/edit",
+                    add: "/ctop/byteDanceCampaignTemplate/add",
+                    edit: "/ctop/byteDanceCampaignTemplate/edit",
                 },
                 },
             }
             }
         },
         },
@@ -108,7 +99,7 @@
                 this.model = Object.assign({}, record);
                 this.model = Object.assign({}, record);
                 this.visible = true;
                 this.visible = true;
                 this.$nextTick(() => {
                 this.$nextTick(() => {
-                    this.form.setFieldsValue(pick(this.model, 'advertiserId', 'toutiaoId', 'name', 'campaignId', 'planModifyTime', 'deliveryRange', 'adModifyTime', 'adCreateTime'))
+                    this.form.setFieldsValue(pick(this.model, 'accountId', 'promationPurpuse', 'campaignBudget', 'budgetDaily', 'campaignName', 'status'))
                     //时间格式化
                     //时间格式化
                 });
                 });
 
 

+ 10 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/ToutiaoCreativeMaterialModal.vue

@@ -39,6 +39,12 @@
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
                         label="创意状态">
                         label="创意状态">
+                    <a-input placeholder="请输入创意状态" v-decorator="['status', {}]"/>
+                </a-form-item>
+                <a-form-item
+                        :labelCol="labelCol"
+                        :wrapperCol="wrapperCol"
+                        label="创意状态">
                     <a-input placeholder="请输入创意状态" v-decorator="['optStatus', {}]"/>
                     <a-input placeholder="请输入创意状态" v-decorator="['optStatus', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
@@ -65,7 +71,7 @@
     import moment from "moment"
     import moment from "moment"
 
 
     export default {
     export default {
-        name: "ToutiaoCreativeMaterialModal",
+        name: "ByteDanceCreativeMaterialModal",
         data() {
         data() {
             return {
             return {
                 title: "操作",
                 title: "操作",
@@ -84,8 +90,8 @@
                 form: this.$form.createForm(this),
                 form: this.$form.createForm(this),
                 validatorRules: {},
                 validatorRules: {},
                 url: {
                 url: {
-                    add: "/ctop/toutiaoCreativeMaterial/add",
-                    edit: "/ctop/toutiaoCreativeMaterial/edit",
+                    add: "/ctop/byteDanceCreativeMaterial/add",
+                    edit: "/ctop/byteDanceCreativeMaterial/edit",
                 },
                 },
             }
             }
         },
         },
@@ -100,7 +106,7 @@
                 this.model = Object.assign({}, record);
                 this.model = Object.assign({}, record);
                 this.visible = true;
                 this.visible = true;
                 this.$nextTick(() => {
                 this.$nextTick(() => {
-                    this.form.setFieldsValue(pick(this.model, 'advertiserId', 'adId', 'toutiaoId', 'title', 'optStatus', 'imageMode', 'imageInfo'))
+                    this.form.setFieldsValue(pick(this.model, 'advertiserId', 'adId', 'toutiaoId', 'title', 'status', 'optStatus', 'imageMode', 'imageInfo'))
                     //时间格式化
                     //时间格式化
                 });
                 });
 
 

+ 10 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/ToutiaoCreativeMaterialModal__Style#Drawer.vue

@@ -39,6 +39,12 @@
                         :labelCol="labelCol"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol"
                         :wrapperCol="wrapperCol"
                         label="创意状态">
                         label="创意状态">
+                    <a-input placeholder="请输入创意状态" v-decorator="['status', {}]"/>
+                </a-form-item>
+                <a-form-item
+                        :labelCol="labelCol"
+                        :wrapperCol="wrapperCol"
+                        label="创意状态">
                     <a-input placeholder="请输入创意状态" v-decorator="['optStatus', {}]"/>
                     <a-input placeholder="请输入创意状态" v-decorator="['optStatus', {}]"/>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item
                 <a-form-item
@@ -67,7 +73,7 @@
     import moment from "moment"
     import moment from "moment"
 
 
     export default {
     export default {
-        name: "ToutiaoCreativeMaterialModal",
+        name: "ByteDanceCreativeMaterialModal",
         data() {
         data() {
             return {
             return {
                 title: "操作",
                 title: "操作",
@@ -86,8 +92,8 @@
                 form: this.$form.createForm(this),
                 form: this.$form.createForm(this),
                 validatorRules: {},
                 validatorRules: {},
                 url: {
                 url: {
-                    add: "/ctop/toutiaoCreativeMaterial/add",
-                    edit: "/ctop/toutiaoCreativeMaterial/edit",
+                    add: "/ctop/byteDanceCreativeMaterial/add",
+                    edit: "/ctop/byteDanceCreativeMaterial/edit",
                 },
                 },
             }
             }
         },
         },
@@ -102,7 +108,7 @@
                 this.model = Object.assign({}, record);
                 this.model = Object.assign({}, record);
                 this.visible = true;
                 this.visible = true;
                 this.$nextTick(() => {
                 this.$nextTick(() => {
-                    this.form.setFieldsValue(pick(this.model, 'advertiserId', 'adId', 'toutiaoId', 'title', 'optStatus', 'imageMode', 'imageInfo'))
+                    this.form.setFieldsValue(pick(this.model, 'advertiserId', 'adId', 'toutiaoId', 'title', 'status', 'optStatus', 'imageMode', 'imageInfo'))
                     //时间格式化
                     //时间格式化
                 });
                 });
 
 

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/ToutiaoCreativeModal.vue

@@ -113,7 +113,7 @@
     import moment from "moment"
     import moment from "moment"
 
 
     export default {
     export default {
-        name: "ToutiaoCreativeModal",
+        name: "ByteDanceCreativeModal",
         data() {
         data() {
             return {
             return {
                 title: "操作",
                 title: "操作",
@@ -132,8 +132,8 @@
                 form: this.$form.createForm(this),
                 form: this.$form.createForm(this),
                 validatorRules: {},
                 validatorRules: {},
                 url: {
                 url: {
-                    add: "/ctop/toutiaoCreative/add",
-                    edit: "/ctop/toutiaoCreative/edit",
+                    add: "/ctop/byteDanceCreative/add",
+                    edit: "/ctop/byteDanceCreative/edit",
                 },
                 },
             }
             }
         },
         },

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vue/modules/ToutiaoCreativeModal__Style#Drawer.vue

@@ -115,7 +115,7 @@
     import moment from "moment"
     import moment from "moment"
 
 
     export default {
     export default {
-        name: "ToutiaoCreativeModal",
+        name: "ByteDanceCreativeModal",
         data() {
         data() {
             return {
             return {
                 title: "操作",
                 title: "操作",
@@ -134,8 +134,8 @@
                 form: this.$form.createForm(this),
                 form: this.$form.createForm(this),
                 validatorRules: {},
                 validatorRules: {},
                 url: {
                 url: {
-                    add: "/ctop/toutiaoCreative/add",
-                    edit: "/ctop/toutiaoCreative/edit",
+                    add: "/ctop/byteDanceCreative/add",
+                    edit: "/ctop/byteDanceCreative/edit",
                 },
                 },
             }
             }
         },
         },