Преглед изворни кода

Merge remote-tracking branch 'remotes/origin/test'

# Conflicts:
#	module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceUserOrientationTemplateServiceImpl.java
syh пре 5 година
родитељ
комит
82776e5438
100 измењених фајлова са 84 додато и 16078 уклоњено
  1. 0 17
      jeecg-boot-base-common/src/main/java/org/jeecg/common/constant/CtopAdConstant.java
  2. 0 17
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/ResultMapUtils.java
  3. 0 81
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/StatusCode.java
  4. 7 12
      jeecg-boot-module-system/pom.xml
  5. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/JeecgApplication.java
  6. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/config/MybatisPlusConfig.java
  7. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ActorController.java
  8. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AuthController.java
  9. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountAuthController.java
  10. 9 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountLoginController.java
  11. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertisePlanController.java
  12. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertiserBudgetController.java
  13. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertiserController.java
  14. 5 10
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertiserPostController.java
  15. 0 246
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceBudgetTemplateController.java
  16. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCampaignController.java
  17. 0 252
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCampaignTemplateController.java
  18. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCreativeController.java
  19. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCreativeMaterialController.java
  20. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCreativeTemplateController.java
  21. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCustomAudienceController.java
  22. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceImageInfoController.java
  23. 14 7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceTemplateController.java
  24. 0 252
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceUserOrientationTemplateController.java
  25. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceVideoInfoController.java
  26. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceAdvertisePlanTemplateController.java
  27. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceAdvertiserDailyReportController.java
  28. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceAdvertiserHourlyReportController.java
  29. 0 280
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceAreaInfoController.java
  30. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceCampaignDailyReportController.java
  31. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceCampaignHourlyReportController.java
  32. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceCreativeDailyReportController.java
  33. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceCreativeHourlyReportController.java
  34. 0 252
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceDeliveryTargetTemplateController.java
  35. 0 269
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceInterestCategoryController.java
  36. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceNameModelRuleController.java
  37. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedancePlanDailyReportController.java
  38. 0 248
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedancePlanHourlyReportController.java
  39. 0 252
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceUrlInfoController.java
  40. 9 13
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  41. 4 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CtopOauthTokenController.java
  42. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/FileInfoController.java
  43. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ReportController.java
  44. 18 23
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SourceFileController.java
  45. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java
  46. 0 74
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BindAccountAuth.java
  47. 0 94
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BindAccountLogin.java
  48. 0 692
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertisePlan.java
  49. 0 242
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertiser.java
  50. 0 68
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertiserBudget.java
  51. 0 141
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceBudgetTemplate.java
  52. 0 186
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCampaign.java
  53. 0 86
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCampaignTemplate.java
  54. 0 157
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCreative.java
  55. 0 110
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCreativeMaterial.java
  56. 0 143
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCreativeTemplate.java
  57. 0 121
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCustomAudience.java
  58. 0 123
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceImageInfo.java
  59. 0 387
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceUserOrientationTemplate.java
  60. 0 117
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceVideoInfo.java
  61. 0 96
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAdvertisePlanTemplate.java
  62. 0 602
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAdvertiserDailyReport.java
  63. 0 606
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAdvertiserHourlyReport.java
  64. 0 73
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAreaInfo.java
  65. 0 627
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceCampaignDailyReport.java
  66. 0 627
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceCampaignHourlyReport.java
  67. 0 657
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceCreativeDailyReport.java
  68. 0 654
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceCreativeHourlyReport.java
  69. 0 140
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceDeliveryTargetTemplate.java
  70. 0 73
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceInterestCategory.java
  71. 0 66
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceNameModelRule.java
  72. 0 640
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedancePlanDailyReport.java
  73. 0 640
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedancePlanHourlyReport.java
  74. 0 74
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceUrlInfo.java
  75. 0 137
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/CtopOauthToken.java
  76. 0 134
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/FileInfo.java
  77. 0 60
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/SourceFile.java
  78. 0 131
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/UserAllocation.java
  79. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouCommentAutoDelete.java
  80. 0 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/BindAccountAuthMapper.java
  81. 0 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/BindAccountLoginMapper.java
  82. 0 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceAdvertisePlanMapper.java
  83. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceAdvertiserBudgetMapper.java
  84. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceAdvertiserMapper.java
  85. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceBudgetTemplateMapper.java
  86. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceCampaignMapper.java
  87. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceCampaignTemplateMapper.java
  88. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceCreativeMapper.java
  89. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceCreativeMaterialMapper.java
  90. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceCreativeTemplateMapper.java
  91. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceCustomAudienceMapper.java
  92. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceImageInfoMapper.java
  93. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceUserOrientationTemplateMapper.java
  94. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceVideoInfoMapper.java
  95. 0 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/BytedanceAdvertisePlanTemplateMapper.java
  96. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/BytedanceAdvertiserDailyReportMapper.java
  97. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/BytedanceAdvertiserHourlyReportMapper.java
  98. 0 18
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/BytedanceAreaInfoMapper.java
  99. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/BytedanceCampaignDailyReportMapper.java
  100. 0 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/BytedanceCampaignHourlyReportMapper.java

+ 0 - 17
jeecg-boot-base-common/src/main/java/org/jeecg/common/constant/CtopAdConstant.java

@@ -1,17 +0,0 @@
-package org.jeecg.common.constant;
-
-/**
- * 广告相关常量数据
- */
-public class CtopAdConstant {
-    public static final String PLATFORM_TYPE_BYTEDANCE = "1";
-    public static final String PLATFORM_TYPE_KUAISHOU = "2";
-
-    public static final String PLATFORM_TYPE_BYTEDANCE_PY = "bytedance";
-    public static final String PLATFORM_TYPE_KUAISHOU_PY = "kuaishou";
-
-    public static final String BYTEDANCE_REPORT_TYPE_DAILY = "STAT_TIME_GRANULARITY_DAILY";
-    public static final String BYTEDANCE_REPORT_TYPE_HOURLY = "STAT_TIME_GRANULARITY_HOURLY";
-
-
-}

+ 0 - 17
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/ResultMapUtils.java

@@ -1,17 +0,0 @@
-package org.jeecg.common.util;
-
-import com.alibaba.fastjson.JSONObject;
-
-import java.util.Map;
-
-public class ResultMapUtils {
-    private static final String MAP_CODE = "code";
-    private static final String MAP_MESSAGE = "message";
-    private static final String MAP_SUCCESS = "success";
-
-    public static void setResultMap(Map<String, Object> map, Integer statusCode) {
-        map.put(MAP_CODE, statusCode);
-        map.put(MAP_MESSAGE, StatusCode.getDesc(statusCode));
-        map.put(MAP_SUCCESS, StatusCode.getFlag(statusCode));
-    }
-}

+ 0 - 81
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/StatusCode.java

@@ -1,81 +0,0 @@
-package org.jeecg.common.util;
-
-public enum StatusCode {
-    /**
-     * 0   请求成功
-     * -101 参数异常
-     * -102 服务器异常
-     * -103 数据不存在
-     * -104 渠道不存在
-     * -105 规则尚未配置
-     * -106 规则为空
-     * -107 同盾数据为空
-     * -108 模型服务异常
-     * -109 深度搜索服务异常
-     * -201 探针数据为空
-     */
-    COMMON_SUCCESS("success", 0, true),
-    COMMON_PARAM_ERROR("参数异常", -1, false),
-    BYTEDANCE_VIDEO_UPLOAD_FAIL("今日头条视频文件上传失败", -201, false),
-    IMAGE_NUMBER_SHORTAGE("今日头条图片文件上传失败", -202, false),
-    BYTEDANCE_IMAGE_UPLOAD_FAIL("今日头条图片文件上传失败", -203, false),
-    TEMPLATE_NAME_HAS_EXIST("模板名称已存在", -204, false),
-    TEMPLATE_NAME_IS_NULL("模板名称为空", -205, false),
-    FILE_HAS_NOT_UPLOAD("文件尚未上传", -206, false),
-    ACCOUNT_HAS_NOT_EXIST("改用户信息不存在", -207, false),
-    USERNAME_OR_PASSWORD_ERROR("登录用户名或密码错误", -208, false),
-    FILE_HAS_UPLOAD("文件已经上传过", 0, false),
-    COMMON_SERVER_ERROR("服务器内部错误", -102, false);
-    private String desc;
-    private int code;
-    private boolean flag;
-
-    StatusCode(String desc, int code, boolean flag) {
-        this.desc = desc;
-        this.code = code;
-        this.flag = flag;
-    }
-
-    public static String getDesc(int code) {
-        for (StatusCode error : StatusCode.values()) {
-            if (error.getCode() == code) {
-                return error.getDesc();
-            }
-        }
-        return null;
-    }
-
-    public static Boolean getFlag(int code) {
-        for (StatusCode error : StatusCode.values()) {
-            if (error.getCode() == code) {
-                return error.getFlag();
-            }
-        }
-        return null;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public boolean getFlag() {
-        return flag;
-    }
-
-    public void setFlag(boolean flag) {
-        this.flag = flag;
-    }
-
-}

+ 7 - 12
jeecg-boot-module-system/pom.xml

@@ -45,12 +45,17 @@
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
-
         <dependency>
             <groupId>cn.com.ctop</groupId>
             <artifactId>module-media</artifactId>
             <version>2.0.2</version>
         </dependency>
+
+        <dependency>
+            <groupId>cn.com.ctop</groupId>
+            <artifactId>module-common</artifactId>
+            <version>2.0.2</version>
+        </dependency>
         <dependency>
             <groupId>cn.com.ctop</groupId>
             <artifactId>module-kuaishou</artifactId>
@@ -85,11 +90,6 @@
             <version>1.49</version>
         </dependency>
         <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itextpdf</artifactId>
-            <version>5.5.13</version>
-        </dependency>
-        <dependency>
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>module-ctop</artifactId>
             <version>2.0.2</version>
@@ -101,11 +101,6 @@
             <version>2.0.2</version>
             <scope>compile</scope>
         </dependency>
-        <!--<dependency>
-            <groupId>e-iceblue</groupId>
-            <artifactId>spire.pdf</artifactId>
-            <version>2.7.8</version>
-        </dependency>-->
     </dependencies>
 
     <build>
@@ -158,4 +153,4 @@
             </properties>
         </profile>
     </profiles>
-</project>
+</project>

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/JeecgApplication.java

@@ -20,7 +20,6 @@ import java.net.UnknownHostException;
 @SpringBootApplication
 @ComponentScan(basePackages = {"cn.com.ctop", "org.jeecg"})
 @EnableAutoConfiguration
-@ComponentScan
 @Configuration
 
 

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

@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration;
  *
  */
 @Configuration
-@MapperScan(value = {"org.jeecg.modules.**.mapper*", "cn.com.ctop.kuaishou.modules.**.mapper*", "cn.com.ctop.crawler.modules.**.mapper*", "cn.com.ctop.manage.modules.**.mapper*"})
+@MapperScan(value = {"org.jeecg.modules.**.mapper*", "cn.com.ctop.**.mapper*"})
 
 public class MybatisPlusConfig {
 

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ActorController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.ctop.controller;
 
-import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.manage.modules.actor.entity.Actor;
 import cn.com.ctop.manage.modules.actor.entity.ActorComment;
 import cn.com.ctop.manage.modules.actor.entity.ActorPhoto;
@@ -12,7 +13,6 @@ import cn.com.ctop.manage.modules.actor.service.IActorVideoService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import constant.KuaishouInterfaceConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;

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

@@ -1,6 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
-import org.jeecg.modules.ctop.service.IBindAccountAuthService;
+import cn.com.ctop.common.module.service.IBindAccountAuthService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountAuthController.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.ctop.controller;
 
-import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.entity.BindAccountAuth;
+import cn.com.ctop.common.module.service.IBindAccountAuthService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -13,8 +15,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.BindAccountAuth;
-import org.jeecg.modules.ctop.service.IBindAccountAuthService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;

+ 9 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountLoginController.java

@@ -1,6 +1,10 @@
 package org.jeecg.modules.ctop.controller;
 
-import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.entity.BindAccountLogin;
+import cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.mapper.UserAllocationMapper;
+import cn.com.ctop.common.module.service.IBindAccountLoginService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -13,10 +17,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.BindAccountLogin;
-import org.jeecg.modules.ctop.entity.UserAllocation;
-import org.jeecg.modules.ctop.mapper.UserAllocationMapper;
-import org.jeecg.modules.ctop.service.IBindAccountLoginService;
+import org.jeecg.modules.ctop.service.ICreateInternalService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -56,6 +57,8 @@ public class BindAccountLoginController {
     private IBindAccountLoginService bindAccountLoginService;
     @Autowired
     private UserAllocationMapper userAllocationMapper;
+    @Autowired
+    private ICreateInternalService createInternalService;
 
     /**
      * TODO  需要爬虫校验用户名密码正确性
@@ -78,7 +81,7 @@ public class BindAccountLoginController {
         String loginType = json.getString("loginType");
         //账号
         String accountName = json.getString("accountName");
-        boolean trueOrFalse = bindAccountLoginService.bindLogin(advertiserId, accountName, password, loginType, userId);
+        boolean trueOrFalse = createInternalService.bindLogin(advertiserId, accountName, password, loginType, userId);
         if (trueOrFalse) {
             String realName = json.getString("realName");
             //部门id

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

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.ByteDanceAdvertisePlan;
-import org.jeecg.modules.ctop.service.IByteDanceAdvertisePlanService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @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("文件导入失败!");
-    }
-
-}

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

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.ByteDanceAdvertiserBudget;
-import org.jeecg.modules.ctop.service.IByteDanceAdvertiserBudgetService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @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("文件导入失败!");
-    }
-
-}

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

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.ByteDanceAdvertiser;
-import org.jeecg.modules.ctop.service.IByteDanceAdvertiserService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 今日头条广告主信息
- * @Author: jeecg-boot
- * @Date: 2019-07-22
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "今日头条广告主信息")
-@RestController
-@RequestMapping("/ctop/byteDanceAdvertiser")
-public class ByteDanceAdvertiserController {
-    @Autowired
-    private IByteDanceAdvertiserService byteDanceAdvertiserService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param byteDanceAdvertiser
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "今日头条广告主信息-分页列表查询")
-    @ApiOperation(value = "今日头条广告主信息-分页列表查询", notes = "今日头条广告主信息-分页列表查询")
-    @GetMapping(value = "/list")
-    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.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param byteDanceAdvertiser
-     * @return
-     */
-    @AutoLog(value = "今日头条广告主信息-添加")
-    @ApiOperation(value = "今日头条广告主信息-添加", notes = "今日头条广告主信息-添加")
-    @PostMapping(value = "/add")
-    public Result<ByteDanceAdvertiser> add(@RequestBody ByteDanceAdvertiser byteDanceAdvertiser) {
-        Result<ByteDanceAdvertiser> result = new Result<ByteDanceAdvertiser>();
-        try {
-            byteDanceAdvertiserService.save(byteDanceAdvertiser);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param byteDanceAdvertiser
-     * @return
-     */
-    @AutoLog(value = "今日头条广告主信息-编辑")
-    @ApiOperation(value = "今日头条广告主信息-编辑", notes = "今日头条广告主信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<ByteDanceAdvertiser> edit(@RequestBody ByteDanceAdvertiser byteDanceAdvertiser) {
-        Result<ByteDanceAdvertiser> result = new Result<ByteDanceAdvertiser>();
-        ByteDanceAdvertiser byteDanceAdvertiserEntity = byteDanceAdvertiserService.getById(byteDanceAdvertiser.getId());
-        if (byteDanceAdvertiserEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = byteDanceAdvertiserService.updateById(byteDanceAdvertiser);
-            //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 {
-            byteDanceAdvertiserService.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<ByteDanceAdvertiser> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<ByteDanceAdvertiser> result = new Result<ByteDanceAdvertiser>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.byteDanceAdvertiserService.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<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("未找到对应实体");
-        } else {
-            result.setResult(byteDanceAdvertiser);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<ByteDanceAdvertiser> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                ByteDanceAdvertiser byteDanceAdvertiser = JSON.parseObject(deString, ByteDanceAdvertiser.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(byteDanceAdvertiser, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<ByteDanceAdvertiser> pageList = byteDanceAdvertiserService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条广告主信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, ByteDanceAdvertiser.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<ByteDanceAdvertiser> listByteDanceAdvertisers = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceAdvertiser.class, params);
-                byteDanceAdvertiserService.saveBatch(listByteDanceAdvertisers);
-                return Result.ok("文件导入成功!数据行数:" + listByteDanceAdvertisers.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("文件导入失败!");
-    }
-
-}

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

@@ -1,5 +1,10 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.service.IFileInfoService;
+import cn.com.ctop.toutiao.entity.ByteDanceCustomAudience;
+import cn.com.ctop.toutiao.entity.ByteDanceUserOrientationTemplate;
+import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
+import cn.com.ctop.toutiao.service.IByteDanceCustomAudienceService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,11 +12,6 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.ctop.entity.ByteDanceCustomAudience;
-import org.jeecg.modules.ctop.entity.ByteDanceUserOrientationTemplate;
-import org.jeecg.modules.ctop.service.IByteDanceAdvertiserDataService;
-import org.jeecg.modules.ctop.service.IByteDanceCustomAudienceService;
-import org.jeecg.modules.ctop.service.IFileInfoService;
 import org.jeecg.modules.system.entity.SysDictItem;
 import org.jeecg.modules.system.service.ISysDictItemService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -189,11 +189,6 @@ public class ByteDanceAdvertiserPostController {
         return fileInfoService.uploadImageToBytedance(accountId, imageUrl);
     }
 
-    @RequestMapping("/industry/list")
-    public Map<String, Object> industryList(String accountId, Integer level) {
-        return fileInfoService.getIndustryList(accountId, level);
-    }
-
     /**
      * @param audience
      * @param pageNo

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

@@ -1,246 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.ByteDanceBudgetTemplate;
-import org.jeecg.modules.ctop.service.IByteDanceBudgetTemplateService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
- /**
-  * @Description: 今日头条预算模板信息
- * @Author: jeecg-boot
-  * @Date: 2019-07-22
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "今日头条预算模板信息")
-@RestController
-@RequestMapping("/ctop/byteDanceBudgetTemplate")
-public class ByteDanceBudgetTemplateController {
-	@Autowired
-    private IByteDanceBudgetTemplateService byteDanceBudgetTemplateService;
-	
-	/**
-	  * 分页列表查询
-     * @param byteDanceBudgetTemplate
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-    @AutoLog(value = "今日头条预算模板信息-分页列表查询")
-    @ApiOperation(value = "今日头条预算模板信息-分页列表查询", notes = "今日头条预算模板信息-分页列表查询")
-	@GetMapping(value = "/list")
-    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());
-        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.eq("advertiser_id", user.getId());
-        Page<ByteDanceBudgetTemplate> page = new Page<ByteDanceBudgetTemplate>(pageNo, pageSize);
-        IPage<ByteDanceBudgetTemplate> pageList = byteDanceBudgetTemplateService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-     * @param byteDanceBudgetTemplate
-	 * @return
-	 */
-    @AutoLog(value = "今日头条预算模板信息-添加")
-    @ApiOperation(value = "今日头条预算模板信息-添加", notes = "今日头条预算模板信息-添加")
-	@PostMapping(value = "/add")
-    public Result<ByteDanceBudgetTemplate> add(@RequestBody ByteDanceBudgetTemplate byteDanceBudgetTemplate) {
-        Result<ByteDanceBudgetTemplate> result = new Result<ByteDanceBudgetTemplate>();
-		try {
-            byteDanceBudgetTemplateService.save(byteDanceBudgetTemplate);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-     * @param byteDanceBudgetTemplate
-	 * @return
-	 */
-    @AutoLog(value = "今日头条预算模板信息-编辑")
-    @ApiOperation(value = "今日头条预算模板信息-编辑", notes = "今日头条预算模板信息-编辑")
-	@PutMapping(value = "/edit")
-    public Result<ByteDanceBudgetTemplate> edit(@RequestBody ByteDanceBudgetTemplate byteDanceBudgetTemplate) {
-        Result<ByteDanceBudgetTemplate> result = new Result<ByteDanceBudgetTemplate>();
-        ByteDanceBudgetTemplate byteDanceBudgetTemplateEntity = byteDanceBudgetTemplateService.getById(byteDanceBudgetTemplate.getId());
-        if (byteDanceBudgetTemplateEntity == null) {
-			result.error500("未找到对应实体");
-		}else {
-            boolean ok = byteDanceBudgetTemplateService.updateById(byteDanceBudgetTemplate);
-			//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 {
-            byteDanceBudgetTemplateService.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<ByteDanceBudgetTemplate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<ByteDanceBudgetTemplate> result = new Result<ByteDanceBudgetTemplate>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-            this.byteDanceBudgetTemplateService.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<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("未找到对应实体");
-		}else {
-            result.setResult(byteDanceBudgetTemplate);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<ByteDanceBudgetTemplate> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              ByteDanceBudgetTemplate byteDanceBudgetTemplate = JSON.parseObject(deString, ByteDanceBudgetTemplate.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(byteDanceBudgetTemplate, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<ByteDanceBudgetTemplate> pageList = byteDanceBudgetTemplateService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条预算模板信息列表");
-      mv.addObject(NormalExcelConstants.CLASS, ByteDanceBudgetTemplate.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<ByteDanceBudgetTemplate> listByteDanceBudgetTemplates = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceBudgetTemplate.class, params);
-              byteDanceBudgetTemplateService.saveBatch(listByteDanceBudgetTemplates);
-              return Result.ok("文件导入成功!数据行数:" + listByteDanceBudgetTemplates.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 - 248
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCampaignController.java

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.ByteDanceCampaign;
-import org.jeecg.modules.ctop.service.IByteDanceCampaignService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 今日头条广告组信息
- * @Author: jeecg-boot
- * @Date: 2019-07-22
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "今日头条广告组信息")
-@RestController
-@RequestMapping("/ctop/byteDanceCampaign")
-public class ByteDanceCampaignController {
-    @Autowired
-    private IByteDanceCampaignService byteDanceCampaignService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param byteDanceCampaign
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "今日头条广告组信息-分页列表查询")
-    @ApiOperation(value = "今日头条广告组信息-分页列表查询", notes = "今日头条广告组信息-分页列表查询")
-    @GetMapping(value = "/list")
-    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.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param byteDanceCampaign
-     * @return
-     */
-    @AutoLog(value = "今日头条广告组信息-添加")
-    @ApiOperation(value = "今日头条广告组信息-添加", notes = "今日头条广告组信息-添加")
-    @PostMapping(value = "/add")
-    public Result<ByteDanceCampaign> add(@RequestBody ByteDanceCampaign byteDanceCampaign) {
-        Result<ByteDanceCampaign> result = new Result<ByteDanceCampaign>();
-        try {
-            byteDanceCampaignService.save(byteDanceCampaign);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param byteDanceCampaign
-     * @return
-     */
-    @AutoLog(value = "今日头条广告组信息-编辑")
-    @ApiOperation(value = "今日头条广告组信息-编辑", notes = "今日头条广告组信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<ByteDanceCampaign> edit(@RequestBody ByteDanceCampaign byteDanceCampaign) {
-        Result<ByteDanceCampaign> result = new Result<ByteDanceCampaign>();
-        ByteDanceCampaign byteDanceCampaignEntity = byteDanceCampaignService.getById(byteDanceCampaign.getId());
-        if (byteDanceCampaignEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = byteDanceCampaignService.updateById(byteDanceCampaign);
-            //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 {
-            byteDanceCampaignService.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<ByteDanceCampaign> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<ByteDanceCampaign> result = new Result<ByteDanceCampaign>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.byteDanceCampaignService.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<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("未找到对应实体");
-        } else {
-            result.setResult(byteDanceCampaign);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<ByteDanceCampaign> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                ByteDanceCampaign byteDanceCampaign = JSON.parseObject(deString, ByteDanceCampaign.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCampaign, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<ByteDanceCampaign> pageList = byteDanceCampaignService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条广告组信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, ByteDanceCampaign.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<ByteDanceCampaign> listByteDanceCampaigns = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceCampaign.class, params);
-                byteDanceCampaignService.saveBatch(listByteDanceCampaigns);
-                return Result.ok("文件导入成功!数据行数:" + listByteDanceCampaigns.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 - 252
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCampaignTemplateController.java

@@ -1,252 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
-import org.jeecg.modules.ctop.service.IByteDanceCampaignTemplateService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @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());
-        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.eq("advertiser_id", user.getId());
-        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("文件导入失败!");
-    }
-
-}

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

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.ByteDanceCreative;
-import org.jeecg.modules.ctop.service.IByteDanceCreativeService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 今日头条创意信息
- * @Author: jeecg-boot
- * @Date: 2019-07-22
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "今日头条创意信息")
-@RestController
-@RequestMapping("/ctop/byteDanceCreative")
-public class ByteDanceCreativeController {
-    @Autowired
-    private IByteDanceCreativeService byteDanceCreativeService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param byteDanceCreative
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "今日头条创意信息-分页列表查询")
-    @ApiOperation(value = "今日头条创意信息-分页列表查询", notes = "今日头条创意信息-分页列表查询")
-    @GetMapping(value = "/list")
-    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.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param byteDanceCreative
-     * @return
-     */
-    @AutoLog(value = "今日头条创意信息-添加")
-    @ApiOperation(value = "今日头条创意信息-添加", notes = "今日头条创意信息-添加")
-    @PostMapping(value = "/add")
-    public Result<ByteDanceCreative> add(@RequestBody ByteDanceCreative byteDanceCreative) {
-        Result<ByteDanceCreative> result = new Result<ByteDanceCreative>();
-        try {
-            byteDanceCreativeService.save(byteDanceCreative);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param byteDanceCreative
-     * @return
-     */
-    @AutoLog(value = "今日头条创意信息-编辑")
-    @ApiOperation(value = "今日头条创意信息-编辑", notes = "今日头条创意信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<ByteDanceCreative> edit(@RequestBody ByteDanceCreative byteDanceCreative) {
-        Result<ByteDanceCreative> result = new Result<ByteDanceCreative>();
-        ByteDanceCreative byteDanceCreativeEntity = byteDanceCreativeService.getById(byteDanceCreative.getId());
-        if (byteDanceCreativeEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = byteDanceCreativeService.updateById(byteDanceCreative);
-            //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 {
-            byteDanceCreativeService.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<ByteDanceCreative> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<ByteDanceCreative> result = new Result<ByteDanceCreative>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.byteDanceCreativeService.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<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("未找到对应实体");
-        } else {
-            result.setResult(byteDanceCreative);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<ByteDanceCreative> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                ByteDanceCreative byteDanceCreative = JSON.parseObject(deString, ByteDanceCreative.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCreative, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<ByteDanceCreative> pageList = byteDanceCreativeService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条创意信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, ByteDanceCreative.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<ByteDanceCreative> listByteDanceCreatives = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceCreative.class, params);
-                byteDanceCreativeService.saveBatch(listByteDanceCreatives);
-                return Result.ok("文件导入成功!数据行数:" + listByteDanceCreatives.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 - 248
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCreativeMaterialController.java

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.ByteDanceCreativeMaterial;
-import org.jeecg.modules.ctop.service.IByteDanceCreativeMaterialService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @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 - 248
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCreativeTemplateController.java

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.ByteDanceCreativeTemplate;
-import org.jeecg.modules.ctop.service.IByteDanceCreativeTemplateService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 广告创意模板
- * @Author: jeecg-boot
- * @Date: 2019-07-29
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "广告创意模板")
-@RestController
-@RequestMapping("/ctop/byteDanceCreativeTemplate")
-public class ByteDanceCreativeTemplateController {
-    @Autowired
-    private IByteDanceCreativeTemplateService byteDanceCreativeTemplateService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param byteDanceCreativeTemplate
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "广告创意模板-分页列表查询")
-    @ApiOperation(value = "广告创意模板-分页列表查询", notes = "广告创意模板-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<ByteDanceCreativeTemplate>> queryPageList(ByteDanceCreativeTemplate byteDanceCreativeTemplate,
-                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                  HttpServletRequest req) {
-        Result<IPage<ByteDanceCreativeTemplate>> result = new Result<>();
-        QueryWrapper<ByteDanceCreativeTemplate> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCreativeTemplate, req.getParameterMap());
-        Page<ByteDanceCreativeTemplate> page = new Page<>(pageNo, pageSize);
-        IPage<ByteDanceCreativeTemplate> pageList = byteDanceCreativeTemplateService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param byteDanceCreativeTemplate
-     * @return
-     */
-    @AutoLog(value = "广告创意模板-添加")
-    @ApiOperation(value = "广告创意模板-添加", notes = "广告创意模板-添加")
-    @PostMapping(value = "/add")
-    public Result<ByteDanceCreativeTemplate> add(@RequestBody ByteDanceCreativeTemplate byteDanceCreativeTemplate) {
-        Result<ByteDanceCreativeTemplate> result = new Result<>();
-        try {
-            byteDanceCreativeTemplateService.save(byteDanceCreativeTemplate);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param byteDanceCreativeTemplate
-     * @return
-     */
-    @AutoLog(value = "广告创意模板-编辑")
-    @ApiOperation(value = "广告创意模板-编辑", notes = "广告创意模板-编辑")
-    @PutMapping(value = "/edit")
-    public Result<ByteDanceCreativeTemplate> edit(@RequestBody ByteDanceCreativeTemplate byteDanceCreativeTemplate) {
-        Result<ByteDanceCreativeTemplate> result = new Result<>();
-        ByteDanceCreativeTemplate byteDanceCreativeTemplateEntity = byteDanceCreativeTemplateService.getById(byteDanceCreativeTemplate.getId());
-        if (byteDanceCreativeTemplateEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = byteDanceCreativeTemplateService.updateById(byteDanceCreativeTemplate);
-            //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 {
-            byteDanceCreativeTemplateService.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<ByteDanceCreativeTemplate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<ByteDanceCreativeTemplate> result = new Result<>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.byteDanceCreativeTemplateService.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<ByteDanceCreativeTemplate> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<ByteDanceCreativeTemplate> result = new Result<>();
-        ByteDanceCreativeTemplate byteDanceCreativeTemplate = byteDanceCreativeTemplateService.getById(id);
-        if (byteDanceCreativeTemplate == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(byteDanceCreativeTemplate);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<ByteDanceCreativeTemplate> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                ByteDanceCreativeTemplate byteDanceCreativeTemplate = JSON.parseObject(deString, ByteDanceCreativeTemplate.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCreativeTemplate, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<ByteDanceCreativeTemplate> pageList = byteDanceCreativeTemplateService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "广告创意模板列表");
-        mv.addObject(NormalExcelConstants.CLASS, ByteDanceCreativeTemplate.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<ByteDanceCreativeTemplate> listByteDanceCreativeTemplates = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceCreativeTemplate.class, params);
-                byteDanceCreativeTemplateService.saveBatch(listByteDanceCreativeTemplates);
-                return Result.ok("文件导入成功!数据行数:" + listByteDanceCreativeTemplates.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 - 248
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCustomAudienceController.java

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.ByteDanceCustomAudience;
-import org.jeecg.modules.ctop.service.IByteDanceCustomAudienceService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 人群包信息
- * @Author: jeecg-boot
- * @Date: 2019-07-23
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "人群包信息")
-@RestController
-@RequestMapping("/ctop/byteDanceCustomAudience")
-public class ByteDanceCustomAudienceController {
-    @Autowired
-    private IByteDanceCustomAudienceService byteDanceCustomAudienceService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param byteDanceCustomAudience
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "人群包信息-分页列表查询")
-    @ApiOperation(value = "人群包信息-分页列表查询", notes = "人群包信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<ByteDanceCustomAudience>> queryPageList(ByteDanceCustomAudience byteDanceCustomAudience,
-                                                                @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                HttpServletRequest req) {
-        Result<IPage<ByteDanceCustomAudience>> result = new Result<IPage<ByteDanceCustomAudience>>();
-        QueryWrapper<ByteDanceCustomAudience> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCustomAudience, req.getParameterMap());
-        Page<ByteDanceCustomAudience> page = new Page<ByteDanceCustomAudience>(pageNo, pageSize);
-        IPage<ByteDanceCustomAudience> pageList = byteDanceCustomAudienceService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param byteDanceCustomAudience
-     * @return
-     */
-    @AutoLog(value = "人群包信息-添加")
-    @ApiOperation(value = "人群包信息-添加", notes = "人群包信息-添加")
-    @PostMapping(value = "/add")
-    public Result<ByteDanceCustomAudience> add(@RequestBody ByteDanceCustomAudience byteDanceCustomAudience) {
-        Result<ByteDanceCustomAudience> result = new Result<ByteDanceCustomAudience>();
-        try {
-            byteDanceCustomAudienceService.save(byteDanceCustomAudience);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param byteDanceCustomAudience
-     * @return
-     */
-    @AutoLog(value = "人群包信息-编辑")
-    @ApiOperation(value = "人群包信息-编辑", notes = "人群包信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<ByteDanceCustomAudience> edit(@RequestBody ByteDanceCustomAudience byteDanceCustomAudience) {
-        Result<ByteDanceCustomAudience> result = new Result<ByteDanceCustomAudience>();
-        ByteDanceCustomAudience byteDanceCustomAudienceEntity = byteDanceCustomAudienceService.getById(byteDanceCustomAudience.getId());
-        if (byteDanceCustomAudienceEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = byteDanceCustomAudienceService.updateById(byteDanceCustomAudience);
-            //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 {
-            byteDanceCustomAudienceService.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<ByteDanceCustomAudience> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<ByteDanceCustomAudience> result = new Result<ByteDanceCustomAudience>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.byteDanceCustomAudienceService.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<ByteDanceCustomAudience> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<ByteDanceCustomAudience> result = new Result<ByteDanceCustomAudience>();
-        ByteDanceCustomAudience byteDanceCustomAudience = byteDanceCustomAudienceService.getById(id);
-        if (byteDanceCustomAudience == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(byteDanceCustomAudience);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<ByteDanceCustomAudience> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                ByteDanceCustomAudience byteDanceCustomAudience = JSON.parseObject(deString, ByteDanceCustomAudience.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCustomAudience, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<ByteDanceCustomAudience> pageList = byteDanceCustomAudienceService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "人群包信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, ByteDanceCustomAudience.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<ByteDanceCustomAudience> listByteDanceCustomAudiences = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceCustomAudience.class, params);
-                byteDanceCustomAudienceService.saveBatch(listByteDanceCustomAudiences);
-                return Result.ok("文件导入成功!数据行数:" + listByteDanceCustomAudiences.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 - 248
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceImageInfoController.java

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.ByteDanceImageInfo;
-import org.jeecg.modules.ctop.service.IByteDanceImageInfoService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 头条图片素材信息
- * @Author: jeecg-boot
- * @Date: 2019-07-29
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "头条图片素材信息")
-@RestController
-@RequestMapping("/ctop/byteDanceImageInfo")
-public class ByteDanceImageInfoController {
-    @Autowired
-    private IByteDanceImageInfoService byteDanceImageInfoService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param byteDanceImageInfo
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "头条图片素材信息-分页列表查询")
-    @ApiOperation(value = "头条图片素材信息-分页列表查询", notes = "头条图片素材信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<ByteDanceImageInfo>> queryPageList(ByteDanceImageInfo byteDanceImageInfo,
-                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                           HttpServletRequest req) {
-        Result<IPage<ByteDanceImageInfo>> result = new Result<IPage<ByteDanceImageInfo>>();
-        QueryWrapper<ByteDanceImageInfo> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceImageInfo, req.getParameterMap());
-        Page<ByteDanceImageInfo> page = new Page<ByteDanceImageInfo>(pageNo, pageSize);
-        IPage<ByteDanceImageInfo> pageList = byteDanceImageInfoService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param byteDanceImageInfo
-     * @return
-     */
-    @AutoLog(value = "头条图片素材信息-添加")
-    @ApiOperation(value = "头条图片素材信息-添加", notes = "头条图片素材信息-添加")
-    @PostMapping(value = "/add")
-    public Result<ByteDanceImageInfo> add(@RequestBody ByteDanceImageInfo byteDanceImageInfo) {
-        Result<ByteDanceImageInfo> result = new Result<ByteDanceImageInfo>();
-        try {
-            byteDanceImageInfoService.save(byteDanceImageInfo);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param byteDanceImageInfo
-     * @return
-     */
-    @AutoLog(value = "头条图片素材信息-编辑")
-    @ApiOperation(value = "头条图片素材信息-编辑", notes = "头条图片素材信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<ByteDanceImageInfo> edit(@RequestBody ByteDanceImageInfo byteDanceImageInfo) {
-        Result<ByteDanceImageInfo> result = new Result<ByteDanceImageInfo>();
-        ByteDanceImageInfo byteDanceImageInfoEntity = byteDanceImageInfoService.getById(byteDanceImageInfo.getId());
-        if (byteDanceImageInfoEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = byteDanceImageInfoService.updateById(byteDanceImageInfo);
-            //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 {
-            byteDanceImageInfoService.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<ByteDanceImageInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<ByteDanceImageInfo> result = new Result<ByteDanceImageInfo>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.byteDanceImageInfoService.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<ByteDanceImageInfo> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<ByteDanceImageInfo> result = new Result<ByteDanceImageInfo>();
-        ByteDanceImageInfo byteDanceImageInfo = byteDanceImageInfoService.getById(id);
-        if (byteDanceImageInfo == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(byteDanceImageInfo);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<ByteDanceImageInfo> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                ByteDanceImageInfo byteDanceImageInfo = JSON.parseObject(deString, ByteDanceImageInfo.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(byteDanceImageInfo, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<ByteDanceImageInfo> pageList = byteDanceImageInfoService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "头条图片素材信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, ByteDanceImageInfo.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<ByteDanceImageInfo> listByteDanceImageInfos = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceImageInfo.class, params);
-                byteDanceImageInfoService.saveBatch(listByteDanceImageInfos);
-                return Result.ok("文件导入成功!数据行数:" + listByteDanceImageInfos.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("文件导入失败!");
-    }
-
-}

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

@@ -1,5 +1,13 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.utils.CtopAdConstant;
+import cn.com.ctop.common.module.entity.BindAccountLogin;
+import cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.service.IBindAccountLoginService;
+import cn.com.ctop.common.module.service.IFileInfoService;
+import cn.com.ctop.common.module.service.IUserAllocationService;
+import cn.com.ctop.toutiao.entity.*;
+import cn.com.ctop.toutiao.service.*;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,11 +16,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.constant.CtopAdConstant;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.ctop.entity.*;
-import org.jeecg.modules.ctop.service.*;
+import org.jeecg.modules.system.service.ISysCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -175,7 +181,6 @@ public class ByteDanceTemplateController {
      */
     @PostMapping("userorentation/insert")
     public Map<String, Object> userOrentationTemplateInsert(@RequestBody JSONObject template, HttpServletRequest req) {
-        System.out.println(template.toJSONString());
         return orientationTemplateService.insertTemplate(template);
     }
 
@@ -287,14 +292,16 @@ public class ByteDanceTemplateController {
         return planService.getAdConvertListByUrlIdAndBindId(bindAccountId, urlId);
     }
 
+    @Autowired
+    private ISysCategoryService sysCategoryService;
+
     /**
-     * @param req
      * @return
      * @功能:获取头条行业信息列表
      */
     @GetMapping(value = "/bytedance/industry/list")
-    public JSONArray campaignPageList(HttpServletRequest req) {
-        return fileInfoService.getByteDanceIndustryList(req);
+    public JSONArray campaignPageList() {
+        return sysCategoryService.getByteDanceIndustryList();
     }
 
     /**

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

@@ -1,252 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.ByteDanceUserOrientationTemplate;
-import org.jeecg.modules.ctop.service.IByteDanceUserOrientationTemplateService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 今日头条受众模板信息
- * @Author: jeecg-boot
- * @Date: 2019-07-23
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "今日头条受众模板信息")
-@RestController
-@RequestMapping("/ctop/byteDanceUserOrientationTemplate")
-public class ByteDanceUserOrientationTemplateController {
-    @Autowired
-    private IByteDanceUserOrientationTemplateService byteDanceUserOrientationTemplateService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param byteDanceUserOrientationTemplate
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "今日头条受众模板信息-分页列表查询")
-    @ApiOperation(value = "今日头条受众模板信息-分页列表查询", notes = "今日头条受众模板信息-分页列表查询")
-    @RequestMapping(value = "/list")
-    public Result<IPage<ByteDanceUserOrientationTemplate>> queryPageList(ByteDanceUserOrientationTemplate byteDanceUserOrientationTemplate,
-                                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                         @RequestParam(name = "pageSize", defaultValue = "100") Integer pageSize,
-                                                                         HttpServletRequest req) {
-        Result<IPage<ByteDanceUserOrientationTemplate>> result = new Result<>();
-        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        byteDanceUserOrientationTemplate.setUserId(user.getId());
-        QueryWrapper<ByteDanceUserOrientationTemplate> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceUserOrientationTemplate, req.getParameterMap());
-        Page<ByteDanceUserOrientationTemplate> page = new Page<ByteDanceUserOrientationTemplate>(pageNo, pageSize);
-        IPage<ByteDanceUserOrientationTemplate> pageList = byteDanceUserOrientationTemplateService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param byteDanceUserOrientationTemplate
-     * @return
-     */
-    @AutoLog(value = "今日头条受众模板信息-添加")
-    @ApiOperation(value = "今日头条受众模板信息-添加", notes = "今日头条受众模板信息-添加")
-    @PostMapping(value = "/add")
-    public Result<ByteDanceUserOrientationTemplate> add(@RequestBody ByteDanceUserOrientationTemplate byteDanceUserOrientationTemplate) {
-        Result<ByteDanceUserOrientationTemplate> result = new Result<ByteDanceUserOrientationTemplate>();
-        try {
-            byteDanceUserOrientationTemplateService.save(byteDanceUserOrientationTemplate);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param byteDanceUserOrientationTemplate
-     * @return
-     */
-    @AutoLog(value = "今日头条受众模板信息-编辑")
-    @ApiOperation(value = "今日头条受众模板信息-编辑", notes = "今日头条受众模板信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<ByteDanceUserOrientationTemplate> edit(@RequestBody ByteDanceUserOrientationTemplate byteDanceUserOrientationTemplate) {
-        Result<ByteDanceUserOrientationTemplate> result = new Result<ByteDanceUserOrientationTemplate>();
-        ByteDanceUserOrientationTemplate byteDanceUserOrientationTemplateEntity = byteDanceUserOrientationTemplateService.getById(byteDanceUserOrientationTemplate.getId());
-        if (byteDanceUserOrientationTemplateEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = byteDanceUserOrientationTemplateService.updateById(byteDanceUserOrientationTemplate);
-            //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 {
-            byteDanceUserOrientationTemplateService.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<ByteDanceUserOrientationTemplate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<ByteDanceUserOrientationTemplate> result = new Result<ByteDanceUserOrientationTemplate>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.byteDanceUserOrientationTemplateService.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<ByteDanceUserOrientationTemplate> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<ByteDanceUserOrientationTemplate> result = new Result<ByteDanceUserOrientationTemplate>();
-        ByteDanceUserOrientationTemplate byteDanceUserOrientationTemplate = byteDanceUserOrientationTemplateService.getById(id);
-        if (byteDanceUserOrientationTemplate == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(byteDanceUserOrientationTemplate);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<ByteDanceUserOrientationTemplate> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                ByteDanceUserOrientationTemplate byteDanceUserOrientationTemplate = JSON.parseObject(deString, ByteDanceUserOrientationTemplate.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(byteDanceUserOrientationTemplate, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<ByteDanceUserOrientationTemplate> pageList = byteDanceUserOrientationTemplateService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条受众模板信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, ByteDanceUserOrientationTemplate.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<ByteDanceUserOrientationTemplate> listByteDanceUserOrientationTemplates = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceUserOrientationTemplate.class, params);
-                byteDanceUserOrientationTemplateService.saveBatch(listByteDanceUserOrientationTemplates);
-                return Result.ok("文件导入成功!数据行数:" + listByteDanceUserOrientationTemplates.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 - 248
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceVideoInfoController.java

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.ByteDanceVideoInfo;
-import org.jeecg.modules.ctop.service.IByteDanceVideoInfoService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 今日头条视频素材信息
- * @Author: jeecg-boot
- * @Date: 2019-07-29
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "今日头条视频素材信息")
-@RestController
-@RequestMapping("/ctop/byteDanceVideoInfo")
-public class ByteDanceVideoInfoController {
-    @Autowired
-    private IByteDanceVideoInfoService byteDanceVideoInfoService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param byteDanceVideoInfo
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "今日头条视频素材信息-分页列表查询")
-    @ApiOperation(value = "今日头条视频素材信息-分页列表查询", notes = "今日头条视频素材信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<ByteDanceVideoInfo>> queryPageList(ByteDanceVideoInfo byteDanceVideoInfo,
-                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                           HttpServletRequest req) {
-        Result<IPage<ByteDanceVideoInfo>> result = new Result<IPage<ByteDanceVideoInfo>>();
-        QueryWrapper<ByteDanceVideoInfo> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceVideoInfo, req.getParameterMap());
-        Page<ByteDanceVideoInfo> page = new Page<ByteDanceVideoInfo>(pageNo, pageSize);
-        IPage<ByteDanceVideoInfo> pageList = byteDanceVideoInfoService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param byteDanceVideoInfo
-     * @return
-     */
-    @AutoLog(value = "今日头条视频素材信息-添加")
-    @ApiOperation(value = "今日头条视频素材信息-添加", notes = "今日头条视频素材信息-添加")
-    @PostMapping(value = "/add")
-    public Result<ByteDanceVideoInfo> add(@RequestBody ByteDanceVideoInfo byteDanceVideoInfo) {
-        Result<ByteDanceVideoInfo> result = new Result<ByteDanceVideoInfo>();
-        try {
-            byteDanceVideoInfoService.save(byteDanceVideoInfo);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param byteDanceVideoInfo
-     * @return
-     */
-    @AutoLog(value = "今日头条视频素材信息-编辑")
-    @ApiOperation(value = "今日头条视频素材信息-编辑", notes = "今日头条视频素材信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<ByteDanceVideoInfo> edit(@RequestBody ByteDanceVideoInfo byteDanceVideoInfo) {
-        Result<ByteDanceVideoInfo> result = new Result<ByteDanceVideoInfo>();
-        ByteDanceVideoInfo byteDanceVideoInfoEntity = byteDanceVideoInfoService.getById(byteDanceVideoInfo.getId());
-        if (byteDanceVideoInfoEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = byteDanceVideoInfoService.updateById(byteDanceVideoInfo);
-            //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 {
-            byteDanceVideoInfoService.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<ByteDanceVideoInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<ByteDanceVideoInfo> result = new Result<ByteDanceVideoInfo>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.byteDanceVideoInfoService.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<ByteDanceVideoInfo> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<ByteDanceVideoInfo> result = new Result<ByteDanceVideoInfo>();
-        ByteDanceVideoInfo byteDanceVideoInfo = byteDanceVideoInfoService.getById(id);
-        if (byteDanceVideoInfo == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(byteDanceVideoInfo);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<ByteDanceVideoInfo> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                ByteDanceVideoInfo byteDanceVideoInfo = JSON.parseObject(deString, ByteDanceVideoInfo.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(byteDanceVideoInfo, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<ByteDanceVideoInfo> pageList = byteDanceVideoInfoService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条视频素材信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, ByteDanceVideoInfo.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<ByteDanceVideoInfo> listByteDanceVideoInfos = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceVideoInfo.class, params);
-                byteDanceVideoInfoService.saveBatch(listByteDanceVideoInfos);
-                return Result.ok("文件导入成功!数据行数:" + listByteDanceVideoInfos.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 - 248
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceAdvertisePlanTemplateController.java

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.BytedanceAdvertisePlanTemplate;
-import org.jeecg.modules.ctop.service.IBytedanceAdvertisePlanTemplateService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 广告计划模板信息
- * @Author: jeecg-boot
- * @Date: 2019-07-28
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "广告计划模板信息")
-@RestController
-@RequestMapping("/ctop/bytedanceAdvertisePlanTemplate")
-public class BytedanceAdvertisePlanTemplateController {
-    @Autowired
-    private IBytedanceAdvertisePlanTemplateService bytedanceAdvertisePlanTemplateService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param bytedanceAdvertisePlanTemplate
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "广告计划模板信息-分页列表查询")
-    @ApiOperation(value = "广告计划模板信息-分页列表查询", notes = "广告计划模板信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<BytedanceAdvertisePlanTemplate>> queryPageList(BytedanceAdvertisePlanTemplate bytedanceAdvertisePlanTemplate,
-                                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                       HttpServletRequest req) {
-        Result<IPage<BytedanceAdvertisePlanTemplate>> result = new Result<IPage<BytedanceAdvertisePlanTemplate>>();
-        QueryWrapper<BytedanceAdvertisePlanTemplate> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceAdvertisePlanTemplate, req.getParameterMap());
-        Page<BytedanceAdvertisePlanTemplate> page = new Page<BytedanceAdvertisePlanTemplate>(pageNo, pageSize);
-        IPage<BytedanceAdvertisePlanTemplate> pageList = bytedanceAdvertisePlanTemplateService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param bytedanceAdvertisePlanTemplate
-     * @return
-     */
-    @AutoLog(value = "广告计划模板信息-添加")
-    @ApiOperation(value = "广告计划模板信息-添加", notes = "广告计划模板信息-添加")
-    @PostMapping(value = "/add")
-    public Result<BytedanceAdvertisePlanTemplate> add(@RequestBody BytedanceAdvertisePlanTemplate bytedanceAdvertisePlanTemplate) {
-        Result<BytedanceAdvertisePlanTemplate> result = new Result<BytedanceAdvertisePlanTemplate>();
-        try {
-            bytedanceAdvertisePlanTemplateService.save(bytedanceAdvertisePlanTemplate);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param bytedanceAdvertisePlanTemplate
-     * @return
-     */
-    @AutoLog(value = "广告计划模板信息-编辑")
-    @ApiOperation(value = "广告计划模板信息-编辑", notes = "广告计划模板信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<BytedanceAdvertisePlanTemplate> edit(@RequestBody BytedanceAdvertisePlanTemplate bytedanceAdvertisePlanTemplate) {
-        Result<BytedanceAdvertisePlanTemplate> result = new Result<BytedanceAdvertisePlanTemplate>();
-        BytedanceAdvertisePlanTemplate bytedanceAdvertisePlanTemplateEntity = bytedanceAdvertisePlanTemplateService.getById(bytedanceAdvertisePlanTemplate.getId());
-        if (bytedanceAdvertisePlanTemplateEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = bytedanceAdvertisePlanTemplateService.updateById(bytedanceAdvertisePlanTemplate);
-            //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 {
-            bytedanceAdvertisePlanTemplateService.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<BytedanceAdvertisePlanTemplate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<BytedanceAdvertisePlanTemplate> result = new Result<BytedanceAdvertisePlanTemplate>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.bytedanceAdvertisePlanTemplateService.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<BytedanceAdvertisePlanTemplate> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<BytedanceAdvertisePlanTemplate> result = new Result<BytedanceAdvertisePlanTemplate>();
-        BytedanceAdvertisePlanTemplate bytedanceAdvertisePlanTemplate = bytedanceAdvertisePlanTemplateService.getById(id);
-        if (bytedanceAdvertisePlanTemplate == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(bytedanceAdvertisePlanTemplate);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<BytedanceAdvertisePlanTemplate> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                BytedanceAdvertisePlanTemplate bytedanceAdvertisePlanTemplate = JSON.parseObject(deString, BytedanceAdvertisePlanTemplate.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(bytedanceAdvertisePlanTemplate, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<BytedanceAdvertisePlanTemplate> pageList = bytedanceAdvertisePlanTemplateService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "广告计划模板信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, BytedanceAdvertisePlanTemplate.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<BytedanceAdvertisePlanTemplate> listBytedanceAdvertisePlanTemplates = ExcelImportUtil.importExcel(file.getInputStream(), BytedanceAdvertisePlanTemplate.class, params);
-                bytedanceAdvertisePlanTemplateService.saveBatch(listBytedanceAdvertisePlanTemplates);
-                return Result.ok("文件导入成功!数据行数:" + listBytedanceAdvertisePlanTemplates.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 - 248
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceAdvertiserDailyReportController.java

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.BytedanceAdvertiserDailyReport;
-import org.jeecg.modules.ctop.service.IBytedanceAdvertiserDailyReportService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 广告主日报表
- * @Author: jeecg-boot
- * @Date: 2019-09-10
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "广告主日报表")
-@RestController
-@RequestMapping("/ctop/bytedanceAdvertiserDailyReport")
-public class BytedanceAdvertiserDailyReportController {
-    @Autowired
-    private IBytedanceAdvertiserDailyReportService bytedanceAdvertiserDailyReportService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param bytedanceAdvertiserDailyReport
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "广告主日报表-分页列表查询")
-    @ApiOperation(value = "广告主日报表-分页列表查询", notes = "广告主日报表-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<BytedanceAdvertiserDailyReport>> queryPageList(BytedanceAdvertiserDailyReport bytedanceAdvertiserDailyReport,
-                                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                       HttpServletRequest req) {
-        Result<IPage<BytedanceAdvertiserDailyReport>> result = new Result<IPage<BytedanceAdvertiserDailyReport>>();
-        QueryWrapper<BytedanceAdvertiserDailyReport> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceAdvertiserDailyReport, req.getParameterMap());
-        Page<BytedanceAdvertiserDailyReport> page = new Page<BytedanceAdvertiserDailyReport>(pageNo, pageSize);
-        IPage<BytedanceAdvertiserDailyReport> pageList = bytedanceAdvertiserDailyReportService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param bytedanceAdvertiserDailyReport
-     * @return
-     */
-    @AutoLog(value = "广告主日报表-添加")
-    @ApiOperation(value = "广告主日报表-添加", notes = "广告主日报表-添加")
-    @PostMapping(value = "/add")
-    public Result<BytedanceAdvertiserDailyReport> add(@RequestBody BytedanceAdvertiserDailyReport bytedanceAdvertiserDailyReport) {
-        Result<BytedanceAdvertiserDailyReport> result = new Result<BytedanceAdvertiserDailyReport>();
-        try {
-            bytedanceAdvertiserDailyReportService.save(bytedanceAdvertiserDailyReport);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param bytedanceAdvertiserDailyReport
-     * @return
-     */
-    @AutoLog(value = "广告主日报表-编辑")
-    @ApiOperation(value = "广告主日报表-编辑", notes = "广告主日报表-编辑")
-    @PutMapping(value = "/edit")
-    public Result<BytedanceAdvertiserDailyReport> edit(@RequestBody BytedanceAdvertiserDailyReport bytedanceAdvertiserDailyReport) {
-        Result<BytedanceAdvertiserDailyReport> result = new Result<BytedanceAdvertiserDailyReport>();
-        BytedanceAdvertiserDailyReport bytedanceAdvertiserDailyReportEntity = bytedanceAdvertiserDailyReportService.getById(bytedanceAdvertiserDailyReport.getId());
-        if (bytedanceAdvertiserDailyReportEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = bytedanceAdvertiserDailyReportService.updateById(bytedanceAdvertiserDailyReport);
-            //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 {
-            bytedanceAdvertiserDailyReportService.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<BytedanceAdvertiserDailyReport> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<BytedanceAdvertiserDailyReport> result = new Result<BytedanceAdvertiserDailyReport>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.bytedanceAdvertiserDailyReportService.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<BytedanceAdvertiserDailyReport> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<BytedanceAdvertiserDailyReport> result = new Result<BytedanceAdvertiserDailyReport>();
-        BytedanceAdvertiserDailyReport bytedanceAdvertiserDailyReport = bytedanceAdvertiserDailyReportService.getById(id);
-        if (bytedanceAdvertiserDailyReport == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(bytedanceAdvertiserDailyReport);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<BytedanceAdvertiserDailyReport> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                BytedanceAdvertiserDailyReport bytedanceAdvertiserDailyReport = JSON.parseObject(deString, BytedanceAdvertiserDailyReport.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(bytedanceAdvertiserDailyReport, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<BytedanceAdvertiserDailyReport> pageList = bytedanceAdvertiserDailyReportService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "广告主日报表列表");
-        mv.addObject(NormalExcelConstants.CLASS, BytedanceAdvertiserDailyReport.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<BytedanceAdvertiserDailyReport> listBytedanceAdvertiserDailyReports = ExcelImportUtil.importExcel(file.getInputStream(), BytedanceAdvertiserDailyReport.class, params);
-                bytedanceAdvertiserDailyReportService.saveBatch(listBytedanceAdvertiserDailyReports);
-                return Result.ok("文件导入成功!数据行数:" + listBytedanceAdvertiserDailyReports.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 - 248
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceAdvertiserHourlyReportController.java

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.BytedanceAdvertiserHourlyReport;
-import org.jeecg.modules.ctop.service.IBytedanceAdvertiserHourlyReportService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 广告主小时级别报表信息
- * @Author: jeecg-boot
- * @Date: 2019-09-10
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "广告主小时级别报表信息")
-@RestController
-@RequestMapping("/ctop/bytedanceAdvertiserHourlyReport")
-public class BytedanceAdvertiserHourlyReportController {
-    @Autowired
-    private IBytedanceAdvertiserHourlyReportService bytedanceAdvertiserHourlyReportService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param bytedanceAdvertiserHourlyReport
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "广告主小时级别报表信息-分页列表查询")
-    @ApiOperation(value = "广告主小时级别报表信息-分页列表查询", notes = "广告主小时级别报表信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<BytedanceAdvertiserHourlyReport>> queryPageList(BytedanceAdvertiserHourlyReport bytedanceAdvertiserHourlyReport,
-                                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                        HttpServletRequest req) {
-        Result<IPage<BytedanceAdvertiserHourlyReport>> result = new Result<IPage<BytedanceAdvertiserHourlyReport>>();
-        QueryWrapper<BytedanceAdvertiserHourlyReport> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceAdvertiserHourlyReport, req.getParameterMap());
-        Page<BytedanceAdvertiserHourlyReport> page = new Page<BytedanceAdvertiserHourlyReport>(pageNo, pageSize);
-        IPage<BytedanceAdvertiserHourlyReport> pageList = bytedanceAdvertiserHourlyReportService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param bytedanceAdvertiserHourlyReport
-     * @return
-     */
-    @AutoLog(value = "广告主小时级别报表信息-添加")
-    @ApiOperation(value = "广告主小时级别报表信息-添加", notes = "广告主小时级别报表信息-添加")
-    @PostMapping(value = "/add")
-    public Result<BytedanceAdvertiserHourlyReport> add(@RequestBody BytedanceAdvertiserHourlyReport bytedanceAdvertiserHourlyReport) {
-        Result<BytedanceAdvertiserHourlyReport> result = new Result<BytedanceAdvertiserHourlyReport>();
-        try {
-            bytedanceAdvertiserHourlyReportService.save(bytedanceAdvertiserHourlyReport);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param bytedanceAdvertiserHourlyReport
-     * @return
-     */
-    @AutoLog(value = "广告主小时级别报表信息-编辑")
-    @ApiOperation(value = "广告主小时级别报表信息-编辑", notes = "广告主小时级别报表信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<BytedanceAdvertiserHourlyReport> edit(@RequestBody BytedanceAdvertiserHourlyReport bytedanceAdvertiserHourlyReport) {
-        Result<BytedanceAdvertiserHourlyReport> result = new Result<BytedanceAdvertiserHourlyReport>();
-        BytedanceAdvertiserHourlyReport bytedanceAdvertiserHourlyReportEntity = bytedanceAdvertiserHourlyReportService.getById(bytedanceAdvertiserHourlyReport.getId());
-        if (bytedanceAdvertiserHourlyReportEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = bytedanceAdvertiserHourlyReportService.updateById(bytedanceAdvertiserHourlyReport);
-            //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 {
-            bytedanceAdvertiserHourlyReportService.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<BytedanceAdvertiserHourlyReport> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<BytedanceAdvertiserHourlyReport> result = new Result<BytedanceAdvertiserHourlyReport>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.bytedanceAdvertiserHourlyReportService.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<BytedanceAdvertiserHourlyReport> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<BytedanceAdvertiserHourlyReport> result = new Result<BytedanceAdvertiserHourlyReport>();
-        BytedanceAdvertiserHourlyReport bytedanceAdvertiserHourlyReport = bytedanceAdvertiserHourlyReportService.getById(id);
-        if (bytedanceAdvertiserHourlyReport == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(bytedanceAdvertiserHourlyReport);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<BytedanceAdvertiserHourlyReport> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                BytedanceAdvertiserHourlyReport bytedanceAdvertiserHourlyReport = JSON.parseObject(deString, BytedanceAdvertiserHourlyReport.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(bytedanceAdvertiserHourlyReport, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<BytedanceAdvertiserHourlyReport> pageList = bytedanceAdvertiserHourlyReportService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "广告主小时级别报表信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, BytedanceAdvertiserHourlyReport.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<BytedanceAdvertiserHourlyReport> listBytedanceAdvertiserHourlyReports = ExcelImportUtil.importExcel(file.getInputStream(), BytedanceAdvertiserHourlyReport.class, params);
-                bytedanceAdvertiserHourlyReportService.saveBatch(listBytedanceAdvertiserHourlyReports);
-                return Result.ok("文件导入成功!数据行数:" + listBytedanceAdvertiserHourlyReports.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 - 280
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceAreaInfoController.java

@@ -1,280 +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.BytedanceAreaInfo;
-import org.jeecg.modules.ctop.service.IBytedanceAreaInfoService;
-
-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;
-
-/**
- * 省市县信息
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-09-17
- */
-@Slf4j
-@Api(tags = "省市县信息")
-@RestController
-@RequestMapping("/ctop/bytedanceAreaInfo")
-public class BytedanceAreaInfoController {
-    @Autowired
-    private IBytedanceAreaInfoService bytedanceAreaInfoService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param code
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "省市县信息-分页列表查询")
-    @ApiOperation(value = "省市县信息-分页列表查询", notes = "省市县信息-分页列表查询")
-    @GetMapping(value = "/listbycode")
-    public Result<IPage<BytedanceAreaInfo>> queryPageListByCode(@RequestParam(name = "parentCode", defaultValue = "0") String code,
-                                                                @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                @RequestParam(name = "pageSize", defaultValue = "100") Integer pageSize,
-                                                                HttpServletRequest req) {
-        Result<IPage<BytedanceAreaInfo>> result = new Result<>();
-        BytedanceAreaInfo areaInfo = new BytedanceAreaInfo();
-        areaInfo.setParentCode(code);
-        QueryWrapper<BytedanceAreaInfo> queryWrapper = QueryGenerator.initQueryWrapper(areaInfo, req.getParameterMap());
-        Page<BytedanceAreaInfo> page = new Page<>(pageNo, pageSize);
-        IPage<BytedanceAreaInfo> pageList = bytedanceAreaInfoService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 分页列表查询
-     *
-     * @param bytedanceAreaInfo
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "省市县信息-分页列表查询")
-    @ApiOperation(value = "省市县信息-分页列表查询", notes = "省市县信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<BytedanceAreaInfo>> queryPageList(BytedanceAreaInfo bytedanceAreaInfo,
-                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                          HttpServletRequest req) {
-        Result<IPage<BytedanceAreaInfo>> result = new Result<IPage<BytedanceAreaInfo>>();
-        QueryWrapper<BytedanceAreaInfo> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceAreaInfo, req.getParameterMap());
-        Page<BytedanceAreaInfo> page = new Page<BytedanceAreaInfo>(pageNo, pageSize);
-        IPage<BytedanceAreaInfo> pageList = bytedanceAreaInfoService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param bytedanceAreaInfo
-     * @return
-     */
-    @AutoLog(value = "省市县信息-添加")
-    @ApiOperation(value = "省市县信息-添加", notes = "省市县信息-添加")
-    @PostMapping(value = "/add")
-    public Result<BytedanceAreaInfo> add(@RequestBody BytedanceAreaInfo bytedanceAreaInfo) {
-        Result<BytedanceAreaInfo> result = new Result<BytedanceAreaInfo>();
-        try {
-            bytedanceAreaInfoService.save(bytedanceAreaInfo);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param bytedanceAreaInfo
-     * @return
-     */
-    @AutoLog(value = "省市县信息-编辑")
-    @ApiOperation(value = "省市县信息-编辑", notes = "省市县信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<BytedanceAreaInfo> edit(@RequestBody BytedanceAreaInfo bytedanceAreaInfo) {
-        Result<BytedanceAreaInfo> result = new Result<BytedanceAreaInfo>();
-        BytedanceAreaInfo bytedanceAreaInfoEntity = bytedanceAreaInfoService.getById(bytedanceAreaInfo.getId());
-        if (bytedanceAreaInfoEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = bytedanceAreaInfoService.updateById(bytedanceAreaInfo);
-            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 {
-            bytedanceAreaInfoService.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<BytedanceAreaInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<BytedanceAreaInfo> result = new Result<BytedanceAreaInfo>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.bytedanceAreaInfoService.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<BytedanceAreaInfo> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<BytedanceAreaInfo> result = new Result<BytedanceAreaInfo>();
-        BytedanceAreaInfo bytedanceAreaInfo = bytedanceAreaInfoService.getById(id);
-        if (bytedanceAreaInfo == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(bytedanceAreaInfo);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<BytedanceAreaInfo> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                BytedanceAreaInfo bytedanceAreaInfo = JSON.parseObject(deString, BytedanceAreaInfo.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(bytedanceAreaInfo, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<BytedanceAreaInfo> pageList = bytedanceAreaInfoService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "省市县信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, BytedanceAreaInfo.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<BytedanceAreaInfo> listBytedanceAreaInfos = ExcelImportUtil.importExcel(file.getInputStream(), BytedanceAreaInfo.class, params);
-                bytedanceAreaInfoService.saveBatch(listBytedanceAreaInfos);
-                return Result.ok("文件导入成功!数据行数:" + listBytedanceAreaInfos.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 - 248
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceCampaignDailyReportController.java

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.BytedanceCampaignDailyReport;
-import org.jeecg.modules.ctop.service.IBytedanceCampaignDailyReportService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 广告组日报表信息
- * @Author: jeecg-boot
- * @Date: 2019-09-11
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "广告组日报表信息")
-@RestController
-@RequestMapping("/ctop/bytedanceCampaignDailyReport")
-public class BytedanceCampaignDailyReportController {
-    @Autowired
-    private IBytedanceCampaignDailyReportService bytedanceCampaignDailyReportService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param bytedanceCampaignDailyReport
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "广告组日报表信息-分页列表查询")
-    @ApiOperation(value = "广告组日报表信息-分页列表查询", notes = "广告组日报表信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<BytedanceCampaignDailyReport>> queryPageList(BytedanceCampaignDailyReport bytedanceCampaignDailyReport,
-                                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                     HttpServletRequest req) {
-        Result<IPage<BytedanceCampaignDailyReport>> result = new Result<IPage<BytedanceCampaignDailyReport>>();
-        QueryWrapper<BytedanceCampaignDailyReport> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceCampaignDailyReport, req.getParameterMap());
-        Page<BytedanceCampaignDailyReport> page = new Page<BytedanceCampaignDailyReport>(pageNo, pageSize);
-        IPage<BytedanceCampaignDailyReport> pageList = bytedanceCampaignDailyReportService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param bytedanceCampaignDailyReport
-     * @return
-     */
-    @AutoLog(value = "广告组日报表信息-添加")
-    @ApiOperation(value = "广告组日报表信息-添加", notes = "广告组日报表信息-添加")
-    @PostMapping(value = "/add")
-    public Result<BytedanceCampaignDailyReport> add(@RequestBody BytedanceCampaignDailyReport bytedanceCampaignDailyReport) {
-        Result<BytedanceCampaignDailyReport> result = new Result<BytedanceCampaignDailyReport>();
-        try {
-            bytedanceCampaignDailyReportService.save(bytedanceCampaignDailyReport);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param bytedanceCampaignDailyReport
-     * @return
-     */
-    @AutoLog(value = "广告组日报表信息-编辑")
-    @ApiOperation(value = "广告组日报表信息-编辑", notes = "广告组日报表信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<BytedanceCampaignDailyReport> edit(@RequestBody BytedanceCampaignDailyReport bytedanceCampaignDailyReport) {
-        Result<BytedanceCampaignDailyReport> result = new Result<BytedanceCampaignDailyReport>();
-        BytedanceCampaignDailyReport bytedanceCampaignDailyReportEntity = bytedanceCampaignDailyReportService.getById(bytedanceCampaignDailyReport.getId());
-        if (bytedanceCampaignDailyReportEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = bytedanceCampaignDailyReportService.updateById(bytedanceCampaignDailyReport);
-            //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 {
-            bytedanceCampaignDailyReportService.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<BytedanceCampaignDailyReport> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<BytedanceCampaignDailyReport> result = new Result<BytedanceCampaignDailyReport>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.bytedanceCampaignDailyReportService.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<BytedanceCampaignDailyReport> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<BytedanceCampaignDailyReport> result = new Result<BytedanceCampaignDailyReport>();
-        BytedanceCampaignDailyReport bytedanceCampaignDailyReport = bytedanceCampaignDailyReportService.getById(id);
-        if (bytedanceCampaignDailyReport == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(bytedanceCampaignDailyReport);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<BytedanceCampaignDailyReport> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                BytedanceCampaignDailyReport bytedanceCampaignDailyReport = JSON.parseObject(deString, BytedanceCampaignDailyReport.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(bytedanceCampaignDailyReport, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<BytedanceCampaignDailyReport> pageList = bytedanceCampaignDailyReportService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "广告组日报表信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, BytedanceCampaignDailyReport.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<BytedanceCampaignDailyReport> listBytedanceCampaignDailyReports = ExcelImportUtil.importExcel(file.getInputStream(), BytedanceCampaignDailyReport.class, params);
-                bytedanceCampaignDailyReportService.saveBatch(listBytedanceCampaignDailyReports);
-                return Result.ok("文件导入成功!数据行数:" + listBytedanceCampaignDailyReports.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 - 248
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceCampaignHourlyReportController.java

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.BytedanceCampaignHourlyReport;
-import org.jeecg.modules.ctop.service.IBytedanceCampaignHourlyReportService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 广告组时报表信息
- * @Author: jeecg-boot
- * @Date: 2019-09-11
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "广告组时报表信息")
-@RestController
-@RequestMapping("/ctop/bytedanceCampaignHourlyReport")
-public class BytedanceCampaignHourlyReportController {
-    @Autowired
-    private IBytedanceCampaignHourlyReportService bytedanceCampaignHourlyReportService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param bytedanceCampaignHourlyReport
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "广告组时报表信息-分页列表查询")
-    @ApiOperation(value = "广告组时报表信息-分页列表查询", notes = "广告组时报表信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<BytedanceCampaignHourlyReport>> queryPageList(BytedanceCampaignHourlyReport bytedanceCampaignHourlyReport,
-                                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                      HttpServletRequest req) {
-        Result<IPage<BytedanceCampaignHourlyReport>> result = new Result<IPage<BytedanceCampaignHourlyReport>>();
-        QueryWrapper<BytedanceCampaignHourlyReport> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceCampaignHourlyReport, req.getParameterMap());
-        Page<BytedanceCampaignHourlyReport> page = new Page<BytedanceCampaignHourlyReport>(pageNo, pageSize);
-        IPage<BytedanceCampaignHourlyReport> pageList = bytedanceCampaignHourlyReportService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param bytedanceCampaignHourlyReport
-     * @return
-     */
-    @AutoLog(value = "广告组时报表信息-添加")
-    @ApiOperation(value = "广告组时报表信息-添加", notes = "广告组时报表信息-添加")
-    @PostMapping(value = "/add")
-    public Result<BytedanceCampaignHourlyReport> add(@RequestBody BytedanceCampaignHourlyReport bytedanceCampaignHourlyReport) {
-        Result<BytedanceCampaignHourlyReport> result = new Result<BytedanceCampaignHourlyReport>();
-        try {
-            bytedanceCampaignHourlyReportService.save(bytedanceCampaignHourlyReport);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param bytedanceCampaignHourlyReport
-     * @return
-     */
-    @AutoLog(value = "广告组时报表信息-编辑")
-    @ApiOperation(value = "广告组时报表信息-编辑", notes = "广告组时报表信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<BytedanceCampaignHourlyReport> edit(@RequestBody BytedanceCampaignHourlyReport bytedanceCampaignHourlyReport) {
-        Result<BytedanceCampaignHourlyReport> result = new Result<BytedanceCampaignHourlyReport>();
-        BytedanceCampaignHourlyReport bytedanceCampaignHourlyReportEntity = bytedanceCampaignHourlyReportService.getById(bytedanceCampaignHourlyReport.getId());
-        if (bytedanceCampaignHourlyReportEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = bytedanceCampaignHourlyReportService.updateById(bytedanceCampaignHourlyReport);
-            //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 {
-            bytedanceCampaignHourlyReportService.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<BytedanceCampaignHourlyReport> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<BytedanceCampaignHourlyReport> result = new Result<BytedanceCampaignHourlyReport>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.bytedanceCampaignHourlyReportService.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<BytedanceCampaignHourlyReport> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<BytedanceCampaignHourlyReport> result = new Result<BytedanceCampaignHourlyReport>();
-        BytedanceCampaignHourlyReport bytedanceCampaignHourlyReport = bytedanceCampaignHourlyReportService.getById(id);
-        if (bytedanceCampaignHourlyReport == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(bytedanceCampaignHourlyReport);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<BytedanceCampaignHourlyReport> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                BytedanceCampaignHourlyReport bytedanceCampaignHourlyReport = JSON.parseObject(deString, BytedanceCampaignHourlyReport.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(bytedanceCampaignHourlyReport, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<BytedanceCampaignHourlyReport> pageList = bytedanceCampaignHourlyReportService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "广告组时报表信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, BytedanceCampaignHourlyReport.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<BytedanceCampaignHourlyReport> listBytedanceCampaignHourlyReports = ExcelImportUtil.importExcel(file.getInputStream(), BytedanceCampaignHourlyReport.class, params);
-                bytedanceCampaignHourlyReportService.saveBatch(listBytedanceCampaignHourlyReports);
-                return Result.ok("文件导入成功!数据行数:" + listBytedanceCampaignHourlyReports.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 - 248
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceCreativeDailyReportController.java

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.BytedanceCreativeDailyReport;
-import org.jeecg.modules.ctop.service.IBytedanceCreativeDailyReportService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 广告创意日报表信息
- * @Author: jeecg-boot
- * @Date: 2019-09-11
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "广告创意日报表信息")
-@RestController
-@RequestMapping("/ctop/bytedanceCreativeDailyReport")
-public class BytedanceCreativeDailyReportController {
-    @Autowired
-    private IBytedanceCreativeDailyReportService bytedanceCreativeDailyReportService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param bytedanceCreativeDailyReport
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "广告创意日报表信息-分页列表查询")
-    @ApiOperation(value = "广告创意日报表信息-分页列表查询", notes = "广告创意日报表信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<BytedanceCreativeDailyReport>> queryPageList(BytedanceCreativeDailyReport bytedanceCreativeDailyReport,
-                                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                     HttpServletRequest req) {
-        Result<IPage<BytedanceCreativeDailyReport>> result = new Result<IPage<BytedanceCreativeDailyReport>>();
-        QueryWrapper<BytedanceCreativeDailyReport> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceCreativeDailyReport, req.getParameterMap());
-        Page<BytedanceCreativeDailyReport> page = new Page<BytedanceCreativeDailyReport>(pageNo, pageSize);
-        IPage<BytedanceCreativeDailyReport> pageList = bytedanceCreativeDailyReportService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param bytedanceCreativeDailyReport
-     * @return
-     */
-    @AutoLog(value = "广告创意日报表信息-添加")
-    @ApiOperation(value = "广告创意日报表信息-添加", notes = "广告创意日报表信息-添加")
-    @PostMapping(value = "/add")
-    public Result<BytedanceCreativeDailyReport> add(@RequestBody BytedanceCreativeDailyReport bytedanceCreativeDailyReport) {
-        Result<BytedanceCreativeDailyReport> result = new Result<BytedanceCreativeDailyReport>();
-        try {
-            bytedanceCreativeDailyReportService.save(bytedanceCreativeDailyReport);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param bytedanceCreativeDailyReport
-     * @return
-     */
-    @AutoLog(value = "广告创意日报表信息-编辑")
-    @ApiOperation(value = "广告创意日报表信息-编辑", notes = "广告创意日报表信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<BytedanceCreativeDailyReport> edit(@RequestBody BytedanceCreativeDailyReport bytedanceCreativeDailyReport) {
-        Result<BytedanceCreativeDailyReport> result = new Result<BytedanceCreativeDailyReport>();
-        BytedanceCreativeDailyReport bytedanceCreativeDailyReportEntity = bytedanceCreativeDailyReportService.getById(bytedanceCreativeDailyReport.getId());
-        if (bytedanceCreativeDailyReportEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = bytedanceCreativeDailyReportService.updateById(bytedanceCreativeDailyReport);
-            //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 {
-            bytedanceCreativeDailyReportService.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<BytedanceCreativeDailyReport> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<BytedanceCreativeDailyReport> result = new Result<BytedanceCreativeDailyReport>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.bytedanceCreativeDailyReportService.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<BytedanceCreativeDailyReport> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<BytedanceCreativeDailyReport> result = new Result<BytedanceCreativeDailyReport>();
-        BytedanceCreativeDailyReport bytedanceCreativeDailyReport = bytedanceCreativeDailyReportService.getById(id);
-        if (bytedanceCreativeDailyReport == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(bytedanceCreativeDailyReport);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<BytedanceCreativeDailyReport> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                BytedanceCreativeDailyReport bytedanceCreativeDailyReport = JSON.parseObject(deString, BytedanceCreativeDailyReport.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(bytedanceCreativeDailyReport, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<BytedanceCreativeDailyReport> pageList = bytedanceCreativeDailyReportService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "广告创意日报表信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, BytedanceCreativeDailyReport.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<BytedanceCreativeDailyReport> listBytedanceCreativeDailyReports = ExcelImportUtil.importExcel(file.getInputStream(), BytedanceCreativeDailyReport.class, params);
-                bytedanceCreativeDailyReportService.saveBatch(listBytedanceCreativeDailyReports);
-                return Result.ok("文件导入成功!数据行数:" + listBytedanceCreativeDailyReports.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 - 248
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceCreativeHourlyReportController.java

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.BytedanceCreativeHourlyReport;
-import org.jeecg.modules.ctop.service.IBytedanceCreativeHourlyReportService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 广告创意日报表信息
- * @Author: jeecg-boot
- * @Date: 2019-09-11
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "广告创意日报表信息")
-@RestController
-@RequestMapping("/ctop/bytedanceCreativeHourlyReport")
-public class BytedanceCreativeHourlyReportController {
-    @Autowired
-    private IBytedanceCreativeHourlyReportService bytedanceCreativeHourlyReportService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param bytedanceCreativeHourlyReport
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "广告创意日报表信息-分页列表查询")
-    @ApiOperation(value = "广告创意日报表信息-分页列表查询", notes = "广告创意日报表信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<BytedanceCreativeHourlyReport>> queryPageList(BytedanceCreativeHourlyReport bytedanceCreativeHourlyReport,
-                                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                      HttpServletRequest req) {
-        Result<IPage<BytedanceCreativeHourlyReport>> result = new Result<IPage<BytedanceCreativeHourlyReport>>();
-        QueryWrapper<BytedanceCreativeHourlyReport> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceCreativeHourlyReport, req.getParameterMap());
-        Page<BytedanceCreativeHourlyReport> page = new Page<BytedanceCreativeHourlyReport>(pageNo, pageSize);
-        IPage<BytedanceCreativeHourlyReport> pageList = bytedanceCreativeHourlyReportService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param bytedanceCreativeHourlyReport
-     * @return
-     */
-    @AutoLog(value = "广告创意日报表信息-添加")
-    @ApiOperation(value = "广告创意日报表信息-添加", notes = "广告创意日报表信息-添加")
-    @PostMapping(value = "/add")
-    public Result<BytedanceCreativeHourlyReport> add(@RequestBody BytedanceCreativeHourlyReport bytedanceCreativeHourlyReport) {
-        Result<BytedanceCreativeHourlyReport> result = new Result<BytedanceCreativeHourlyReport>();
-        try {
-            bytedanceCreativeHourlyReportService.save(bytedanceCreativeHourlyReport);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param bytedanceCreativeHourlyReport
-     * @return
-     */
-    @AutoLog(value = "广告创意日报表信息-编辑")
-    @ApiOperation(value = "广告创意日报表信息-编辑", notes = "广告创意日报表信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<BytedanceCreativeHourlyReport> edit(@RequestBody BytedanceCreativeHourlyReport bytedanceCreativeHourlyReport) {
-        Result<BytedanceCreativeHourlyReport> result = new Result<BytedanceCreativeHourlyReport>();
-        BytedanceCreativeHourlyReport bytedanceCreativeHourlyReportEntity = bytedanceCreativeHourlyReportService.getById(bytedanceCreativeHourlyReport.getId());
-        if (bytedanceCreativeHourlyReportEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = bytedanceCreativeHourlyReportService.updateById(bytedanceCreativeHourlyReport);
-            //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 {
-            bytedanceCreativeHourlyReportService.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<BytedanceCreativeHourlyReport> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<BytedanceCreativeHourlyReport> result = new Result<BytedanceCreativeHourlyReport>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.bytedanceCreativeHourlyReportService.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<BytedanceCreativeHourlyReport> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<BytedanceCreativeHourlyReport> result = new Result<BytedanceCreativeHourlyReport>();
-        BytedanceCreativeHourlyReport bytedanceCreativeHourlyReport = bytedanceCreativeHourlyReportService.getById(id);
-        if (bytedanceCreativeHourlyReport == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(bytedanceCreativeHourlyReport);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<BytedanceCreativeHourlyReport> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                BytedanceCreativeHourlyReport bytedanceCreativeHourlyReport = JSON.parseObject(deString, BytedanceCreativeHourlyReport.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(bytedanceCreativeHourlyReport, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<BytedanceCreativeHourlyReport> pageList = bytedanceCreativeHourlyReportService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "广告创意日报表信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, BytedanceCreativeHourlyReport.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<BytedanceCreativeHourlyReport> listBytedanceCreativeHourlyReports = ExcelImportUtil.importExcel(file.getInputStream(), BytedanceCreativeHourlyReport.class, params);
-                bytedanceCreativeHourlyReportService.saveBatch(listBytedanceCreativeHourlyReports);
-                return Result.ok("文件导入成功!数据行数:" + listBytedanceCreativeHourlyReports.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 - 252
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceDeliveryTargetTemplateController.java

@@ -1,252 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.BytedanceDeliveryTargetTemplate;
-import org.jeecg.modules.ctop.service.IBytedanceDeliveryTargetTemplateService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 投放目标模板信息
- * @Author: jeecg-boot
- * @Date: 2019-07-23
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "投放目标模板信息")
-@RestController
-@RequestMapping("/ctop/bytedanceDeliveryTargetTemplate")
-public class BytedanceDeliveryTargetTemplateController {
-    @Autowired
-    private IBytedanceDeliveryTargetTemplateService bytedanceDeliveryTargetTemplateService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param bytedanceDeliveryTargetTemplate
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "投放目标模板信息-分页列表查询")
-    @ApiOperation(value = "投放目标模板信息-分页列表查询", notes = "投放目标模板信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<BytedanceDeliveryTargetTemplate>> queryPageList(BytedanceDeliveryTargetTemplate bytedanceDeliveryTargetTemplate,
-                                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                        HttpServletRequest req) {
-        Result<IPage<BytedanceDeliveryTargetTemplate>> result = new Result<IPage<BytedanceDeliveryTargetTemplate>>();
-        QueryWrapper<BytedanceDeliveryTargetTemplate> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceDeliveryTargetTemplate, req.getParameterMap());
-        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.eq("advertiser_id", user.getId());
-        Page<BytedanceDeliveryTargetTemplate> page = new Page<BytedanceDeliveryTargetTemplate>(pageNo, pageSize);
-        IPage<BytedanceDeliveryTargetTemplate> pageList = bytedanceDeliveryTargetTemplateService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param bytedanceDeliveryTargetTemplate
-     * @return
-     */
-    @AutoLog(value = "投放目标模板信息-添加")
-    @ApiOperation(value = "投放目标模板信息-添加", notes = "投放目标模板信息-添加")
-    @PostMapping(value = "/add")
-    public Result<BytedanceDeliveryTargetTemplate> add(@RequestBody BytedanceDeliveryTargetTemplate bytedanceDeliveryTargetTemplate) {
-        Result<BytedanceDeliveryTargetTemplate> result = new Result<BytedanceDeliveryTargetTemplate>();
-        try {
-            bytedanceDeliveryTargetTemplateService.save(bytedanceDeliveryTargetTemplate);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param bytedanceDeliveryTargetTemplate
-     * @return
-     */
-    @AutoLog(value = "投放目标模板信息-编辑")
-    @ApiOperation(value = "投放目标模板信息-编辑", notes = "投放目标模板信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<BytedanceDeliveryTargetTemplate> edit(@RequestBody BytedanceDeliveryTargetTemplate bytedanceDeliveryTargetTemplate) {
-        Result<BytedanceDeliveryTargetTemplate> result = new Result<BytedanceDeliveryTargetTemplate>();
-        BytedanceDeliveryTargetTemplate bytedanceDeliveryTargetTemplateEntity = bytedanceDeliveryTargetTemplateService.getById(bytedanceDeliveryTargetTemplate.getId());
-        if (bytedanceDeliveryTargetTemplateEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = bytedanceDeliveryTargetTemplateService.updateById(bytedanceDeliveryTargetTemplate);
-            //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 {
-            bytedanceDeliveryTargetTemplateService.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<BytedanceDeliveryTargetTemplate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<BytedanceDeliveryTargetTemplate> result = new Result<BytedanceDeliveryTargetTemplate>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.bytedanceDeliveryTargetTemplateService.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<BytedanceDeliveryTargetTemplate> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<BytedanceDeliveryTargetTemplate> result = new Result<BytedanceDeliveryTargetTemplate>();
-        BytedanceDeliveryTargetTemplate bytedanceDeliveryTargetTemplate = bytedanceDeliveryTargetTemplateService.getById(id);
-        if (bytedanceDeliveryTargetTemplate == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(bytedanceDeliveryTargetTemplate);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<BytedanceDeliveryTargetTemplate> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                BytedanceDeliveryTargetTemplate bytedanceDeliveryTargetTemplate = JSON.parseObject(deString, BytedanceDeliveryTargetTemplate.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(bytedanceDeliveryTargetTemplate, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<BytedanceDeliveryTargetTemplate> pageList = bytedanceDeliveryTargetTemplateService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "投放目标模板信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, BytedanceDeliveryTargetTemplate.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<BytedanceDeliveryTargetTemplate> listBytedanceDeliveryTargetTemplates = ExcelImportUtil.importExcel(file.getInputStream(), BytedanceDeliveryTargetTemplate.class, params);
-                bytedanceDeliveryTargetTemplateService.saveBatch(listBytedanceDeliveryTargetTemplates);
-                return Result.ok("文件导入成功!数据行数:" + listBytedanceDeliveryTargetTemplates.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 - 269
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceInterestCategoryController.java

@@ -1,269 +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.BytedanceInterestCategory;
-import org.jeecg.modules.ctop.service.IBytedanceInterestCategoryService;
-
-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;
-
-/**
- * 兴趣分类信息
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-09-18
- */
-@Slf4j
-@Api(tags = "兴趣分类信息")
-@RestController
-@RequestMapping("/ctop/bytedanceInterestCategory")
-public class BytedanceInterestCategoryController {
-    @Autowired
-    private IBytedanceInterestCategoryService bytedanceInterestCategoryService;
-
-    @GetMapping(value = "/listbycode")
-    public Result<IPage<BytedanceInterestCategory>> queryPageListByCode(@RequestParam(name = "parentCode", defaultValue = "0") String code,
-                                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                        HttpServletRequest req) {
-        Result<IPage<BytedanceInterestCategory>> result = new Result<>();
-        BytedanceInterestCategory category = new BytedanceInterestCategory();
-        QueryWrapper<BytedanceInterestCategory> queryWrapper = QueryGenerator.initQueryWrapper(category, req.getParameterMap());
-        queryWrapper.eq("parent_code", code);
-        Page<BytedanceInterestCategory> page = new Page<>(pageNo, pageSize);
-        IPage<BytedanceInterestCategory> pageList = bytedanceInterestCategoryService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 分页列表查询
-     *
-     * @param bytedanceInterestCategory
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "兴趣分类信息-分页列表查询")
-    @ApiOperation(value = "兴趣分类信息-分页列表查询", notes = "兴趣分类信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<BytedanceInterestCategory>> queryPageList(BytedanceInterestCategory bytedanceInterestCategory,
-                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                  HttpServletRequest req) {
-        Result<IPage<BytedanceInterestCategory>> result = new Result<IPage<BytedanceInterestCategory>>();
-        QueryWrapper<BytedanceInterestCategory> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceInterestCategory, req.getParameterMap());
-        Page<BytedanceInterestCategory> page = new Page<BytedanceInterestCategory>(pageNo, pageSize);
-        IPage<BytedanceInterestCategory> pageList = bytedanceInterestCategoryService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param bytedanceInterestCategory
-     * @return
-     */
-    @AutoLog(value = "兴趣分类信息-添加")
-    @ApiOperation(value = "兴趣分类信息-添加", notes = "兴趣分类信息-添加")
-    @PostMapping(value = "/add")
-    public Result<BytedanceInterestCategory> add(@RequestBody BytedanceInterestCategory bytedanceInterestCategory) {
-        Result<BytedanceInterestCategory> result = new Result<BytedanceInterestCategory>();
-        try {
-            bytedanceInterestCategoryService.save(bytedanceInterestCategory);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param bytedanceInterestCategory
-     * @return
-     */
-    @AutoLog(value = "兴趣分类信息-编辑")
-    @ApiOperation(value = "兴趣分类信息-编辑", notes = "兴趣分类信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<BytedanceInterestCategory> edit(@RequestBody BytedanceInterestCategory bytedanceInterestCategory) {
-        Result<BytedanceInterestCategory> result = new Result<BytedanceInterestCategory>();
-        BytedanceInterestCategory bytedanceInterestCategoryEntity = bytedanceInterestCategoryService.getById(bytedanceInterestCategory.getId());
-        if (bytedanceInterestCategoryEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = bytedanceInterestCategoryService.updateById(bytedanceInterestCategory);
-            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 {
-            bytedanceInterestCategoryService.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<BytedanceInterestCategory> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<BytedanceInterestCategory> result = new Result<BytedanceInterestCategory>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.bytedanceInterestCategoryService.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<BytedanceInterestCategory> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<BytedanceInterestCategory> result = new Result<BytedanceInterestCategory>();
-        BytedanceInterestCategory bytedanceInterestCategory = bytedanceInterestCategoryService.getById(id);
-        if (bytedanceInterestCategory == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(bytedanceInterestCategory);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<BytedanceInterestCategory> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                BytedanceInterestCategory bytedanceInterestCategory = JSON.parseObject(deString, BytedanceInterestCategory.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(bytedanceInterestCategory, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<BytedanceInterestCategory> pageList = bytedanceInterestCategoryService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "兴趣分类信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, BytedanceInterestCategory.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<BytedanceInterestCategory> listBytedanceInterestCategorys = ExcelImportUtil.importExcel(file.getInputStream(), BytedanceInterestCategory.class, params);
-                bytedanceInterestCategoryService.saveBatch(listBytedanceInterestCategorys);
-                return Result.ok("文件导入成功!数据行数:" + listBytedanceInterestCategorys.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 - 248
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceNameModelRuleController.java

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.BytedanceNameModelRule;
-import org.jeecg.modules.ctop.service.IBytedanceNameModelRuleService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 名称生成规则模板信息
- * @Author: jeecg-boot
- * @Date: 2019-08-15
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "名称生成规则模板信息")
-@RestController
-@RequestMapping("/ctop/bytedanceNameModelRule")
-public class BytedanceNameModelRuleController {
-    @Autowired
-    private IBytedanceNameModelRuleService bytedanceNameModelRuleService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param bytedanceNameModelRule
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "名称生成规则模板信息-分页列表查询")
-    @ApiOperation(value = "名称生成规则模板信息-分页列表查询", notes = "名称生成规则模板信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<BytedanceNameModelRule>> queryPageList(BytedanceNameModelRule bytedanceNameModelRule,
-                                                               @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                               HttpServletRequest req) {
-        Result<IPage<BytedanceNameModelRule>> result = new Result<IPage<BytedanceNameModelRule>>();
-        QueryWrapper<BytedanceNameModelRule> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceNameModelRule, req.getParameterMap());
-        Page<BytedanceNameModelRule> page = new Page<BytedanceNameModelRule>(pageNo, pageSize);
-        IPage<BytedanceNameModelRule> pageList = bytedanceNameModelRuleService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param bytedanceNameModelRule
-     * @return
-     */
-    @AutoLog(value = "名称生成规则模板信息-添加")
-    @ApiOperation(value = "名称生成规则模板信息-添加", notes = "名称生成规则模板信息-添加")
-    @PostMapping(value = "/add")
-    public Result<BytedanceNameModelRule> add(@RequestBody BytedanceNameModelRule bytedanceNameModelRule) {
-        Result<BytedanceNameModelRule> result = new Result<BytedanceNameModelRule>();
-        try {
-            bytedanceNameModelRuleService.save(bytedanceNameModelRule);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param bytedanceNameModelRule
-     * @return
-     */
-    @AutoLog(value = "名称生成规则模板信息-编辑")
-    @ApiOperation(value = "名称生成规则模板信息-编辑", notes = "名称生成规则模板信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<BytedanceNameModelRule> edit(@RequestBody BytedanceNameModelRule bytedanceNameModelRule) {
-        Result<BytedanceNameModelRule> result = new Result<BytedanceNameModelRule>();
-        BytedanceNameModelRule bytedanceNameModelRuleEntity = bytedanceNameModelRuleService.getById(bytedanceNameModelRule.getId());
-        if (bytedanceNameModelRuleEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = bytedanceNameModelRuleService.updateById(bytedanceNameModelRule);
-            //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 {
-            bytedanceNameModelRuleService.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<BytedanceNameModelRule> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<BytedanceNameModelRule> result = new Result<BytedanceNameModelRule>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.bytedanceNameModelRuleService.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<BytedanceNameModelRule> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<BytedanceNameModelRule> result = new Result<BytedanceNameModelRule>();
-        BytedanceNameModelRule bytedanceNameModelRule = bytedanceNameModelRuleService.getById(id);
-        if (bytedanceNameModelRule == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(bytedanceNameModelRule);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<BytedanceNameModelRule> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                BytedanceNameModelRule bytedanceNameModelRule = JSON.parseObject(deString, BytedanceNameModelRule.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(bytedanceNameModelRule, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<BytedanceNameModelRule> pageList = bytedanceNameModelRuleService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "名称生成规则模板信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, BytedanceNameModelRule.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<BytedanceNameModelRule> listBytedanceNameModelRules = ExcelImportUtil.importExcel(file.getInputStream(), BytedanceNameModelRule.class, params);
-                bytedanceNameModelRuleService.saveBatch(listBytedanceNameModelRules);
-                return Result.ok("文件导入成功!数据行数:" + listBytedanceNameModelRules.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 - 248
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedancePlanDailyReportController.java

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.BytedancePlanDailyReport;
-import org.jeecg.modules.ctop.service.IBytedancePlanDailyReportService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 广告计划日报表信息
- * @Author: jeecg-boot
- * @Date: 2019-09-11
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "广告计划日报表信息")
-@RestController
-@RequestMapping("/ctop/bytedancePlanDailyReport")
-public class BytedancePlanDailyReportController {
-    @Autowired
-    private IBytedancePlanDailyReportService bytedancePlanDailyReportService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param bytedancePlanDailyReport
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "广告计划日报表信息-分页列表查询")
-    @ApiOperation(value = "广告计划日报表信息-分页列表查询", notes = "广告计划日报表信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<BytedancePlanDailyReport>> queryPageList(BytedancePlanDailyReport bytedancePlanDailyReport,
-                                                                 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                 HttpServletRequest req) {
-        Result<IPage<BytedancePlanDailyReport>> result = new Result<IPage<BytedancePlanDailyReport>>();
-        QueryWrapper<BytedancePlanDailyReport> queryWrapper = QueryGenerator.initQueryWrapper(bytedancePlanDailyReport, req.getParameterMap());
-        Page<BytedancePlanDailyReport> page = new Page<BytedancePlanDailyReport>(pageNo, pageSize);
-        IPage<BytedancePlanDailyReport> pageList = bytedancePlanDailyReportService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param bytedancePlanDailyReport
-     * @return
-     */
-    @AutoLog(value = "广告计划日报表信息-添加")
-    @ApiOperation(value = "广告计划日报表信息-添加", notes = "广告计划日报表信息-添加")
-    @PostMapping(value = "/add")
-    public Result<BytedancePlanDailyReport> add(@RequestBody BytedancePlanDailyReport bytedancePlanDailyReport) {
-        Result<BytedancePlanDailyReport> result = new Result<BytedancePlanDailyReport>();
-        try {
-            bytedancePlanDailyReportService.save(bytedancePlanDailyReport);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param bytedancePlanDailyReport
-     * @return
-     */
-    @AutoLog(value = "广告计划日报表信息-编辑")
-    @ApiOperation(value = "广告计划日报表信息-编辑", notes = "广告计划日报表信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<BytedancePlanDailyReport> edit(@RequestBody BytedancePlanDailyReport bytedancePlanDailyReport) {
-        Result<BytedancePlanDailyReport> result = new Result<BytedancePlanDailyReport>();
-        BytedancePlanDailyReport bytedancePlanDailyReportEntity = bytedancePlanDailyReportService.getById(bytedancePlanDailyReport.getId());
-        if (bytedancePlanDailyReportEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = bytedancePlanDailyReportService.updateById(bytedancePlanDailyReport);
-            //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 {
-            bytedancePlanDailyReportService.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<BytedancePlanDailyReport> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<BytedancePlanDailyReport> result = new Result<BytedancePlanDailyReport>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.bytedancePlanDailyReportService.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<BytedancePlanDailyReport> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<BytedancePlanDailyReport> result = new Result<BytedancePlanDailyReport>();
-        BytedancePlanDailyReport bytedancePlanDailyReport = bytedancePlanDailyReportService.getById(id);
-        if (bytedancePlanDailyReport == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(bytedancePlanDailyReport);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<BytedancePlanDailyReport> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                BytedancePlanDailyReport bytedancePlanDailyReport = JSON.parseObject(deString, BytedancePlanDailyReport.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(bytedancePlanDailyReport, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<BytedancePlanDailyReport> pageList = bytedancePlanDailyReportService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "广告计划日报表信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, BytedancePlanDailyReport.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<BytedancePlanDailyReport> listBytedancePlanDailyReports = ExcelImportUtil.importExcel(file.getInputStream(), BytedancePlanDailyReport.class, params);
-                bytedancePlanDailyReportService.saveBatch(listBytedancePlanDailyReports);
-                return Result.ok("文件导入成功!数据行数:" + listBytedancePlanDailyReports.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 - 248
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedancePlanHourlyReportController.java

@@ -1,248 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.BytedancePlanHourlyReport;
-import org.jeecg.modules.ctop.service.IBytedancePlanHourlyReportService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 广告计划时报表信息
- * @Author: jeecg-boot
- * @Date: 2019-09-11
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "广告计划时报表信息")
-@RestController
-@RequestMapping("/ctop/bytedancePlanHourlyReport")
-public class BytedancePlanHourlyReportController {
-    @Autowired
-    private IBytedancePlanHourlyReportService bytedancePlanHourlyReportService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param bytedancePlanHourlyReport
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "广告计划时报表信息-分页列表查询")
-    @ApiOperation(value = "广告计划时报表信息-分页列表查询", notes = "广告计划时报表信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<BytedancePlanHourlyReport>> queryPageList(BytedancePlanHourlyReport bytedancePlanHourlyReport,
-                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                  HttpServletRequest req) {
-        Result<IPage<BytedancePlanHourlyReport>> result = new Result<IPage<BytedancePlanHourlyReport>>();
-        QueryWrapper<BytedancePlanHourlyReport> queryWrapper = QueryGenerator.initQueryWrapper(bytedancePlanHourlyReport, req.getParameterMap());
-        Page<BytedancePlanHourlyReport> page = new Page<BytedancePlanHourlyReport>(pageNo, pageSize);
-        IPage<BytedancePlanHourlyReport> pageList = bytedancePlanHourlyReportService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param bytedancePlanHourlyReport
-     * @return
-     */
-    @AutoLog(value = "广告计划时报表信息-添加")
-    @ApiOperation(value = "广告计划时报表信息-添加", notes = "广告计划时报表信息-添加")
-    @PostMapping(value = "/add")
-    public Result<BytedancePlanHourlyReport> add(@RequestBody BytedancePlanHourlyReport bytedancePlanHourlyReport) {
-        Result<BytedancePlanHourlyReport> result = new Result<BytedancePlanHourlyReport>();
-        try {
-            bytedancePlanHourlyReportService.save(bytedancePlanHourlyReport);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param bytedancePlanHourlyReport
-     * @return
-     */
-    @AutoLog(value = "广告计划时报表信息-编辑")
-    @ApiOperation(value = "广告计划时报表信息-编辑", notes = "广告计划时报表信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<BytedancePlanHourlyReport> edit(@RequestBody BytedancePlanHourlyReport bytedancePlanHourlyReport) {
-        Result<BytedancePlanHourlyReport> result = new Result<BytedancePlanHourlyReport>();
-        BytedancePlanHourlyReport bytedancePlanHourlyReportEntity = bytedancePlanHourlyReportService.getById(bytedancePlanHourlyReport.getId());
-        if (bytedancePlanHourlyReportEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = bytedancePlanHourlyReportService.updateById(bytedancePlanHourlyReport);
-            //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 {
-            bytedancePlanHourlyReportService.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<BytedancePlanHourlyReport> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<BytedancePlanHourlyReport> result = new Result<BytedancePlanHourlyReport>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.bytedancePlanHourlyReportService.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<BytedancePlanHourlyReport> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<BytedancePlanHourlyReport> result = new Result<BytedancePlanHourlyReport>();
-        BytedancePlanHourlyReport bytedancePlanHourlyReport = bytedancePlanHourlyReportService.getById(id);
-        if (bytedancePlanHourlyReport == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(bytedancePlanHourlyReport);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<BytedancePlanHourlyReport> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                BytedancePlanHourlyReport bytedancePlanHourlyReport = JSON.parseObject(deString, BytedancePlanHourlyReport.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(bytedancePlanHourlyReport, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<BytedancePlanHourlyReport> pageList = bytedancePlanHourlyReportService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "广告计划时报表信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, BytedancePlanHourlyReport.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<BytedancePlanHourlyReport> listBytedancePlanHourlyReports = ExcelImportUtil.importExcel(file.getInputStream(), BytedancePlanHourlyReport.class, params);
-                bytedancePlanHourlyReportService.saveBatch(listBytedancePlanHourlyReports);
-                return Result.ok("文件导入成功!数据行数:" + listBytedancePlanHourlyReports.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 - 252
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceUrlInfoController.java

@@ -1,252 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.BytedanceUrlInfo;
-import org.jeecg.modules.ctop.service.IBytedanceUrlInfoService;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 今日头条链接信息
- * @Author: jeecg-boot
- * @Date: 2019-08-06
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "今日头条链接信息")
-@RestController
-@RequestMapping("/ctop/bytedanceUrlInfo")
-public class BytedanceUrlInfoController {
-    @Autowired
-    private IBytedanceUrlInfoService bytedanceUrlInfoService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param bytedanceUrlInfo
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "今日头条链接信息-分页列表查询")
-    @ApiOperation(value = "今日头条链接信息-分页列表查询", notes = "今日头条链接信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<BytedanceUrlInfo>> queryPageList(BytedanceUrlInfo bytedanceUrlInfo,
-                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                         HttpServletRequest req) {
-        Result<IPage<BytedanceUrlInfo>> result = new Result<>();
-        QueryWrapper<BytedanceUrlInfo> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceUrlInfo, req.getParameterMap());
-        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.eq("advertiser_id", user.getId());
-        Page<BytedanceUrlInfo> page = new Page<>(pageNo, pageSize);
-        IPage<BytedanceUrlInfo> pageList = bytedanceUrlInfoService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param bytedanceUrlInfo
-     * @return
-     */
-    @AutoLog(value = "今日头条链接信息-添加")
-    @ApiOperation(value = "今日头条链接信息-添加", notes = "今日头条链接信息-添加")
-    @PostMapping(value = "/add")
-    public Result<BytedanceUrlInfo> add(@RequestBody BytedanceUrlInfo bytedanceUrlInfo) {
-        Result<BytedanceUrlInfo> result = new Result<BytedanceUrlInfo>();
-        try {
-            bytedanceUrlInfoService.save(bytedanceUrlInfo);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param bytedanceUrlInfo
-     * @return
-     */
-    @AutoLog(value = "今日头条链接信息-编辑")
-    @ApiOperation(value = "今日头条链接信息-编辑", notes = "今日头条链接信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<BytedanceUrlInfo> edit(@RequestBody BytedanceUrlInfo bytedanceUrlInfo) {
-        Result<BytedanceUrlInfo> result = new Result<BytedanceUrlInfo>();
-        BytedanceUrlInfo bytedanceUrlInfoEntity = bytedanceUrlInfoService.getById(bytedanceUrlInfo.getId());
-        if (bytedanceUrlInfoEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = bytedanceUrlInfoService.updateById(bytedanceUrlInfo);
-            //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 {
-            bytedanceUrlInfoService.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<BytedanceUrlInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<BytedanceUrlInfo> result = new Result<BytedanceUrlInfo>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.bytedanceUrlInfoService.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<BytedanceUrlInfo> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<BytedanceUrlInfo> result = new Result<BytedanceUrlInfo>();
-        BytedanceUrlInfo bytedanceUrlInfo = bytedanceUrlInfoService.getById(id);
-        if (bytedanceUrlInfo == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(bytedanceUrlInfo);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<BytedanceUrlInfo> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                BytedanceUrlInfo bytedanceUrlInfo = JSON.parseObject(deString, BytedanceUrlInfo.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(bytedanceUrlInfo, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<BytedanceUrlInfo> pageList = bytedanceUrlInfoService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条链接信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, BytedanceUrlInfo.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<BytedanceUrlInfo> listBytedanceUrlInfos = ExcelImportUtil.importExcel(file.getInputStream(), BytedanceUrlInfo.class, params);
-                bytedanceUrlInfoService.saveBatch(listBytedanceUrlInfos);
-                return Result.ok("文件导入成功!数据行数:" + listBytedanceUrlInfos.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("文件导入失败!");
-    }
-
-}

+ 9 - 13
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java

@@ -1,22 +1,18 @@
 package org.jeecg.modules.ctop.controller;
 
-import cn.com.ctop.common.utils.Check;
-import cn.com.ctop.common.utils.HttpUtils;
-import cn.com.ctop.common.utils.PropertiesUtils;
+import cn.com.ctop.common.module.utils.*;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.material.entity.KuaishouAccessToken;
 import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResultToken;
-import cn.com.ctop.toutiao.common.BytedanceInterfaceConstant;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
+import cn.com.ctop.common.module.mapper.UserAllocationMapper;
+import cn.com.ctop.common.module.service.IBindAccountAuthService;
+import cn.com.ctop.toutiao.entity.ByteDanceAdvertiser;
+import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
 import com.alibaba.fastjson.JSONObject;
-import constant.KuaishouInterfaceConstant;
 import org.apache.commons.lang.StringUtils;
-import org.jeecg.modules.ctop.entity.ByteDanceAdvertiser;
-import org.jeecg.modules.ctop.entity.CtopOauthToken;
-import org.jeecg.modules.ctop.entity.UserAllocation;
-import org.jeecg.modules.ctop.mapper.CtopOauthTokenMapper;
-import org.jeecg.modules.ctop.mapper.UserAllocationMapper;
-import org.jeecg.modules.ctop.service.IBindAccountAuthService;
-import org.jeecg.modules.ctop.service.IByteDanceAdvertiserDataService;
-import org.jeecg.modules.kuaishou.service.IKuaishouInterfaceService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -7,12 +7,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.CtopOauthToken;
-import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -35,9 +35,10 @@ import java.util.Map;
 
 /**
  * oauth授权码
+ *
  * @author jeecg-boot
- * @date 2019-07-09
  * @version V1.0
+ * @date 2019-07-09
  */
 @Slf4j
 @Api(tags = "oauth授权码")

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/FileInfoController.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.entity.FileInfo;
+import cn.com.ctop.common.module.service.IFileInfoService;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,8 +13,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.FileInfo;
-import org.jeecg.modules.ctop.service.IFileInfoService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;

+ 5 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ReportController.java

@@ -1,13 +1,13 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.utils.ResultMapUtils;
+import cn.com.ctop.common.module.utils.StatusCode;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import com.alibaba.fastjson.JSONObject;
 import org.jeecg.common.util.DateUtils;
-import org.jeecg.common.util.ResultMapUtils;
-import org.jeecg.common.util.StatusCode;
-import org.jeecg.modules.ctop.entity.CtopOauthToken;
-import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
 import org.jeecg.modules.ctop.service.IReportService;
-import org.jeecg.modules.kuaishou.service.IKuaishouInterfaceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

+ 18 - 23
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SourceFileController.java

@@ -1,42 +1,37 @@
 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.SourceFile;
-import org.jeecg.modules.ctop.service.ISourceFileService;
-
-import java.util.Date;
-
+import cn.com.ctop.common.module.entity.SourceFile;
+import cn.com.ctop.common.module.service.ISourceFileService;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
 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;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 统一资源库文件信息

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.service.IUserAllocationService;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,8 +15,6 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.UserAllocation;
-import org.jeecg.modules.ctop.service.IUserAllocationService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;

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

@@ -1,74 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 账号绑定-授权
- * @author jeecg-boot
- * @date 2019-07-31
- * @version V1.0
- */
-@Data
-@TableName("ctop_bind_account_auth")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bind_account_auth对象", description = "账号绑定-授权")
-public class BindAccountAuth {
-
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-    /**
-     * 广告id
-     */
-    @Excel(name = "广告id", width = 15)
-    @ApiModelProperty(value = "广告id")
-    private String advertiserId;
-    /**
-     * 授权方式
-     */
-    @Excel(name = "授权方式", width = 15)
-    @ApiModelProperty(value = "授权方式")
-    private String authType;
-    /**
-     * 回调返回广告主id
-     */
-    @Excel(name = "回调返回广告主id", width = 15)
-    @ApiModelProperty(value = "回调返回广告主id")
-    private Long accountId;
-    /**
-     * 创建时间
-     */
-    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    /**
-     * 修改时间
-     */
-    @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-
-    public BindAccountAuth() {
-    }
-}

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

@@ -1,94 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 账号绑定-登陆
- * @author jeecg-boot
- * @date 2019-07-31
- * @version V1.0
- */
-@Data
-@TableName("ctop_bind_account_login")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bind_account_login对象", description = "账号绑定-登陆")
-public class BindAccountLogin {
-
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-    /**
-     * 广告id
-     */
-    @Excel(name = "广告id", width = 15)
-    @ApiModelProperty(value = "广告id")
-    private String advertiserId;
-    /**
-     * 广告id
-     */
-    @Excel(name = "平台账户id", width = 15)
-    @ApiModelProperty(value = "平台账户id")
-    private String accountId;
-    /**
-     * 广告id
-     */
-    @Excel(name = "用户Id", width = 15)
-    @ApiModelProperty(value = "用户id")
-    private String userId;
-    /**
-     * 账号
-     */
-    @Excel(name = "账号", width = 15)
-    @ApiModelProperty(value = "账号")
-    private String accountName;
-    /**
-     * 密码
-     */
-    @Excel(name = "密码", width = 15)
-    @ApiModelProperty(value = "密码")
-    private String password;
-    /**
-     * 登录方式
-     */
-    @Excel(name = "登录方式", width = 15)
-    @ApiModelProperty(value = "登录方式")
-    private String loginType;
-    /**
-     * 1未登陆 2已登陆
-     */
-    @Excel(name = "1未登陆 2已登陆", width = 15)
-    @ApiModelProperty(value = "1未登陆 2已登陆")
-    private String status;
-    /**
-     * 创建时间
-     */
-    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    /**
-     * 修改时间
-     */
-    @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-}

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

@@ -1,692 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.math.BigDecimal;
-
-/**
- * 今日头条广告计划信息
- * @author jeecg-boot
- * @date 2019-07-22
- * @version V1.0
- */
-@Data
-@TableName("ctop_bytedance_advertise_plan")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_advertise_plan对象", description = "今日头条广告计划信息")
-public class ByteDanceAdvertisePlan {
-
-    /**头条平台广告计划id*/
-    @TableId
-    @ApiModelProperty(value = "头条平台广告计划id")
-	private Long id;
-	/**平台广告主id*/
-	@Excel(name = "平台广告主id", width = 15)
-    @ApiModelProperty(value = "平台广告主id")
-	private String advertiserId;
-	/**头条广告主id*/
-	@Excel(name = "头条广告主id", width = 15)
-    @ApiModelProperty(value = "头条广告主id")
-	private Long toutiaoId;
-	/**计划名称*/
-	@Excel(name = "计划名称", width = 15)
-    @ApiModelProperty(value = "计划名称")
-	private String name;
-	/**广告组id*/
-	@Excel(name = "广告组id", width = 15)
-    @ApiModelProperty(value = "广告组id")
-	private Long campaignId;
-	/**上次修改时间戳(用于更新时提交,服务端判断是否基于最新信息修改)*/
-	@Excel(name = "上次修改时间戳(用于更新时提交,服务端判断是否基于最新信息修改)", width = 15)
-    @ApiModelProperty(value = "上次修改时间戳(用于更新时提交,服务端判断是否基于最新信息修改)")
-	private String planModifyTime;
-	/**投放范围*/
-	@Excel(name = "投放范围", width = 15)
-    @ApiModelProperty(value = "投放范围")
-	private String deliveryRange;
-	/**计划上次修改时间*/
-	@Excel(name = "计划上次修改时间", width = 15)
-    @ApiModelProperty(value = "计划上次修改时间")
-	private String adModifyTime;
-	/**计划创建时间*/
-	@Excel(name = "计划创建时间", width = 15)
-    @ApiModelProperty(value = "计划创建时间")
-	private String adCreateTime;
-	/**广告预算类型*/
-	@Excel(name = "广告预算类型", width = 15)
-    @ApiModelProperty(value = "广告预算类型")
-	private String budgetMode;
-	/**广告预算*/
-	@Excel(name = "广告预算", width = 15)
-    @ApiModelProperty(value = "广告预算")
-	private java.math.BigDecimal budget;
-	/**广告计划投放状态*/
-	@Excel(name = "广告计划投放状态", width = 15)
-    @ApiModelProperty(value = "广告计划投放状态")
-	private String toutiaoStatus;
-	/**广告计划操作状态*/
-	@Excel(name = "广告计划操作状态", width = 15)
-    @ApiModelProperty(value = "广告计划操作状态")
-	private String optStatus;
-	/**广告投放起始时间*/
-	@Excel(name = "广告投放起始时间", width = 15)
-    @ApiModelProperty(value = "广告投放起始时间")
-	private String startTime;
-	/**广告投放结束时间*/
-	@Excel(name = "广告投放结束时间", width = 15)
-    @ApiModelProperty(value = "广告投放结束时间")
-	private String endTime;
-	/**广告出价*/
-	@Excel(name = "广告出价", width = 15)
-    @ApiModelProperty(value = "广告出价")
-	private java.math.BigDecimal bid;
-	/**广告出价类型*/
-	@Excel(name = "广告出价类型", width = 15)
-    @ApiModelProperty(value = "广告出价类型")
-	private String pricing;
-	/**广告投放时间类型*/
-	@Excel(name = "广告投放时间类型", width = 15)
-    @ApiModelProperty(value = "广告投放时间类型")
-	private String scheduleType;
-	/**广告投放时段*/
-	@Excel(name = "广告投放时段", width = 15)
-    @ApiModelProperty(value = "广告投放时段")
-	private String scheduleTime;
-	/**广告投放速度类型*/
-	@Excel(name = "广告投放速度类型", width = 15)
-    @ApiModelProperty(value = "广告投放速度类型")
-	private String flowControlMode;
-	/**应用直达链接*/
-	@Excel(name = "应用直达链接", width = 15)
-    @ApiModelProperty(value = "应用直达链接")
-	private String openUrl;
-	/**应用下载方式*/
-	@Excel(name = "应用下载方式", width = 15)
-    @ApiModelProperty(value = "应用下载方式")
-	private String downloadType;
-	/**广告落地页链接*/
-	@Excel(name = "广告落地页链接", width = 15)
-    @ApiModelProperty(value = "广告落地页链接")
-	private String externalUrl;
-	/**广告应用下载包名*/
-	@Excel(name = "广告应用下载包名", width = 15)
-    @ApiModelProperty(value = "广告应用下载包名")
-	private String toutiaoPackage;
-	/**广告应用下载类型*/
-	@Excel(name = "广告应用下载类型", width = 15)
-    @ApiModelProperty(value = "广告应用下载类型")
-	private String appType;
-	/**广告计划审核不通过原因*/
-	@Excel(name = "广告计划审核不通过原因", width = 15)
-    @ApiModelProperty(value = "广告计划审核不通过原因")
-	private String auditRejectReason;
-	/**ocpc广告转化出价*/
-	@Excel(name = "ocpc广告转化出价", width = 15)
-    @ApiModelProperty(value = "ocpc广告转化出价")
-	private java.math.BigDecimal cpaBid;
-	/**ocpc广告是否跳过第一阶段*/
-	@Excel(name = "ocpc广告是否跳过第一阶段", width = 15)
-    @ApiModelProperty(value = "ocpc广告是否跳过第一阶段")
-	private Integer cpaSkipFirstPhrase;
-	/**转化类型广告的转化工具id*/
-	@Excel(name = "转化类型广告的转化工具id", width = 15)
-    @ApiModelProperty(value = "转化类型广告的转化工具id")
-	private Long convertId;
-	/**过滤已转化用户类型字段*/
-	@Excel(name = "过滤已转化用户类型字段", width = 15)
-    @ApiModelProperty(value = "过滤已转化用户类型字段")
-	private String hideIfConverted;
-	/**过滤已安装,当推广目标为安卓应用下载时可填*/
-	@Excel(name = "过滤已安装,当推广目标为安卓应用下载时可填", width = 15)
-    @ApiModelProperty(value = "过滤已安装,当推广目标为安卓应用下载时可填")
-	private Integer hideIfExists;
-	/**audience*/
-	@Excel(name = "audience", width = 15)
-    @ApiModelProperty(value = "audience")
-	private Object audience;
-    @Excel(name = "上次修改时间", width = 15)
-    @ApiModelProperty(value = "上次修改时间")
-    private String modifyTime;
-
-    public ByteDanceAdvertisePlan(JSONObject dataObject, String accountId) {
-		Long id = dataObject.getLong("id");
-		this.id=id;
-		this.advertiserId = accountId;
-		String name = dataObject.getString("name");
-		if (null!=name&&!"".equals(name.trim())){
-			this.name =name;
-		}
-
-		Long advertiserId = dataObject.getLong("advertiser_id");
-		if (null!=advertiserId){
-			this.toutiaoId =advertiserId;
-		}
-		Long campaignId = dataObject.getLong("campaign_id");
-		if (null!=campaignId){
-			this.campaignId =campaignId;
-		}
-
-        String budgetMode = dataObject.getString("budget_mode");
-        if (null != budgetMode && !"".equals(budgetMode.trim())) {
-            this.budgetMode = budgetMode;
-		}
-        String modifyTime = dataObject.getString("modify_time");
-        if (null != modifyTime && !"".equals(modifyTime.trim())) {
-            this.modifyTime = modifyTime;
-        }
-        String openUrl = dataObject.getString("open_url");
-        if (null != openUrl && !"".equals(openUrl.trim())) {
-            this.openUrl = openUrl;
-        }
-
-        String adCreateTime = dataObject.getString("ad_create_time");
-        if (null != adCreateTime && !"".equals(adCreateTime.trim())) {
-            this.adCreateTime = adCreateTime;
-        }
-
-        String adModifyTime = dataObject.getString("ad_modify_time");
-        if (null != adModifyTime && !"".equals(adModifyTime.trim())) {
-            this.adModifyTime = adModifyTime;
-        }
-
-        String auditRejectReason = dataObject.getString("audit_reject_reason");
-        if (null != auditRejectReason && !"".equals(auditRejectReason.trim())) {
-            this.auditRejectReason = auditRejectReason;
-        }
-
-//        String dpa_open_url_field = dataObject.getString("dpa_open_url_field");
-//        if (null!=dpa_open_url_field&&!"".equals(dpa_open_url_field.trim())){
-//            this.dpa =dpa_open_url_field;
-//        }
-
-//        String external_url_params = dataObject.getString("external_url_params");
-//        if (null!=external_url_params&&!"".equals(external_url_params.trim())){
-//            this.externalUrlParams =external_url_params;
-//        }
-
-        String pricing = dataObject.getString("pricing");
-        if (null != pricing && !"".equals(pricing.trim())) {
-            this.pricing = pricing;
-        }
-
-//        String dpa_open_url_type = dataObject.getString("dpa_open_url_type");
-//        if (null!=dpa_open_url_type&&!"".equals(dpa_open_url_type.trim())){
-//            this.dpaOpenUrlType =dpa_open_url_type;
-//        }
-
-//        String dpa_categories = dataObject.getString("dpa_categories");
-//        if (null!=dpa_categories&&!"".equals(dpa_categories.trim())){
-//            this.dpaCategories =dpa_categories;
-//        }
-
-        Integer hideIfExists = dataObject.getInteger("hide_if_exists");
-        if (null != hideIfExists) {
-            this.hideIfExists = hideIfExists;
-        }
-
-//        String open_url_params = dataObject.getString("open_url_params");
-//        if (null!=open_url_params&&!"".equals(open_url_params.trim())){
-//            this.openUrlParams =open_url_params;
-//        }
-
-//        String dpa_open_urls = dataObject.getString("dpa_open_urls");
-//        if (null!=dpa_open_urls&&!"".equals(dpa_open_urls.trim())){
-//            this.dpaOpenUrls =dpa_open_urls;
-//        }
-
-//        String deep_cpabid = dataObject.getString("deep_cpabid");
-//        if (null!=deep_cpabid&&!"".equals(deep_cpabid.trim())){
-//            this.deepCpaaid =deep_cpabid;
-//        }
-
-        String appType = dataObject.getString("app_type");
-        if (null != appType && !"".equals(appType.trim())) {
-            this.appType = appType;
-        }
-
-        String flowControlMode = dataObject.getString("flow_control_mode");
-        if (null != flowControlMode && !"".equals(flowControlMode.trim())) {
-            this.flowControlMode = flowControlMode;
-        }
-
-//        String union_video_type = dataObject.getString("union_video_type");
-//        if (null!=union_video_type&&!"".equals(union_video_type.trim())){
-//            this.unionVideoType =union_video_type;
-//        }
-
-//        String download_url = dataObject.getString("download_url");
-//        if (null!=download_url&&!"".equals(download_url.trim())){
-//            this.downloadUrl =download_url;
-//        }
-
-        BigDecimal cpaBid = dataObject.getBigDecimal("cpa_bid");
-        if (null != cpaBid) {
-            this.cpaBid = cpaBid;
-        }
-
-//        String dpa_products = dataObject.getString("dpa_products");
-//        if (null!=dpa_products&&!"".equals(dpa_products.trim())){
-//            this.dpaProducts =dpa_products;
-//        }
-
-//        String category_type = dataObject.getString("category_type");
-//        if (null!=category_type&&!"".equals(category_type.trim())){
-//            this.categoryType =category_type;
-//        }
-
-//        String dpa_external_url_field = dataObject.getString("dpa_external_url_field");
-//        if (null!=dpa_external_url_field&&!"".equals(dpa_external_url_field.trim())){
-//            this.dpaExternalUrlField =dpa_external_url_field;
-//        }
-
-//        String smart_bid_type = dataObject.getString("smart_bid_type");
-//        if (null!=smart_bid_type&&!"".equals(smart_bid_type.trim())){
-//            this.smartBidType =smart_bid_type;
-//        }
-
-//        String dpa_external_urls = dataObject.getString("dpa_external_urls");
-//        if (null!=dpa_external_urls&&!"".equals(dpa_external_urls.trim())){
-//            this.dpaExternalUrls =dpa_external_urls;
-//        }
-
-        String startTime = dataObject.getString("start_time");
-        if (null != startTime && !"".equals(startTime.trim())) {
-            this.startTime = startTime;
-        }
-
-        String optStatus = dataObject.getString("opt_status");
-        if (null != optStatus && !"".equals(optStatus.trim())) {
-            this.optStatus = optStatus;
-        }
-
-        String endTime = dataObject.getString("end_time");
-        if (null != endTime && !"".equals(endTime.trim())) {
-            this.endTime = endTime;
-        }
-
-        String status = dataObject.getString("status");
-        if (null != status && !"".equals(status.trim())) {
-            this.toutiaoStatus = status;
-        }
-
-//        String dpa_product_target = dataObject.getString("dpa_product_target");
-//        if (null!=dpa_product_target&&!"".equals(dpa_product_target.trim())){
-//            this.dpaProductTarget =dpa_product_target;
-//        }
-
-//        Long ad_id = dataObject.getLong("ad_id");
-//        if (null!=ad_id){
-//            this.openUrl =open_url;
-//        }
-
-        Long convertId = dataObject.getLong("convert_id");
-        if (null != convertId) {
-            this.convertId = convertId;
-        }
-
-//        String adjust_cpa = dataObject.getString("adjust_cpa");
-//        if (null!=adjust_cpa&&!"".equals(adjust_cpa.trim())){
-//            this.adjustCpa =adjust_cpa;
-//        }
-
-        BigDecimal bid = dataObject.getBigDecimal("bid");
-        if (null != bid) {
-            this.bid = bid;
-        }
-
-//        Long advertiser_id = dataObject.getLong("advertiser_id");
-//        if (null!=advertiser_id){
-//            this.asdasd =open_url;
-//        }
-
-//        String deep_bid_type = dataObject.getString("deep_bid_type");
-//        if (null!=deep_bid_type&&!"".equals(deep_bid_type.trim())){
-//            this.deepBidType =deep_bid_type;
-//        }
-//
-//        String dpa_adtype = dataObject.getString("dpa_adtype");
-//        if (null!=dpa_adtype&&!"".equals(dpa_adtype.trim())){
-//            this.dpaAdtype =dpa_adtype;
-//        }
-
-//        String external_actions = dataObject.getString("external_actions");
-//        if (null!=external_actions&&!"".equals(external_actions.trim())){
-//            this.externalActions =external_actions;
-//        }
-
-        String hideIfConverted = dataObject.getString("hide_if_converted");
-        if (null != hideIfConverted && !"".equals(hideIfConverted.trim())) {
-            this.hideIfConverted = hideIfConverted;
-        }
-
-        String toutiaoPackage = dataObject.getString("package");
-        if (null != toutiaoPackage && !"".equals(toutiaoPackage.trim())) {
-            this.toutiaoPackage = toutiaoPackage;
-        }
-
-        String deliveryRange = dataObject.getString("delivery_range");
-        if (null != deliveryRange && !"".equals(deliveryRange.trim())) {
-            this.deliveryRange = deliveryRange;
-        }
-
-//        String params_type = dataObject.getString("params_type");
-//        if (null!=params_type&&!"".equals(params_type.trim())){
-//            this.paramsType =params_type;
-//        }
-
-        BigDecimal budget = dataObject.getBigDecimal("budget");
-        if (null != budget) {
-            this.budget = budget;
-        }
-
-        String scheduleType = dataObject.getString("schedule_type");
-        if (null != scheduleType && !"".equals(scheduleType.trim())) {
-            this.scheduleType = scheduleType;
-        }
-
-        String scheduleTime = dataObject.getString("schedule_time");
-        if (null != scheduleTime && !"".equals(scheduleTime.trim())) {
-            this.scheduleTime = scheduleTime;
-        }
-//
-//        String modify_time = dataObject.getString("modify_time");
-//        if (null!=modify_time&&!"".equals(modify_time.trim())){
-//            this.modifyTime =modify_time;
-//        }
-//
-//        String advertiser_store_ids = dataObject.getString("advertiser_store_ids");
-//        if (null!=advertiser_store_ids&&!"".equals(advertiser_store_ids.trim())){
-//            this.advertiserStoreIds =advertiser_store_ids;
-//        }
-
-//        String product_platform_id = dataObject.getString("product_platform_id");
-//        if (null!=product_platform_id&&!"".equals(product_platform_id.trim())){
-//            this.productPlatformId =product_platform_id;
-//        }
-
-        String downloadType = dataObject.getString("download_type");
-        if (null != downloadType && !"".equals(downloadType.trim())) {
-            this.downloadType = downloadType;
-        }
-
-        String externalUrl = dataObject.getString("external_url");
-        if (null != externalUrl && !"".equals(externalUrl.trim())) {
-            this.externalUrl = externalUrl;
-        }
-    }
-
-    public ByteDanceAdvertisePlan(String advertiserId, Long adId, JSONObject params) {
-        this.id = adId;
-        this.advertiserId = advertiserId;
-        String name = params.getString("name");
-        if (null != name && !"".equals(name.trim())) {
-            this.name = name;
-        }
-
-        Long toutiaoId = params.getLong("advertiser_id");
-        if (null != toutiaoId) {
-            this.toutiaoId = toutiaoId;
-        }
-        Long campaignId = params.getLong("campaign_id");
-        if (null != campaignId) {
-            this.campaignId = campaignId;
-        }
-
-        String budgetMode = params.getString("budget_mode");
-        if (null != budgetMode && !"".equals(budgetMode.trim())) {
-            this.budgetMode = budgetMode;
-        }
-
-        String openUrl = params.getString("open_url");
-        if (null != openUrl && !"".equals(openUrl.trim())) {
-            this.openUrl = openUrl;
-        }
-
-        String adCreateTime = params.getString("ad_create_time");
-        if (null != adCreateTime && !"".equals(adCreateTime.trim())) {
-            this.adCreateTime = adCreateTime;
-        }
-
-        String adModifyTime = params.getString("ad_modify_time");
-        if (null != adModifyTime && !"".equals(adModifyTime.trim())) {
-            this.adModifyTime = adModifyTime;
-        }
-
-        String auditRejectReason = params.getString("audit_reject_reason");
-        if (null != auditRejectReason && !"".equals(auditRejectReason.trim())) {
-            this.auditRejectReason = auditRejectReason;
-        }
-
-//        String dpa_open_url_field = dataObject.getString("dpa_open_url_field");
-//        if (null!=dpa_open_url_field&&!"".equals(dpa_open_url_field.trim())){
-//            this.dpa =dpa_open_url_field;
-//        }
-
-//        String external_url_params = dataObject.getString("external_url_params");
-//        if (null!=external_url_params&&!"".equals(external_url_params.trim())){
-//            this.externalUrlParams =external_url_params;
-//        }
-
-        String pricing = params.getString("pricing");
-        if (null != pricing && !"".equals(pricing.trim())) {
-            this.pricing = pricing;
-        }
-
-//        String dpa_open_url_type = dataObject.getString("dpa_open_url_type");
-//        if (null!=dpa_open_url_type&&!"".equals(dpa_open_url_type.trim())){
-//            this.dpaOpenUrlType =dpa_open_url_type;
-//        }
-
-//        String dpa_categories = dataObject.getString("dpa_categories");
-//        if (null!=dpa_categories&&!"".equals(dpa_categories.trim())){
-//            this.dpaCategories =dpa_categories;
-//        }
-
-        Integer hideIfExists = params.getInteger("hide_if_exists");
-        if (null != hideIfExists) {
-            this.hideIfExists = hideIfExists;
-        }
-
-//        String open_url_params = dataObject.getString("open_url_params");
-//        if (null!=open_url_params&&!"".equals(open_url_params.trim())){
-//            this.openUrlParams =open_url_params;
-//        }
-
-//        String dpa_open_urls = dataObject.getString("dpa_open_urls");
-//        if (null!=dpa_open_urls&&!"".equals(dpa_open_urls.trim())){
-//            this.dpaOpenUrls =dpa_open_urls;
-//        }
-
-//        String deep_cpabid = dataObject.getString("deep_cpabid");
-//        if (null!=deep_cpabid&&!"".equals(deep_cpabid.trim())){
-//            this.deepCpaaid =deep_cpabid;
-//        }
-
-        String appType = params.getString("app_type");
-        if (null != appType && !"".equals(appType.trim())) {
-            this.appType = appType;
-        }
-
-        String flowControlMode = params.getString("flow_control_mode");
-        if (null != flowControlMode && !"".equals(flowControlMode.trim())) {
-            this.flowControlMode = flowControlMode;
-        }
-
-//        String union_video_type = dataObject.getString("union_video_type");
-//        if (null!=union_video_type&&!"".equals(union_video_type.trim())){
-//            this.unionVideoType =union_video_type;
-//        }
-
-//        String download_url = dataObject.getString("download_url");
-//        if (null!=download_url&&!"".equals(download_url.trim())){
-//            this.downloadUrl =download_url;
-//        }
-
-        BigDecimal cpaBid = params.getBigDecimal("cpa_bid");
-        if (null != cpaBid) {
-            this.cpaBid = cpaBid;
-        }
-
-//        String dpa_products = dataObject.getString("dpa_products");
-//        if (null!=dpa_products&&!"".equals(dpa_products.trim())){
-//            this.dpaProducts =dpa_products;
-//        }
-
-//        String category_type = dataObject.getString("category_type");
-//        if (null!=category_type&&!"".equals(category_type.trim())){
-//            this.categoryType =category_type;
-//        }
-
-//        String dpa_external_url_field = dataObject.getString("dpa_external_url_field");
-//        if (null!=dpa_external_url_field&&!"".equals(dpa_external_url_field.trim())){
-//            this.dpaExternalUrlField =dpa_external_url_field;
-//        }
-
-//        String smart_bid_type = dataObject.getString("smart_bid_type");
-//        if (null!=smart_bid_type&&!"".equals(smart_bid_type.trim())){
-//            this.smartBidType =smart_bid_type;
-//        }
-
-//        String dpa_external_urls = dataObject.getString("dpa_external_urls");
-//        if (null!=dpa_external_urls&&!"".equals(dpa_external_urls.trim())){
-//            this.dpaExternalUrls =dpa_external_urls;
-//        }
-
-        String startTime = params.getString("start_time");
-        if (null != startTime && !"".equals(startTime.trim())) {
-            this.startTime = startTime;
-        }
-
-        String optStatus = params.getString("opt_status");
-        if (null != optStatus && !"".equals(optStatus.trim())) {
-            this.optStatus = optStatus;
-        }
-
-        String endTime = params.getString("end_time");
-        if (null != endTime && !"".equals(endTime.trim())) {
-            this.endTime = endTime;
-        }
-
-        String status = params.getString("status");
-        if (null != status && !"".equals(status.trim())) {
-            this.toutiaoStatus = status;
-        }
-
-//        String dpa_product_target = dataObject.getString("dpa_product_target");
-//        if (null!=dpa_product_target&&!"".equals(dpa_product_target.trim())){
-//            this.dpaProductTarget =dpa_product_target;
-//        }
-
-//        Long ad_id = dataObject.getLong("ad_id");
-//        if (null!=ad_id){
-//            this.openUrl =open_url;
-//        }
-
-        Long convertId = params.getLong("convert_id");
-        if (null != convertId) {
-            this.convertId = convertId;
-        }
-
-//        String adjust_cpa = dataObject.getString("adjust_cpa");
-//        if (null!=adjust_cpa&&!"".equals(adjust_cpa.trim())){
-//            this.adjustCpa =adjust_cpa;
-//        }
-
-        BigDecimal bid = params.getBigDecimal("bid");
-        if (null != bid) {
-            this.bid = bid;
-        }
-
-//        Long advertiser_id = dataObject.getLong("advertiser_id");
-//        if (null!=advertiser_id){
-//            this.asdasd =open_url;
-//        }
-
-//        String deep_bid_type = dataObject.getString("deep_bid_type");
-//        if (null!=deep_bid_type&&!"".equals(deep_bid_type.trim())){
-//            this.deepBidType =deep_bid_type;
-//        }
-//
-//        String dpa_adtype = dataObject.getString("dpa_adtype");
-//        if (null!=dpa_adtype&&!"".equals(dpa_adtype.trim())){
-//            this.dpaAdtype =dpa_adtype;
-//        }
-
-//        String external_actions = dataObject.getString("external_actions");
-//        if (null!=external_actions&&!"".equals(external_actions.trim())){
-//            this.externalActions =external_actions;
-//        }
-
-        String hideIfConverted = params.getString("hide_if_converted");
-        if (null != hideIfConverted && !"".equals(hideIfConverted.trim())) {
-            this.hideIfConverted = hideIfConverted;
-        }
-
-        String toutiaoPackage = params.getString("package");
-        if (null != toutiaoPackage && !"".equals(toutiaoPackage.trim())) {
-            this.toutiaoPackage = toutiaoPackage;
-        }
-
-        String deliveryRange = params.getString("delivery_range");
-        if (null != deliveryRange && !"".equals(deliveryRange.trim())) {
-            this.deliveryRange = deliveryRange;
-        }
-
-//        String params_type = dataObject.getString("params_type");
-//        if (null!=params_type&&!"".equals(params_type.trim())){
-//            this.paramsType =params_type;
-//        }
-
-        BigDecimal budget = params.getBigDecimal("budget");
-        if (null != budget) {
-            this.budget = budget;
-        }
-
-        String scheduleType = params.getString("schedule_type");
-        if (null != scheduleType && !"".equals(scheduleType.trim())) {
-            this.scheduleType = scheduleType;
-        }
-
-        String scheduleTime = params.getString("schedule_time");
-        if (null != scheduleTime && !"".equals(scheduleTime.trim())) {
-            this.scheduleTime = scheduleTime;
-        }
-//
-//        String modify_time = dataObject.getString("modify_time");
-//        if (null!=modify_time&&!"".equals(modify_time.trim())){
-//            this.modifyTime =modify_time;
-//        }
-//
-//        String advertiser_store_ids = dataObject.getString("advertiser_store_ids");
-//        if (null!=advertiser_store_ids&&!"".equals(advertiser_store_ids.trim())){
-//            this.advertiserStoreIds =advertiser_store_ids;
-//        }
-
-//        String product_platform_id = dataObject.getString("product_platform_id");
-//        if (null!=product_platform_id&&!"".equals(product_platform_id.trim())){
-//            this.productPlatformId =product_platform_id;
-//        }
-
-        String downloadType = params.getString("download_type");
-        if (null != downloadType && !"".equals(downloadType.trim())) {
-            this.downloadType = downloadType;
-        }
-
-        String externalUrl = params.getString("external_url");
-        if (null != externalUrl && !"".equals(externalUrl.trim())) {
-            this.externalUrl = externalUrl;
-        }
-    }
-
-    public ByteDanceAdvertisePlan() {
-    }
-}

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

@@ -1,242 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 今日头条广告主信息
- * @author jeecg-boot
- * @date 2019-07-22
- * @version V1.0
- */
-@Data
-@TableName("ctop_bytedance_advertiser")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_advertiser对象", description = "今日头条广告主信息")
-public class ByteDanceAdvertiser {
-
-    /**外部平台头条id*/
-    @TableId
-    @ApiModelProperty(value = "外部平台头条id")
-	private Long id;
-	/**本平台id*/
-	@Excel(name = "本平台id", width = 15)
-    @ApiModelProperty(value = "本平台id")
-	private String advertiserId;
-	/**头条账户名*/
-	@Excel(name = "头条账户名", width = 15)
-    @ApiModelProperty(value = "头条账户名")
-	private String name;
-	/**品牌描述,即推广内容*/
-	@Excel(name = "品牌描述,即推广内容", width = 15)
-    @ApiModelProperty(value = "品牌描述,即推广内容")
-	private String description;
-	/**邮箱*/
-	@Excel(name = "邮箱", width = 15)
-    @ApiModelProperty(value = "邮箱")
-	private String email;
-	/**联系人*/
-	@Excel(name = "联系人", width = 15)
-    @ApiModelProperty(value = "联系人")
-	private String contacter;
-	/**手机号*/
-	@Excel(name = "手机号", width = 15)
-    @ApiModelProperty(value = "手机号")
-	private String phonenumber;
-	@Excel(name = "角色", width = 15)
-    @ApiModelProperty(value = "角色")
-	private java.lang.String role;
-	@Excel(name = "广告主状态", width = 15)
-    @ApiModelProperty(value = "广告主状态")
-	private java.lang.String toutiaoStatus;
-	/**固定电话*/
-	@Excel(name = "固定电话", width = 15)
-    @ApiModelProperty(value = "固定电话")
-	private java.lang.String telephone;
-	/**地址*/
-	@Excel(name = "地址", width = 15)
-    @ApiModelProperty(value = "地址")
-	private java.lang.String address;
-	/**执照预览地址(链接默认1小时内有效)*/
-	@Excel(name = "执照预览地址(链接默认1小时内有效)", width = 15)
-    @ApiModelProperty(value = "执照预览地址(链接默认1小时内有效)")
-	private java.lang.String licenseUrl;
-	/**执照编号*/
-	@Excel(name = "执照编号", width = 15)
-    @ApiModelProperty(value = "执照编号")
-	private java.lang.String licenseNo;
-	/**执照省份*/
-	@Excel(name = "执照省份", width = 15)
-    @ApiModelProperty(value = "执照省份")
-	private java.lang.String licenseProvince;
-	/**执照城市*/
-	@Excel(name = "执照城市", width = 15)
-    @ApiModelProperty(value = "执照城市")
-	private java.lang.String licenseCity;
-	/**公司名称*/
-	@Excel(name = "公司名称", width = 15)
-    @ApiModelProperty(value = "公司名称")
-	private java.lang.String company;
-	/**经营类别*/
-	@Excel(name = "经营类别", width = 15)
-    @ApiModelProperty(value = "经营类别")
-	private java.lang.String brand;
-	/**运营区域*/
-	@Excel(name = "运营区域", width = 15)
-    @ApiModelProperty(value = "运营区域")
-	private java.lang.String promotionArea;
-	/**运营省份*/
-	@Excel(name = "运营省份", width = 15)
-    @ApiModelProperty(value = "运营省份")
-	private java.lang.String promotionCenterProvince;
-	/**运营城市*/
-	@Excel(name = "运营城市", width = 15)
-    @ApiModelProperty(value = "运营城市")
-	private java.lang.String promotionCenterCity;
-	/**一级行业名称*/
-	@Excel(name = "一级行业名称", width = 15)
-    @ApiModelProperty(value = "一级行业名称")
-	private java.lang.String firstIndustryName;
-	/**二级行业名称*/
-	@Excel(name = "二级行业名称", width = 15)
-    @ApiModelProperty(value = "二级行业名称")
-	private java.lang.String secondIndustryName;
-	/**审核拒绝原因*/
-	@Excel(name = "审核拒绝原因", width = 15)
-    @ApiModelProperty(value = "审核拒绝原因")
-	private java.lang.String reason;
-	/**账户总余额,单位元*/
-	@Excel(name = "账户总余额,单位元", width = 15)
-    @ApiModelProperty(value = "账户总余额,单位元")
-	private java.math.BigDecimal balance;
-	/**头条平台中广告主创建时间*/
-	@Excel(name = "头条平台中广告主创建时间", width = 15)
-    @ApiModelProperty(value = "头条平台中广告主创建时间")
-	private java.lang.String toutiaoCreateTime;
-	/**数据状态*/
-	@Excel(name = "数据状态", width = 15)
-    @ApiModelProperty(value = "数据状态")
-	private java.lang.Integer status;
-	/**createTime*/
-    @ApiModelProperty(value = "createTime")
-	private java.util.Date createTime;
-	/**updateTime*/
-    @ApiModelProperty(value = "updateTime")
-	private java.util.Date updateTime;
-
-    public ByteDanceAdvertiser(JSONObject dataObject, String accountId) {
-		Long id = dataObject.getLong("id");
-		this.id=id;
-		this.advertiserId = accountId;
-		String name = dataObject.getString("name");
-		if (null!=name&&!"".equals(name.trim())){
-			this.name =name;
-		}
-		String description = dataObject.getString("description");
-		if (null!=description&&!"".equals(description.trim())){
-			this.description = description;
-		}
-		String email = dataObject.getString("email");
-		if (null!=email&&!"".equals(email.trim())){
-			this.email = email;
-		}
-		String contacter = dataObject.getString("contacter");
-		if (null!=contacter&&!"".equals(contacter.trim())){
-			this.contacter = contacter;
-		}
-		String phonenumber = dataObject.getString("phonenumber");
-		if (null!=phonenumber&&!"".equals(phonenumber.trim())){
-			this.phonenumber = phonenumber;
-		}
-		String role = dataObject.getString("role");
-		if (null!=role&&!"".equals(role.trim())){
-			this.role = role;
-		}
-		String status = dataObject.getString("status");
-		if (null!=status&&!"".equals(status.trim())){
-			this.toutiaoStatus = status;
-		}
-		String telephone = dataObject.getString("telephone");
-		if (null!=telephone&&!"".equals(telephone.trim())){
-			this.telephone = telephone;
-		}
-		String address = dataObject.getString("address");
-		if (null!=address&&!"".equals(address.trim())){
-			this.address = address;
-		}
-		String licenseUrl = dataObject.getString("license_url");
-		if (null!=licenseUrl&&!"".equals(licenseUrl.trim())){
-			this.licenseUrl = licenseUrl;
-		}
-		String licenseNo = dataObject.getString("license_no");
-		if (null!=licenseNo&&!"".equals(licenseNo.trim())){
-			this.licenseNo = licenseNo;
-		}
-		String licenseProvince = dataObject.getString("license_province");
-		if (null!=licenseProvince&&!"".equals(licenseProvince.trim())){
-			this.licenseProvince = licenseProvince;
-		}
-		String licenseCity  = dataObject.getString("license_city ");
-		if (null!=licenseCity&&!"".equals(licenseCity.trim())){
-			this.licenseCity = licenseCity;
-		}
-		String company = dataObject.getString("company");
-		if (null!=company&&!"".equals(company.trim())){
-			this.company = company;
-		}
-		String brand = dataObject.getString("brand");
-		if (null!=brand&&!"".equals(brand.trim())){
-			this.brand = brand;
-		}
-		String promotionArea = dataObject.getString("promotion_area");
-		if (null!=promotionArea&&!"".equals(promotionArea.trim())){
-			this.promotionArea = promotionArea;
-		}
-		String promotionCenterProvince  = dataObject.getString("promotion_center_province ");
-		if (null!=promotionCenterProvince&&!"".equals(promotionCenterProvince.trim())){
-			this.promotionCenterProvince = promotionCenterProvince;
-		}
-		String promotionCenterCity = dataObject.getString("promotion_center_city");
-		if (null!=promotionCenterCity&&!"".equals(promotionCenterCity.trim())){
-			this.promotionCenterCity = promotionCenterCity;
-		}
-		String firstIndustryName  = dataObject.getString("first_industry_name ");
-		if (null!=firstIndustryName&&!"".equals(firstIndustryName.trim())){
-			this.firstIndustryName = firstIndustryName;
-		}
-		String secondIndustryName = dataObject.getString("second_industry_name");
-		if (null!=secondIndustryName&&!"".equals(secondIndustryName.trim())){
-			this.secondIndustryName = secondIndustryName;
-		}
-		String reason = dataObject.getString("reason");
-		if (null!=reason&&!"".equals(reason.trim())){
-			this.reason = reason;
-		}
-		BigDecimal balance = dataObject.getBigDecimal("balance");
-		if (null!=balance){
-			this.balance = balance;
-		}
-		String createTime  = dataObject.getString("create_time ");
-		if (null!=createTime &&!"".equals(createTime .trim())){
-			this.toutiaoCreateTime = createTime;
-		}
-		Date now = new Date();
-		this.createTime = now;
-		this.updateTime = now;
-	}
-
-	public ByteDanceAdvertiser() {
-
-	}
-}

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

@@ -1,68 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 今日头条广告主预算信息
- * @author jeecg-boot
- * @date 2019-07-22
- * @version V1.0
- */
-@Data
-@TableName("ctop_bytedance_advertiser_budget")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_advertiser_budget对象", description = "今日头条广告主预算信息")
-public class ByteDanceAdvertiserBudget {
-
-    /**头条广告主id*/
-    @TableId
-    @ApiModelProperty(value = "头条广告主id")
-	private Long id;
-	/**平台账号id*/
-	@Excel(name = "平台账号id", width = 15)
-    @ApiModelProperty(value = "平台账号id")
-	private String advertiserId;
-    @Excel(name = "预算类型")
-	private java.lang.String budgetMode;
-	@Excel(name = "预算数量", width = 15)
-    @ApiModelProperty(value = "预算数量")
-    private java.math.BigDecimal budget;
-	/**createTime*/
-    @ApiModelProperty(value = "createTime")
-	private java.util.Date createTime;
-	/**updateTime*/
-    @ApiModelProperty(value = "updateTime")
-	private java.util.Date updateTime;
-
-    public ByteDanceAdvertiserBudget() {
-    }
-
-    public ByteDanceAdvertiserBudget(JSONObject dataObject, String accountId) {
-		Long advertiserId = dataObject.getLong("advertiser_id");
-		this.id = advertiserId;
-		this.advertiserId = accountId;
-        String budgetMode = dataObject.getString("budget_mode");
-        if (null != budgetMode && !"".equals(budgetMode.trim())) {
-            this.budgetMode = budgetMode;
-		}
-        BigDecimal budget = dataObject.getBigDecimal("budget");
-		if (null!=budget){
-			this.budget =budget;
-		}
-		Date now = new Date();
-		this.createTime = now;
-		this.updateTime = now;
-	}
-}

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

@@ -1,141 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * 今日头条预算模板信息
- * @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.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 平台广告主id
-     * advertiserId
-     */
-    @Excel(name = "平台广告主id", width = 15)
-    @ApiModelProperty(value = "advertiser_id")
-    private String advertiserId;
-    /**
-     * 模板名称
-     */
-    @Excel(name = "模板名称", width = 15)
-    @ApiModelProperty(value = "模板名称")
-    private String name;
-    /**
-     * 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 = "budgetPriceMode", width = 15)
-    @ApiModelProperty(value = "budgetPriceMode")
-    private String budgetPriceMode;
-    /**
-     * flowDateType
-     */
-    @Excel(name = "flowDateType", width = 15)
-    @ApiModelProperty(value = "flowDateType")
-    private String flowDateType;
-    /**
-     * startDate
-     */
-    @Excel(name = "开始日期", width = 15)
-    @ApiModelProperty(value = "startDate")
-    private String startDate;
-    /**
-     * endDate
-     */
-    @Excel(name = "结束日子", 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 = "转化出价", 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;
-
-    private String createBy;
-    private String updateBy;
-
-    public ByteDanceBudgetTemplate() {
-    }
-}

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

@@ -1,186 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 今日头条广告组信息
- * @author jeecg-boot
- * @date 2019-07-22
- * @version V1.0
- */
-@Data
-@TableName("ctop_bytedance_campaign")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_campaign对象", description = "今日头条广告组信息")
-public class ByteDanceCampaign {
-
-    /**今日头条广告组id*/
-	@TableId
-    @ApiModelProperty(value = "今日头条广告组id")
-	private Long id;
-	/**平台用户id*/
-	@Excel(name = "平台用户id", width = 15)
-    @ApiModelProperty(value = "平台用户id")
-	private String advertiserId;
-	/**头条账号id*/
-	@Excel(name = "头条账号id", width = 15)
-    @ApiModelProperty(value = "头条账号id")
-	private Long toutiaoId;
-	/**
-	 * 头条账号id
-	 */
-	@Excel(name = "模板id", width = 15)
-	@ApiModelProperty(value = "模板id")
-	private Long templateId;
-	/**广告组名称*/
-	@Excel(name = "广告组名称", width = 15)
-    @ApiModelProperty(value = "广告组名称")
-	private String name;
-	/**广告组预算*/
-	@Excel(name = "广告组预算", width = 15)
-    @ApiModelProperty(value = "广告组预算")
-	private java.math.BigDecimal budget;
-	/**广告组预算类型*/
-	@Excel(name = "广告组预算类型", width = 15)
-    @ApiModelProperty(value = "广告组预算类型")
-	private String budgetMode;
-	/**广告组推广目的*/
-	@Excel(name = "广告组推广目的", width = 15)
-    @ApiModelProperty(value = "广告组推广目的")
-	private String landingType;
-	/**广告组时间戳,用于更新时提交,服务端判断是否基于最新信息修改*/
-	@Excel(name = "广告组时间戳,用于更新时提交,服务端判断是否基于最新信息修改", width = 15)
-    @ApiModelProperty(value = "广告组时间戳,用于更新时提交,服务端判断是否基于最新信息修改")
-	private String modifyTime;
-	@Excel(name = "广告组状态", width = 15)
-    @ApiModelProperty(value = "广告组状态")
-    private java.lang.String status;
-    /**
-     * optStatus
-     */
-    @Excel(name = "optStatus", width = 15)
-    @ApiModelProperty(value = "optStatus")
-    private java.lang.String optStatus;
-	/**广告组创建时间*/
-	@Excel(name = "广告组创建时间", width = 15)
-    @ApiModelProperty(value = "广告组创建时间")
-	private java.lang.String campaignCreateTime;
-	/**广告组修改时间*/
-	@Excel(name = "广告组修改时间", width = 15)
-    @ApiModelProperty(value = "广告组修改时间")
-	private java.lang.String campaignModifyTime;
-	/**createTime*/
-    @ApiModelProperty(value = "createTime")
-	private Date createTime;
-	/**updateTime*/
-    @ApiModelProperty(value = "updateTime")
-	private Date updateTime;
-
-    public ByteDanceCampaign() {
-    }
-
-    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.advertiserId = advertiserId;
-		this.toutiaoId = toutiaoId;
-		this.name = name;
-		this.budget = budget;
-		this.budgetMode = budgetMode;
-		this.landingType = landingType;
-		this.modifyTime = modifyTime;
-		this.status = status;
-		this.optStatus = optStatus;
-		this.campaignCreateTime = campaignCreateTime;
-		this.campaignModifyTime = campaignModifyTime;
-		this.createTime = createTime;
-		this.updateTime = updateTime;
-    }
-
-    public ByteDanceCampaign(JSONObject dataObject, String accountId) {
-		Long id = dataObject.getLong("id");
-		this.id = id;
-		this.advertiserId = accountId;
-		Long toutiaoId = dataObject.getLong("advertiser_id");
-		if (null!=toutiaoId){
-			this.toutiaoId =toutiaoId;
-		}
-		String name = dataObject.getString("name");
-		if (null!=name&&!"".equals(name.trim())){
-			this.name =name;
-		}
-		BigDecimal budget = dataObject.getBigDecimal("budget");
-		if (null!=budget){
-			this.budget =budget;
-		}
-		String budgetMode = dataObject.getString("budget_mode");
-		if (null!=budgetMode&&!"".equals(budgetMode.trim())){
-			this.budgetMode =budgetMode;
-		}
-		String landingType = dataObject.getString("landing_type");
-		if (null!=landingType&&!"".equals(landingType.trim())){
-			this.landingType =landingType;
-		}
-        String modifyTime = dataObject.getString("modify_time");
-        if (null != modifyTime && !"".equals(modifyTime.trim())) {
-            this.modifyTime = modifyTime;
-		}
-		String status = dataObject.getString("status");
-		if (null!=status&&!"".equals(status.trim())){
-			this.status =status;
-		}
-		String optStatus = dataObject.getString("opt_status");
-		if (null!=optStatus&&!"".equals(optStatus.trim())){
-			this.optStatus =optStatus;
-		}
-        String campaignCreateTime = dataObject.getString("campaign_create_time ");
-        if (null != campaignCreateTime && !"".equals(campaignCreateTime.trim())) {
-            this.campaignCreateTime = campaignCreateTime;
-        }
-        String campaignModifyTime = dataObject.getString("campaign_modify_time");
-        if (null != campaignModifyTime && !"".equals(campaignModifyTime.trim())) {
-            this.campaignModifyTime = campaignModifyTime;
-        }
-		Date now = new Date();
-		this.createTime = now;
-		this.updateTime = now;
-    }
-
-    public ByteDanceCampaign(Long id, CtopOauthToken oauthToken, String campaignName, String budgetMode, Integer budget, String landingType) {
-		this.id = id;
-		this.advertiserId = oauthToken.getAdvertiserId();
-		this.name = campaignName;
-		this.budgetMode = budgetMode;
-		this.budget = BigDecimal.valueOf(budget);
-		this.landingType = landingType;
-		this.toutiaoId = oauthToken.getAccountId();
-		Date now = new Date();
-		this.createTime = now;
-		this.updateTime = now;
-	}
-
-    public ByteDanceCampaign(Long id, CtopOauthToken token, ByteDanceCampaignTemplate template) {
-		this.id = id;
-		this.advertiserId = token.getAdvertiserId();
-		this.name = template.getCampaignName();
-		this.budgetMode = template.getCampaignBudget();
-		this.budget = new BigDecimal(template.getBudgetDaily());
-        this.landingType = template.getPromotionPurpose();
-		this.toutiaoId = token.getAccountId();
-		this.templateId = template.getId();
-		Date now = new Date();
-		this.createTime = now;
-		this.updateTime = now;
-	}
-}

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

@@ -1,86 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * 今日头条广告组模板信息
- * @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.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 平台广告主id
-     * advertiserId
-     */
-    @ApiModelProperty(value = "advertiser_id")
-    private String advertiserId;
-    /**
-     * 推广目的
-     */
-    @Excel(name = "推广目的", width = 15)
-    @ApiModelProperty(value = "推广目的")
-    @Dict(dicCode = "toutiao_promotion_purpose_type")
-    private String promotionPurpose;
-    /**
-     * 投放方式
-     */
-    @Excel(name = "投放方式", width = 15)
-    @ApiModelProperty(value = "投放方式")
-    @Dict(dicCode = "toutiao_budget_mode")
-    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;
-
-    public ByteDanceCampaignTemplate() {
-    }
-}

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

@@ -1,157 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * @Description: 今日头条创意信息
- * @Author: jeecg-boot
- * @Date: 2019-07-22
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_bytedance_creative")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_creative对象", description = "今日头条创意信息")
-public class ByteDanceCreative {
-    
-	/**创意id*/
-    @TableId
-    @ApiModelProperty(value = "创意id")
-	private Long id;
-	/**广告计划id*/
-	@Excel(name = "广告计划id", width = 15)
-    @ApiModelProperty(value = "广告计划id")
-	private Long planId;
-	/**头条平台id*/
-	@Excel(name = "头条平台id", width = 15)
-    @ApiModelProperty(value = "头条平台id")
-	private Long toutiaoId;
-	/**本平台广告主id*/
-	@Excel(name = "本平台广告主id", width = 15)
-    @ApiModelProperty(value = "本平台广告主id")
-	private String accountId;
-	/**创意素材标题*/
-	@Excel(name = "创意素材标题", width = 15)
-    @ApiModelProperty(value = "创意素材标题")
-	private String title;
-	/**动态词包列表*/
-	@Excel(name = "动态词包列表", width = 15)
-    @ApiModelProperty(value = "动态词包列表")
-	private String creativeWordIds;
-	/**创意素材状态*/
-	@Excel(name = "创意素材状态", width = 15)
-    @ApiModelProperty(value = "创意素材状态")
-	private String status;
-	/**创意素材创作状态*/
-	@Excel(name = "创意素材创作状态", width = 15)
-    @ApiModelProperty(value = "创意素材创作状态")
-	private String optStatus;
-	/**创意素材类型*/
-	@Excel(name = "创意素材类型", width = 15)
-    @ApiModelProperty(value = "创意素材类型")
-	private String imageMode;
-	/**图片素材id列表*/
-	@Excel(name = "图片素材id列表", width = 15)
-    @ApiModelProperty(value = "图片素材id列表")
-	private String imageIds;
-	/**视频素材封面*/
-	@Excel(name = "视频素材封面", width = 15)
-    @ApiModelProperty(value = "视频素材封面")
-	private String imageId;
-	/**视频id*/
-	@Excel(name = "视频id", width = 15)
-    @ApiModelProperty(value = "视频id")
-	private String videoId;
-	/**创意审核信息*/
-	@Excel(name = "创意审核信息", width = 15)
-    @ApiModelProperty(value = "创意审核信息")
-	private String auditRejectReason;
-	/**第三方id*/
-	@Excel(name = "第三方id", width = 15)
-    @ApiModelProperty(value = "第三方id")
-	private String thirdPartyId;
-	/**广告创意创建时间*/
-	@Excel(name = "广告创意创建时间", width = 15)
-    @ApiModelProperty(value = "广告创意创建时间")
-	private String creativeCreateTime;
-	/**广告创意更新时间*/
-	@Excel(name = "广告创意更新时间", width = 15)
-    @ApiModelProperty(value = "广告创意更新时间")
-	private String creativeModifyTime;
-	/**createTime*/
-    @ApiModelProperty(value = "createTime")
-	private Date createTime;
-	/**updateTime*/
-    @ApiModelProperty(value = "updateTime")
-	private Date updateTime;
-
-    public ByteDanceCreative(JSONObject dataObject, String accountId) {
-		this.id = dataObject.getLong("creative_id");
-		this.planId = dataObject.getLong("ad_id");
-		this.toutiaoId = dataObject.getLong("advertiser_id");
-		this.accountId = accountId;
-		String title = dataObject.getString("title");
-		if (null!=title&&!"".equals(title.trim())){
-			this.title = title;
-		}
-        String creativeWordIds = dataObject.getString("creative_word_ids");
-        if (null != creativeWordIds && !"".equals(creativeWordIds.trim())) {
-            this.creativeWordIds = creativeWordIds;
-		}
-		String status = dataObject.getString("status");
-		if (null!=status&&!"".equals(status.trim())){
-			this.status = status;
-		}
-        String optStatus = dataObject.getString("opt_status");
-        if (null != optStatus && !"".equals(optStatus.trim())) {
-            this.optStatus = optStatus;
-        }
-        String imageMode = dataObject.getString("image_mode");
-        if (null != imageMode && !"".equals(imageMode.trim())) {
-            this.imageMode = imageMode;
-        }
-        String imageIds = dataObject.getString("image_ids");
-        if (null != imageIds && !"".equals(imageIds.trim())) {
-            this.imageIds = imageIds;
-        }
-        String imageId = dataObject.getString("image_id");
-        if (null != imageId && !"".equals(imageId.trim())) {
-            this.imageId = imageId;
-        }
-        String videoId = dataObject.getString("video_id");
-        if (null != videoId && !"".equals(videoId.trim())) {
-            this.videoId = videoId;
-        }
-        String thirdPartyId = dataObject.getString("third_party_id");
-        if (null != thirdPartyId && !"".equals(thirdPartyId.trim())) {
-            this.thirdPartyId = thirdPartyId;
-        }
-        String auditRejectReason = dataObject.getString("audit_reject_reason");
-        if (null != auditRejectReason && !"".equals(auditRejectReason.trim())) {
-            this.auditRejectReason = auditRejectReason;
-        }
-        String creativeCreateTime = dataObject.getString("creative_create_time");
-        if (null != creativeCreateTime && !"".equals(creativeCreateTime.trim())) {
-            this.creativeCreateTime = creativeCreateTime;
-        }
-        String creativeModifyTime = dataObject.getString("creative_modify_time");
-        if (null != creativeModifyTime && !"".equals(creativeModifyTime.trim())) {
-            this.creativeModifyTime = creativeModifyTime;
-		}
-		Date now = new Date();
-		this.createTime = now;
-		this.updateTime = now;
-	}
-
-}

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

@@ -1,110 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * @Description: 今日头条创意素材信息
- * @Author: jeecg-boot
- * @Date: 2019-07-22
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_bytedance_creative_material")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_creative_material对象", description = "今日头条创意素材信息")
-public class ByteDanceCreativeMaterial {
-    
-	/**素材id*/
-    @TableId
-    @ApiModelProperty(value = "素材id")
-	private Long id;
-	/**平台广告主id*/
-	@Excel(name = "平台广告主id", width = 15)
-    @ApiModelProperty(value = "平台广告主id")
-	private String advertiserId;
-	/**广告id*/
-	@Excel(name = "广告id", width = 15)
-    @ApiModelProperty(value = "广告id")
-	private Long adId;
-	/**头天广告主id*/
-	@Excel(name = "头天广告主id", width = 15)
-    @ApiModelProperty(value = "头天广告主id")
-	private Long toutiaoId;
-	/**创意标题*/
-	@Excel(name = "创意标题", width = 15)
-    @ApiModelProperty(value = "创意标题")
-	private String title;
-	/**创意状态*/
-	@Excel(name = "创意状态", width = 15)
-    @ApiModelProperty(value = "创意状态")
-    private String status;
-    /**
-     * 创意状态
-     */
-	@Excel(name = "创意状态", width = 15)
-	@ApiModelProperty(value = "创意状态")
-    private String optStatus;
-	/**创意类型*/
-	@Excel(name = "创意类型", width = 15)
-    @ApiModelProperty(value = "创意类型")
-	private String imageMode;
-	/**图片素材信息*/
-	@Excel(name = "图片素材信息", width = 15)
-    @ApiModelProperty(value = "图片素材信息")
-	private String imageInfo;
-	/**createTime*/
-    @ApiModelProperty(value = "createTime")
-	private Date createTime;
-	/**updateTime*/
-    @ApiModelProperty(value = "updateTime")
-	private Date updateTime;
-
-    public ByteDanceCreativeMaterial() {
-    }
-
-    public ByteDanceCreativeMaterial(JSONObject dataObject, String accountId) {
-		this.id = dataObject.getLong("id");
-		this.toutiaoId = dataObject.getLong("advertiser_id");
-
-		String status = dataObject.getString("status");
-		if (null!=status&&!"".equals(status.trim())){
-			this.status = status;
-		}
-
-        Long adId = dataObject.getLong("ad_id");
-        if (null != adId) {
-            this.adId = adId;
-		}
-
-		String title = dataObject.getString("title");
-		if (null!=title&&!"".equals(title.trim())){
-			this.title = title;
-		}
-
-        String imageMode = dataObject.getString("image_mode");
-        if (null != imageMode && !"".equals(imageMode.trim())) {
-            this.imageMode = imageMode;
-		}
-
-        String imageInfo = dataObject.getString("image_info");
-        if (null != imageInfo && !"".equals(imageInfo.trim())) {
-            this.imageInfo = imageInfo;
-		}
-
-        String optStatus = dataObject.getString("opt_status");
-        if (null != optStatus && !"".equals(optStatus.trim())) {
-            this.optStatus = optStatus;
-		}
-	}
-}

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

@@ -1,143 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * @Description: 广告创意模板
- * @Author: jeecg-boot
- * @Date: 2019-07-29
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_bytedance_creative_template")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_creative_template对象", description = "广告创意模板")
-public class ByteDanceCreativeTemplate {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 广告计划id
-     */
-    @Excel(name = "广告计划id", width = 15)
-    @ApiModelProperty(value = "广告计划id")
-    private Integer adId;
-    /**
-     * 视频id
-     */
-    @Excel(name = "视频id", width = 15)
-    @ApiModelProperty(value = "视频id")
-    private Integer videoId;
-    /**
-     * 图片id
-     */
-    @Excel(name = "图片id", width = 15)
-    @ApiModelProperty(value = "图片id")
-    private Integer imageId;
-    /**
-     * 创意文案
-     */
-    @Excel(name = "创意文案", width = 15)
-    @ApiModelProperty(value = "创意文案")
-    private String createText;
-    /**
-     * 来源
-     */
-    @Excel(name = "来源", width = 15)
-    @ApiModelProperty(value = "来源")
-    private String source;
-    /**
-     * 图片生成视频
-     */
-    @Excel(name = "图片生成视频", width = 15)
-    @ApiModelProperty(value = "图片生成视频")
-    private String imageToVideo;
-    /**
-     * 最优衍生计划
-     */
-    @Excel(name = "最优衍生计划", width = 15)
-    @ApiModelProperty(value = "最优衍生计划")
-    private String derivativePlan;
-    /**
-     * 是否开启广告评论
-     */
-    @Excel(name = "是否开启广告评论", width = 15)
-    @ApiModelProperty(value = "是否开启广告评论")
-    private String commentOpen;
-    /**
-     * 展现方式
-     */
-    @Excel(name = "展现方式", width = 15)
-    @ApiModelProperty(value = "展现方式")
-    private String presentType;
-    /**
-     * 创意分类
-     */
-    @Excel(name = "创意分类", width = 15)
-    @ApiModelProperty(value = "创意分类")
-    private String creativeCategory;
-    /**
-     * 创意标签
-     */
-    @Excel(name = "创意标签", width = 15)
-    @ApiModelProperty(value = "创意标签")
-    private String createTitle;
-    /**
-     * 第三方监测链接展示
-     */
-    @Excel(name = "第三方监测链接展示", width = 15)
-    @ApiModelProperty(value = "第三方监测链接展示")
-    private String monitorLinkDisplay;
-    /**
-     * 第三方监测链接点击
-     */
-    @Excel(name = "第三方监测链接点击", width = 15)
-    @ApiModelProperty(value = "第三方监测链接点击")
-    private String monitorLinkClick;
-    /**
-     * 第三方监测链接视频播放
-     */
-    @Excel(name = "第三方监测链接视频播放", width = 15)
-    @ApiModelProperty(value = "第三方监测链接视频播放")
-    private String monitorLinkPlay;
-    /**
-     * 第三方监测链接视频播完
-     */
-    @Excel(name = "第三方监测链接视频播完", width = 15)
-    @ApiModelProperty(value = "第三方监测链接视频播完")
-    private String monitorLinkPlayed;
-    /**
-     * 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;
-
-    public ByteDanceCreativeTemplate() {
-    }
-}

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

@@ -1,121 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * @Description: 人群包信息
- * @Author: jeecg-boot
- * @Date: 2019-07-23
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_bytedance_custom_audience")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_custom_audience对象", description = "人群包信息")
-public class ByteDanceCustomAudience {
-
-    /**
-     * id
-     */
-    @TableId
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 广告主id
-     */
-    @Excel(name = "广告主id", width = 15)
-    @ApiModelProperty(value = "广告主id")
-    private String advertiserId;
-    /**
-     * 头条账号id
-     */
-    @Excel(name = "头条账号id", width = 15)
-    @ApiModelProperty(value = "头条账号id")
-    private Long accountId;
-    /**
-     * 是否删除
-     */
-    @Excel(name = "是否删除", width = 15)
-    @ApiModelProperty(value = "是否删除")
-    private Integer isdel;
-    /**
-     * 数据源id
-     */
-    @Excel(name = "数据源id", width = 15)
-    @ApiModelProperty(value = "数据源id")
-    private String dataSourceId;
-    /**
-     * 人群包名称
-     */
-    @Excel(name = "人群包名称", width = 15)
-    @ApiModelProperty(value = "人群包名称")
-    private String name;
-    /**
-     * 人群包来源
-     */
-    @Excel(name = "人群包来源", width = 15)
-    @ApiModelProperty(value = "人群包来源")
-    private String source;
-    /**
-     * 人群包状态
-     */
-    @Excel(name = "人群包状态", width = 15)
-    @ApiModelProperty(value = "人群包状态")
-    private Integer status;
-    /**
-     * 人群包覆盖人群数目
-     */
-    @Excel(name = "人群包覆盖人群数目", width = 15)
-    @ApiModelProperty(value = "人群包覆盖人群数目")
-    private Long coverNum;
-    /**
-     * 上传类型人群包包含人群数目
-     */
-    @Excel(name = "上传类型人群包包含人群数目", width = 15)
-    @ApiModelProperty(value = "上传类型人群包包含人群数目")
-    private Long uploadNum;
-    /**
-     * 人群分组
-     */
-    @Excel(name = "人群分组", width = 15)
-    @ApiModelProperty(value = "人群分组")
-    private String tag;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-
-    public ByteDanceCustomAudience() {
-    }
-
-    public ByteDanceCustomAudience(CtopOauthToken token, JSONObject dataObject) {
-        this.id = dataObject.getLong("custom_audience_id");
-        this.accountId = token.getAccountId();
-        this.advertiserId = token.getAdvertiserId();
-        this.isdel = dataObject.getInteger("isdel");
-        this.dataSourceId = dataObject.getString("custom_audience_id");
-        this.name = dataObject.getString("name");
-        this.source = dataObject.getString("source");
-        this.status = dataObject.getInteger("status");
-        this.coverNum = dataObject.getLong("cover_num");
-        this.uploadNum = dataObject.getLong("upload_num");
-        this.tag = dataObject.getString("tag");
-    }
-}

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

@@ -1,123 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * @Description: 头条图片素材信息
- * @Author: jeecg-boot
- * @Date: 2019-07-29
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_bytedance_image_info")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_image_info对象", description = "头条图片素材信息")
-public class ByteDanceImageInfo {
-
-    /**
-     * id
-     */
-    @TableId
-    @ApiModelProperty(value = "id")
-    private String id;
-    /**
-     * 文件id
-     */
-    @Excel(name = "文件id", width = 15)
-    @ApiModelProperty(value = "文件id")
-    private String fileId;
-    /**
-     * 头条平台账号id
-     */
-    @Excel(name = "头条平台账号id", width = 15)
-    @ApiModelProperty(value = "头条平台账号id")
-    private Long accountId;
-    @Excel(name = "平台账号id", width = 15)
-    @ApiModelProperty(value = "平台账号id")
-    private String advertiserId;
-
-    /**
-     * 图片大小
-     */
-    @Excel(name = "图片大小", width = 15)
-    @ApiModelProperty(value = "图片大小")
-    private Long size;
-    /**
-     * 图片宽度
-     */
-    @Excel(name = "图片宽度", width = 15)
-    @ApiModelProperty(value = "图片宽度")
-    private Integer width;
-    /**
-     * 图片高度
-     */
-    @Excel(name = "图片高度", width = 15)
-    @ApiModelProperty(value = "图片高度")
-    private Integer height;
-    /**
-     * 预览地址
-     */
-    @Excel(name = "预览地址", width = 15)
-    @ApiModelProperty(value = "预览地址")
-    private String url;
-    /**
-     * 图片格式
-     */
-    @Excel(name = "图片格式", width = 15)
-    @ApiModelProperty(value = "图片格式")
-    private String format;
-    /**
-     * 图片Md5
-     */
-    @Excel(name = "图片Md5", width = 15)
-    @ApiModelProperty(value = "图片Md5")
-    private String signature;
-    /**
-     * 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;
-
-    public ByteDanceImageInfo(JSONObject data, CtopOauthToken token) {
-        this.id = data.getString("id");
-        this.fileId = id;
-        this.accountId = token.getAccountId();
-        this.advertiserId = token.getAdvertiserId();
-        this.width = data.getInteger("width");
-        this.height = data.getInteger("width");
-        this.size = data.getLong("size");
-        this.url = data.getString("url");
-        this.format = data.getString("format");
-        this.signature = data.getString("signature");
-        this.status = 1;
-        Date now = new Date();
-        this.createTime = now;
-        this.updateTime = now;
-    }
-
-    public ByteDanceImageInfo() {
-
-    }
-}

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

@@ -1,387 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import cn.com.ctop.common.utils.HttpUtils;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-import java.util.LinkedHashMap;
-
-/**
- * 今日头条受众模板信息
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-07-23
- */
-@Data
-@TableName("ctop_bytedance_user_orientation_template")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_user_orientation_template对象", description = "今日头条受众模板信息")
-public class ByteDanceUserOrientationTemplate {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 平台广告主id
-     * userId
-     */
-    @Excel(name = "用户id")
-    @ApiModelProperty(value = "user_id")
-    private String userId;
-    /**
-     * 模板名称
-     */
-    @Excel(name = "模板名称", width = 15)
-    @ApiModelProperty(value = "模板名称")
-    private String name;
-    /**
-     * 受众性别
-     */
-    @Excel(name = "受众性别", width = 15)
-    @ApiModelProperty(value = "受众性别")
-    private String gender;
-    /**
-     * 年龄
-     */
-    @Excel(name = "年龄", width = 15)
-    @ApiModelProperty(value = "年龄")
-    private String age;
-    /**
-     * 受众最低android版本
-     */
-    @Excel(name = "受众最低android版本", width = 15)
-    @ApiModelProperty(value = "受众最低android版本")
-    private String androidOsv;
-    /**
-     * 受众最低ios版本
-     */
-    @Excel(name = "受众最低ios版本", width = 15)
-    @ApiModelProperty(value = "受众最低ios版本")
-    private String iosOsv;
-    /**
-     * 运营商类型
-     */
-    @Excel(name = "运营商类型", width = 15)
-    @ApiModelProperty(value = "运营商类型")
-    private String carrier;
-    /**
-     * 受众网络类型
-     */
-    @Excel(name = "受众网络类型", width = 15)
-    @ApiModelProperty(value = "受众网络类型")
-    private String ac;
-    /**
-     * 手机品牌
-     */
-    @Excel(name = "手机品牌", width = 15)
-    @ApiModelProperty(value = "手机品牌")
-    private String deviceBrand;
-    /**
-     * 受众文章分类
-     */
-    @Excel(name = "受众文章分类", width = 15)
-    @ApiModelProperty(value = "受众文章分类")
-    private String articleCategory;
-    /**
-     * 用户首次激活时间
-     */
-    @Excel(name = "用户首次激活时间", width = 15)
-    @ApiModelProperty(value = "用户首次激活时间")
-    private String activateType;
-    /**
-     * 受众平台
-     */
-    @Excel(name = "受众平台", width = 15)
-    @ApiModelProperty(value = "受众平台")
-    private String platform;
-    /**
-     * 地域定向城市或者区县列表
-     */
-    @Excel(name = "地域定向城市或者区县列表", width = 15)
-    @ApiModelProperty(value = "地域定向城市或者区县列表")
-    private String city;
-    /**
-     * 商圈ID数组
-     */
-    @Excel(name = "商圈ID数组", width = 15)
-    @ApiModelProperty(value = "商圈ID数组")
-    private String businessIds;
-    /**
-     * 地域类型
-     */
-    @Excel(name = "地域类型", width = 15)
-    @ApiModelProperty(value = "地域类型")
-    private String district;
-    /**
-     * 受众位置类型
-     */
-    @Excel(name = "受众位置类型", width = 15)
-    @ApiModelProperty(value = "受众位置类型")
-    private String locationType;
-    /**
-     * 兴趣分类
-     */
-    @Excel(name = "兴趣分类", width = 15)
-    @ApiModelProperty(value = "兴趣分类")
-    private String adTag;
-    /**
-     * 兴趣关键词, 传入具体的词id,非兴趣词包id
-     */
-    @Excel(name = "兴趣关键词, 传入具体的词id,非兴趣词包id", width = 15)
-    @ApiModelProperty(value = "兴趣关键词, 传入具体的词id,非兴趣词包id")
-    private String interestTags;
-    /**
-     * 行为定向
-     */
-    @Excel(name = "行为定向", width = 15)
-    @ApiModelProperty(value = "行为定向")
-    private String appBehaviorTarget;
-    /**
-     * APP行为定向,分类集合
-     */
-    @Excel(name = "APP行为定向,分类集合", width = 15)
-    @ApiModelProperty(value = "APP行为定向,分类集合")
-    private String appCategory;
-    /**
-     * APP行为定向,APP集合
-     */
-    @Excel(name = "APP行为定向,APP集合", width = 15)
-    @ApiModelProperty(value = "APP行为定向,APP集合")
-    private String appIds;
-    /**
-     * 产品目录ID(ID由查询产品目录接口得到)
-     */
-    @Excel(name = "产品目录ID(ID由查询产品目录接口得到)", width = 15)
-    @ApiModelProperty(value = "产品目录ID(ID由查询产品目录接口得到)")
-    private String productPlatformId;
-    /**
-     * H5地址参数
-     */
-    @Excel(name = "H5地址参数", width = 15)
-    @ApiModelProperty(value = "H5地址参数")
-    private String externalUrlParams;
-    /**
-     * 直达链接参数
-     */
-    @Excel(name = "直达链接参数", width = 15)
-    @ApiModelProperty(value = "直达链接参数")
-    private String openUrlParams;
-    /**
-     * 是否自定义商品定向
-     */
-    @Excel(name = "是否自定义商品定向", width = 15)
-    @ApiModelProperty(value = "是否自定义商品定向")
-    private String dpaLocalAudience;
-    /**
-     * 排除人群包
-     */
-    @Excel(name = "排除人群包", width = 15)
-    @ApiModelProperty(value = "排除人群包")
-    private String excludeCustomActions;
-    /**
-     * 包含人群包
-     */
-    @Excel(name = "包含人群包", width = 15)
-    @ApiModelProperty(value = "包含人群包")
-    private String includeCustomActions;
-    /**
-     * 精选流量包
-     */
-    @Excel(name = "精选流量包", width = 15)
-    @ApiModelProperty(value = "精选流量包")
-    private String superiorPopularityType;
-    /**
-     * 定向流量包ID数组
-     */
-    @Excel(name = "定向流量包ID数组", width = 15)
-    @ApiModelProperty(value = "定向流量包ID数组")
-    private String flowPackage;
-    /**
-     * 排除流量包ID数组
-     */
-    @Excel(name = "排除流量包ID数组", width = 15)
-    @ApiModelProperty(value = "排除流量包ID数组")
-    private String excludeFlowPackage;
-
-    /**
-     * 智能放量
-     */
-    @Excel(name = "是否开启智能放量", width = 15)
-    @ApiModelProperty(value = "是否开启智能放量")
-    private String autoExtendEnabled;
-
-    @Excel(name = "区域类型", width = 15)
-    @ApiModelProperty(value = "区域类型")
-    private String areaType;
-
-    @Excel(name = "兴趣类型", width = 15)
-    @ApiModelProperty(value = "兴趣类型")
-    private String intrestType;
-
-    @Excel(name = "文章分类类型", width = 15)
-    @ApiModelProperty(value = "文章分类类型")
-    private String articleCategoryType;
-
-    @Excel(name = "手机品牌", width = 15)
-    @ApiModelProperty(value = "手机品牌")
-    private String mobileBrand;
-
-    private String cityStr;
-
-    private String districtStr;
-
-    private String adTagStr;
-
-    /**
-     * 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;
-
-    public ByteDanceUserOrientationTemplate() {
-    }
-
-    public ByteDanceUserOrientationTemplate(String userId, JSONObject template) {
-        this.userId = userId;
-        String name = template.getString("name");
-        if (null != name && !name.equals("")) {
-            this.name = name;
-        } else {
-            this.name = "汇创思拓_" + System.currentTimeMillis() + "定向模板";
-        }
-
-        String gender = template.getString("genden");
-        if (null != gender && !gender.equals("")) {
-            this.gender = gender;
-        } else {
-            this.gender = "NONE";
-        }
-        JSONArray ageRange = template.getJSONArray("ageRange");
-        if (null != ageRange) {
-            this.age = ageRange.toJSONString();
-        }
-        //兴趣定向类别
-        String intrestType = template.getString("intrestType");
-        if (null != intrestType && !intrestType.equals("")) {
-            this.intrestType = intrestType;
-            if ("NONE".equals(intrestType)) {
-                this.adTag = "[]";
-            } else if ("SYSTEM_TJ".equals(intrestType)) {
-                this.adTag = "[" + 0 + "]";
-            } else {
-                //兴趣分类
-                JSONArray categoryList = template.getJSONArray("intrestCategoryList");
-                JSONArray tags = new JSONArray();
-                JSONArray adTagStr = new JSONArray();
-                if (null != categoryList && categoryList.size() > 0) {
-                    categoryList.forEach(category -> {
-                        JSONObject categoryObject = JSONObject.parseObject(JSONObject.toJSONString(category));
-                        adTagStr.add(categoryObject);
-                        Long id = categoryObject.getLong("value");
-                        tags.add(id);
-                    });
-                }
-                this.adTag = tags.toJSONString();
-                this.adTagStr = adTagStr.toJSONString();
-
-            }
-        }
-        String platformType = template.getString("platformType");
-        if (null != platformType && !"".equals(platformType)) {
-            this.platform = platformType;
-        }
-        String areaType = template.getString("areaType");
-        if (null != areaType && !"".equals(areaType)) {
-            this.areaType = areaType;
-        }
-        JSONArray netType = template.getJSONArray("netType");
-        if (null != netType) {
-            this.ac = netType.toJSONString();
-        }
-        String smartFl = template.getString("smartFl");
-        if (null != smartFl && !"".equals(smartFl)) {
-            this.autoExtendEnabled = smartFl;
-        }
-        String isArticleCategory = template.getString("isArticleCategory");
-        if (null != isArticleCategory && !"".equals(isArticleCategory)) {
-            this.articleCategoryType = isArticleCategory;
-            if ("CATEGORY".equals(isArticleCategory)) {
-                this.articleCategory = template.getJSONArray("tags").toJSONString();
-            }
-        }
-        String isMobileBrand = template.getString("isMobileBrand");
-        if (null != isMobileBrand && !"".equals(isMobileBrand)) {
-            this.mobileBrand = isMobileBrand;
-            if ("BRAND".equals(isArticleCategory)) {
-                this.deviceBrand = template.getJSONArray("mobileType").toJSONString();
-            }
-        }
-        JSONArray cityList = template.getJSONArray("cityList");
-        JSONArray cityArray = new JSONArray();
-        JSONArray cityStr = new JSONArray();
-        if (null != cityList && cityList.size() > 0) {
-            cityList.forEach(city -> {
-                JSONObject cityObject = JSONObject.parseObject(JSONObject.toJSONString(city));
-                cityStr.add(cityObject);
-                Long id = cityObject.getLong("value");
-                cityArray.add(id);
-            });
-        }
-        this.city = cityArray.toJSONString();
-        this.cityStr = cityStr.toJSONString();
-
-        JSONArray areaList = template.getJSONArray("areaList");
-        JSONArray areaArray = new JSONArray();
-        JSONArray areaStr = new JSONArray();
-        if (null != areaList && areaList.size() > 0) {
-            areaList.forEach(area -> {
-                JSONObject areaObject = JSONObject.parseObject(JSONObject.toJSONString(area));
-                areaStr.add(areaObject);
-                Long id = areaObject.getLong("value");
-                areaArray.add(id);
-            });
-        }
-        this.district = areaArray.toJSONString();
-        this.districtStr = areaStr.toJSONString();
-
-        //兴趣关键词
-        JSONArray intrestTagList = template.getJSONArray("intrestTagList");
-        JSONArray intrestTagArray = new JSONArray();
-        if (null != intrestTagList && intrestTagList.size() > 0) {
-            intrestTagList.forEach(intrestCategory -> {
-                JSONObject intrestCategoryObject = JSONObject.parseObject(JSONObject.toJSONString(intrestCategory));
-                Long id = intrestCategoryObject.getLong("value");
-                intrestTagArray.add(id);
-            });
-        }
-        this.interestTags = areaArray.toJSONString();
-    }
-}

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

@@ -1,117 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * @Description: 今日头条视频素材信息
- * @Author: jeecg-boot
- * @Date: 2019-07-29
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_bytedance_video_info")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_video_info对象", description = "今日头条视频素材信息")
-public class ByteDanceVideoInfo {
-
-    /**
-     * id
-     */
-    @TableId()
-    @ApiModelProperty(value = "id")
-    private String id;
-    /**
-     * 对应本文件id
-     */
-    @Excel(name = "对应本文件id", width = 15)
-    @ApiModelProperty(value = "对应本文件id")
-    private String fileId;
-    /**
-     * 平台账号id
-     */
-    @Excel(name = "平台账号id", width = 15)
-    @ApiModelProperty(value = "平台账号id")
-    private String advertiserId;
-    /**
-     * 对应本文件id
-     */
-    @Excel(name = "头条账号id", width = 15)
-    @ApiModelProperty(value = "头条账号id")
-    private Long accountId;
-    /**
-     * 视频宽度
-     */
-    @Excel(name = "视频宽度", width = 15)
-    @ApiModelProperty(value = "视频宽度")
-    private Integer width;
-    /**
-     * 视频高度
-     */
-    @Excel(name = "视频高度", width = 15)
-    @ApiModelProperty(value = "视频高度")
-    private Integer height;
-    /**
-     * 视频时长
-     */
-    @Excel(name = "视频时长", width = 15)
-    @ApiModelProperty(value = "视频时长")
-    private Double duration;
-    /**
-     * 视频大小
-     */
-    @Excel(name = "视频大小", width = 15)
-    @ApiModelProperty(value = "视频大小")
-    private Long size;
-    /**
-     * 视频地址
-     */
-    @Excel(name = "视频地址", width = 15)
-    @ApiModelProperty(value = "视频地址")
-    private String videoUrl;
-    /**
-     * 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;
-
-    public ByteDanceVideoInfo(JSONObject data, CtopOauthToken token) {
-        this.id = data.getString("video_id");
-        this.fileId = id;
-        this.accountId = token.getAccountId();
-        this.advertiserId = token.getAdvertiserId();
-        this.width = data.getInteger("width");
-        this.height = data.getInteger("width");
-        this.size = data.getLong("size");
-        this.duration = data.getDouble("duration");
-        this.videoUrl = data.getString("video_url");
-        this.status = 1;
-        Date now = new Date();
-        this.createTime = now;
-        this.updateTime = now;
-    }
-
-    public ByteDanceVideoInfo() {
-    }
-}

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

@@ -1,96 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * 广告计划模板信息
- * @author jeecg-boot
- * @date 2019-07-28
- * @version V1.0
- */
-@Data
-@TableName("ctop_bytedance_advertise_plan_template")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_advertise_plan_template对象", description = "广告计划模板信息")
-public class BytedanceAdvertisePlanTemplate {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 广告组模板id
-     */
-    @Excel(name = "广告组模板id", width = 15)
-    @ApiModelProperty(value = "广告组模板id")
-    private Long campaignTemplateId;
-
-    /**
-     * 投放范围
-     */
-    @Excel(name = "投放范围", width = 15)
-    @ApiModelProperty(value = "投放范围")
-    @Dict(dicCode = "toutiao_advertising_scope")
-    private String deliveryRange;
-    /**
-     * 用户定向模板id
-     */
-    @Excel(name = "用户定向模板id", width = 15)
-    @ApiModelProperty(value = "用户定向模板id")
-    private Long userOrentationTemplateId;
-    /**
-     * 预算与出价模板id
-     */
-    @Excel(name = "预算与出价模板id", width = 15)
-    @ApiModelProperty(value = "预算与出价模板id")
-    private Long budgetTemplateId;
-    /**
-     * 投放目标模板id
-     */
-    @Excel(name = "投放目标模板id", width = 15)
-    @ApiModelProperty(value = "投放目标模板id")
-    private Integer deliveryTargetTemplateId;
-
-    /**
-     * 模板状态
-     */
-    @Excel(name = "模板状态", width = 15)
-    @ApiModelProperty(value = "模板状态")
-    private Integer status;
-
-    /**
-     * 模板名称
-     */
-    @Excel(name = "模板名称", width = 15)
-    @ApiModelProperty(value = "模板名称")
-    private String name;
-
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-
-
-    public BytedanceAdvertisePlanTemplate() {
-    }
-}

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

@@ -1,602 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 广告主日报表
- * @author jeecg-boot
- * @date 2019-09-10
- * @version V1.0
- */
-@Data
-@TableName("ctop_bytedance_report_advertiser_daily")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_report_advertiser_daily对象", description = "广告主日报表")
-public class BytedanceAdvertiserDailyReport {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 广告主id
-     */
-    @Excel(name = "广告主id", width = 15)
-    @ApiModelProperty(value = "广告主id")
-    private Long advertiserId;
-    /**
-     * 数据起始时间
-     */
-    @Excel(name = "数据起始时间", width = 15)
-    @ApiModelProperty(value = "数据起始时间")
-    private String statDatetime;
-    /**
-     * 展示量
-     */
-    @Excel(name = "展示量", width = 15)
-    @ApiModelProperty(value = "展示量")
-    private Long showNum;
-    /**
-     * 点击量
-     */
-    @Excel(name = "点击量", width = 15)
-    @ApiModelProperty(value = "点击量")
-    private Long click;
-    /**
-     * 转化量
-     */
-    @Excel(name = "转化量", width = 15)
-    @ApiModelProperty(value = "转化量")
-    private Long convertNum;
-    /**
-     * 总花费
-     */
-    @Excel(name = "总花费", width = 15)
-    @ApiModelProperty(value = "总花费")
-    private java.math.BigDecimal cost;
-    /**
-     * 应用下载-激活
-     */
-    @Excel(name = "应用下载-激活", width = 15)
-    @ApiModelProperty(value = "应用下载-激活")
-    private Long active;
-    /**
-     * 应用下载-安卓下载完成
-     */
-    @Excel(name = "应用下载-安卓下载完成", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓下载完成")
-    private Long downloadFinish;
-    /**
-     * 应用下载-安卓下载开始
-     */
-    @Excel(name = "应用下载-安卓下载开始", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓下载开始")
-    private Long downloadStart;
-    /**
-     * 应用下载-点击安装数
-     */
-    @Excel(name = "应用下载-点击安装数", width = 15)
-    @ApiModelProperty(value = "应用下载-点击安装数")
-    private Long clickInstall;
-    /**
-     * 应用下载-安卓安装完成
-     */
-    @Excel(name = "应用下载-安卓安装完成", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓安装完成")
-    private Long installFinish;
-    /**
-     * 应用下载-注册
-     */
-    @Excel(name = "应用下载-注册", width = 15)
-    @ApiModelProperty(value = "应用下载-注册")
-    private Long register;
-    /**
-     * 应用下载-付费数
-     */
-    @Excel(name = "应用下载-付费数", width = 15)
-    @ApiModelProperty(value = "应用下载-付费数")
-    private Long payCount;
-    /**
-     * 应用下载-到达uv
-     */
-    @Excel(name = "应用下载-到达uv", width = 15)
-    @ApiModelProperty(value = "应用下载-到达uv")
-    private Long inAppUv;
-    /**
-     * 应用下载-详情页到站uv
-     */
-    @Excel(name = "应用下载-详情页到站uv", width = 15)
-    @ApiModelProperty(value = "应用下载-详情页到站uv")
-    private Long inAppDetailUv;
-    /**
-     * 应用下载-加入购物车
-     */
-    @Excel(name = "应用下载-加入购物车", width = 15)
-    @ApiModelProperty(value = "应用下载-加入购物车")
-    private Long inAppCart;
-    /**
-     * 应用下载-提交订单
-     */
-    @Excel(name = "应用下载-提交订单", width = 15)
-    @ApiModelProperty(value = "应用下载-提交订单")
-    private Long inAppOrder;
-    /**
-     * 应用下载-付费
-     */
-    @Excel(name = "应用下载-付费", width = 15)
-    @ApiModelProperty(value = "应用下载-付费")
-    private Long inAppPay;
-    /**
-     * 落地页-电话拨打数
-     */
-    @Excel(name = "落地页-电话拨打数", width = 15)
-    @ApiModelProperty(value = "落地页-电话拨打数")
-    private Long phone;
-    /**
-     * 表单提交数
-     */
-    @Excel(name = "表单提交数", width = 15)
-    @ApiModelProperty(value = "表单提交数")
-    private Long form;
-    /**
-     * 落地页-地图搜索
-     */
-    @Excel(name = "落地页-地图搜索", width = 15)
-    @ApiModelProperty(value = "落地页-地图搜索")
-    private Long mapSearch;
-    /**
-     * 落地页-按钮button
-     */
-    @Excel(name = "落地页-按钮button", width = 15)
-    @ApiModelProperty(value = "落地页-按钮button")
-    private Long button;
-    /**
-     * 落地页-关键页面浏览
-     */
-    @Excel(name = "落地页-关键页面浏览", width = 15)
-    @ApiModelProperty(value = "落地页-关键页面浏览")
-    private Long view;
-    /**
-     * 落地页-QQ咨询数
-     */
-    @Excel(name = "落地页-QQ咨询数", width = 15)
-    @ApiModelProperty(value = "落地页-QQ咨询数")
-    private Long qq;
-    /**
-     * 落地页-抽奖数
-     */
-    @Excel(name = "落地页-抽奖数", width = 15)
-    @ApiModelProperty(value = "落地页-抽奖数")
-    private Long lottery;
-    /**
-     * 落地页-投票
-     */
-    @Excel(name = "落地页-投票", width = 15)
-    @ApiModelProperty(value = "落地页-投票")
-    private Long vote;
-    /**
-     * 落地页-页面跳转
-     */
-    @Excel(name = "落地页-页面跳转", width = 15)
-    @ApiModelProperty(value = "落地页-页面跳转")
-    private Long redirect;
-    /**
-     * 落地页-商品购买
-     */
-    @Excel(name = "落地页-商品购买", width = 15)
-    @ApiModelProperty(value = "落地页-商品购买")
-    private Long shopping;
-    /**
-     * 落地页-在线咨询
-     */
-    @Excel(name = "落地页-在线咨询", width = 15)
-    @ApiModelProperty(value = "落地页-在线咨询")
-    private Long consult;
-    /**
-     * 落地页-微信
-     */
-    @Excel(name = "落地页-微信", width = 15)
-    @ApiModelProperty(value = "落地页-微信")
-    private Long wechat;
-    /**
-     * 落地页-智能电话确认拨打
-     */
-    @Excel(name = "落地页-智能电话确认拨打", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话确认拨打")
-    private Long phoneConfirm;
-    /**
-     * 落地页-智能电话确认接通
-     */
-    @Excel(name = "落地页-智能电话确认接通", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话确认接通")
-    private Long phoneConnect;
-    /**
-     * 落地页-智能电话有效咨询
-     */
-    @Excel(name = "落地页-智能电话有效咨询", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话有效咨询")
-    private Long consultEffective;
-    /**
-     * 视频-总播放
-     */
-    @Excel(name = "视频-总播放", width = 15)
-    @ApiModelProperty(value = "视频-总播放")
-    private Long totalPlay;
-    /**
-     * 视频-有效播放
-     */
-    @Excel(name = "视频-有效播放", width = 15)
-    @ApiModelProperty(value = "视频-有效播放")
-    private Long validPlay;
-    /**
-     * 视频-wifi播放
-     */
-    @Excel(name = "视频-wifi播放", width = 15)
-    @ApiModelProperty(value = "视频-wifi播放")
-    private Long wifiPlay;
-    /**
-     * 视频-播放时长,单位ms
-     */
-    @Excel(name = "视频-播放时长,单位ms", width = 15)
-    @ApiModelProperty(value = "视频-播放时长,单位ms")
-    private Long playDurationSum;
-    /**
-     * 视频-播放25%进度总数
-     */
-    @Excel(name = "视频-播放25%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放25%进度总数")
-    private Long play25FeedBreak;
-    /**
-     * 视频-播放50%进度总数
-     */
-    @Excel(name = "视频-播放50%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放50%进度总数")
-    private Long play50FeedBreak;
-    /**
-     * 视频-播放75%进度总数
-     */
-    @Excel(name = "视频-播放75%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放75%进度总数")
-    private Long play75FeedBreak;
-    /**
-     * 视频-播放100%进度总数
-     */
-    @Excel(name = "视频-播放100%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放100%进度总数")
-    private Long play100FeedBreak;
-    /**
-     * 附加创意-电话按钮
-     */
-    @Excel(name = "附加创意-电话按钮", width = 15)
-    @ApiModelProperty(value = "附加创意-电话按钮")
-    private Long advancedCreativePhoneClick;
-    /**
-     * 附加创意-在线咨询
-     */
-    @Excel(name = "附加创意-在线咨询", width = 15)
-    @ApiModelProperty(value = "附加创意-在线咨询")
-    private Long advancedCreativeCounselClick;
-    /**
-     * 附加创意-表单提交
-     */
-    @Excel(name = "附加创意-表单提交", width = 15)
-    @ApiModelProperty(value = "附加创意-表单提交")
-    private Long advancedCreativeFormClick;
-    /**
-     * 互动数据-分享数
-     */
-    @Excel(name = "互动数据-分享数", width = 15)
-    @ApiModelProperty(value = "互动数据-分享数")
-    private Long share;
-    /**
-     * 互动数据-评论数
-     */
-    @Excel(name = "互动数据-评论数", width = 15)
-    @ApiModelProperty(value = "互动数据-评论数")
-    private Long comment;
-    /**
-     * 互动数据-点赞数
-     */
-    @Excel(name = "互动数据-点赞数", width = 15)
-    @ApiModelProperty(value = "互动数据-点赞数")
-    private Long likeNum;
-    /**
-     * 互动数据-关注数
-     */
-    @Excel(name = "互动数据-关注数", width = 15)
-    @ApiModelProperty(value = "互动数据-关注数")
-    private Long follow;
-    /**
-     * 互动数据-主页访问量
-     */
-    @Excel(name = "互动数据-主页访问量", width = 15)
-    @ApiModelProperty(value = "互动数据-主页访问量")
-    private Long homeVisited;
-    /**
-     * 互动数据-挑战赛查看数
-     */
-    @Excel(name = "互动数据-挑战赛查看数", width = 15)
-    @ApiModelProperty(value = "互动数据-挑战赛查看数")
-    private Long iesChallengeClick;
-    /**
-     * 互动数据-音乐查看数
-     */
-    @Excel(name = "互动数据-音乐查看数", width = 15)
-    @ApiModelProperty(value = "互动数据-音乐查看数")
-    private Long iesMusicClick;
-    /**
-     * 互动数据-单次互动成本
-     */
-    @Excel(name = "互动数据-单次互动成本", width = 15)
-    @ApiModelProperty(value = "互动数据-单次互动成本")
-    private java.math.BigDecimal interactPerCost;
-    /**
-     * 次留数
-     */
-    @Excel(name = "次留数", width = 15)
-    @ApiModelProperty(value = "次留数")
-    private Long nextDayOpen;
-    /**
-     * 次留率
-     */
-    @Excel(name = "次留率", width = 15)
-    @ApiModelProperty(value = "次留率")
-    private java.math.BigDecimal nextDayOpenRate;
-    /**
-     * 次留成本
-     */
-    @Excel(name = "次留成本", width = 15)
-    @ApiModelProperty(value = "次留成本")
-    private java.math.BigDecimal nextDayOpenCost;
-    @Excel(name = "创建时间")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    @Excel(name = "修改时间")
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    public BytedanceAdvertiserDailyReport(JSONObject data) {
-        Long playFeedBreak75 = data.getLong("play_75_feed_break");
-        if (null != playFeedBreak75) {
-            this.play75FeedBreak = playFeedBreak75;
-        }
-        Long nextDayOpen = data.getLong("next_day_open");
-        if (null != nextDayOpen) {
-            this.nextDayOpen = nextDayOpen;
-        }
-        Long convertNum = data.getLong("convert");
-        if (null != convertNum) {
-            this.convertNum = convertNum;
-        }
-        Long inAppCart = data.getLong("in_app_cart");
-        if (null != inAppCart) {
-            this.inAppCart = inAppCart;
-        }
-        Long play25FeedBreak = data.getLong("play_25_feed_break");
-        if (null != play25FeedBreak) {
-            this.play25FeedBreak = play25FeedBreak;
-        }
-        Long consultEffective = data.getLong("consult_effective");
-        if (null != consultEffective) {
-            this.consultEffective = consultEffective;
-        }
-        Long view = data.getLong("view");
-        if (null != view) {
-            this.view = view;
-        }
-        Long phoneConfirm = data.getLong("phone_confirm");
-        if (null != phoneConfirm) {
-            this.phoneConfirm = phoneConfirm;
-        }
-        Long iesMusicClick = data.getLong("ies_music_click");
-        if (null != iesMusicClick) {
-            this.iesMusicClick = iesMusicClick;
-        }
-        Long wifiPlay = data.getLong("wifi_play");
-        if (null != wifiPlay) {
-            this.wifiPlay = wifiPlay;
-        }
-        String statDatetime = data.getString("stat_datetime");
-        if (null != statDatetime && !"".equals(statDatetime.trim())) {
-            this.statDatetime = statDatetime;
-        }
-        Long shopping = data.getLong("shopping");
-        if (null != shopping) {
-            this.shopping = shopping;
-        }
-        Long qq = data.getLong("qq");
-        if (null != qq) {
-            this.qq = qq;
-        }
-        Long like = data.getLong("like");
-        if (null != like) {
-            this.likeNum = like;
-        }
-        Long play50FeedBreak = data.getLong("play_50_feed_break");
-        if (null != play50FeedBreak) {
-            this.play50FeedBreak = play50FeedBreak;
-        }
-        Long active = data.getLong("active");
-        if (null != active) {
-            this.active = active;
-        }
-        Long click = data.getLong("click");
-        if (null != click) {
-            this.click = click;
-        }
-        Long advancedCreativePhoneClick = data.getLong("advanced_creative_phone_click");
-        if (null != advancedCreativePhoneClick) {
-            this.advancedCreativePhoneClick = advancedCreativePhoneClick;
-        }
-        Long downloadStart = data.getLong("download_start");
-        if (null != downloadStart) {
-            this.downloadStart = downloadStart;
-        }
-        Long homeVisited = data.getLong("home_visited");
-        if (null != homeVisited) {
-            this.homeVisited = homeVisited;
-        }
-        Long phone = data.getLong("phone");
-        if (null != phone) {
-            this.phone = phone;
-        }
-        Long inAppPay = data.getLong("in_app_pay");
-        if (null != inAppPay) {
-            this.inAppPay = inAppPay;
-        }
-        BigDecimal nextDayOpenCost = data.getBigDecimal("next_day_open_cost");
-        if (null != nextDayOpenCost) {
-            this.nextDayOpenCost = nextDayOpenCost;
-        }
-        Long iesChallengeClick = data.getLong("ies_challenge_click");
-        if (null != iesChallengeClick) {
-            this.iesChallengeClick = iesChallengeClick;
-        }
-        Long totalPlay = data.getLong("total_play");
-        if (null != totalPlay) {
-            this.totalPlay = totalPlay;
-        }
-        Long show = data.getLong("show");
-        if (null != show) {
-            this.showNum = show;
-        }
-        BigDecimal nextDayOpenRate = data.getBigDecimal("next_day_open_rate");
-        if (null != nextDayOpenRate) {
-            this.nextDayOpenRate = nextDayOpenRate;
-        }
-        Long mapSearch = data.getLong("map_search");
-        if (null != mapSearch) {
-            this.mapSearch = mapSearch;
-        }
-        Long clickInstall = data.getLong("click_install");
-        if (null != clickInstall) {
-            this.clickInstall = clickInstall;
-        }
-        BigDecimal interactPerCost = data.getBigDecimal("interact_per_cost");
-        if (null != interactPerCost) {
-            this.interactPerCost = interactPerCost;
-        }
-        Long advertiserId = data.getLong("advertiser_id");
-        if (null != advertiserId) {
-            this.advertiserId = advertiserId;
-        }
-        Long button = data.getLong("button");
-        if (null != button) {
-            this.button = button;
-        }
-        Long playDurationSum = data.getLong("play_duration_sum");
-        if (null != playDurationSum) {
-            this.playDurationSum = playDurationSum;
-        }
-        Long play100FeedBreak = data.getLong("play_100_feed_break");
-        if (null != play100FeedBreak) {
-            this.play100FeedBreak = play100FeedBreak;
-        }
-        Long advancedCreativeCounselClick = data.getLong("advanced_creative_counsel_click");
-        if (null != advancedCreativeCounselClick) {
-            this.advancedCreativeCounselClick = advancedCreativeCounselClick;
-        }
-        Long share = data.getLong("share");
-        if (null != share) {
-            this.share = share;
-        }
-        Long consult = data.getLong("consult");
-        if (null != consult) {
-            this.consult = consult;
-        }
-        Long vote = data.getLong("vote");
-        if (null != vote) {
-            this.vote = vote;
-        }
-        Long validPlay = data.getLong("valid_play");
-        if (null != validPlay) {
-            this.validPlay = validPlay;
-        }
-        Long redirect = data.getLong("redirect");
-        if (null != redirect) {
-            this.redirect = redirect;
-        }
-        Long payCount = data.getLong("pay_count");
-        if (null != payCount) {
-            this.payCount = payCount;
-        }
-        Long advancedCreativeFormClick = data.getLong("advanced_creative_form_click");
-        if (null != advancedCreativeFormClick) {
-            this.advancedCreativeFormClick = advancedCreativeFormClick;
-        }
-        BigDecimal cost = data.getBigDecimal("cost");
-        if (null != cost) {
-            this.cost = cost;
-        }
-        Long downloadFinish = data.getLong("download_finish");
-        if (null != downloadFinish) {
-            this.downloadFinish = downloadFinish;
-        }
-        Long wechat = data.getLong("wechat");
-        if (null != wechat) {
-            this.wechat = wechat;
-        }
-        Long lottery = data.getLong("lottery");
-        if (null != lottery) {
-            this.lottery = lottery;
-        }
-        Long inAppOrder = data.getLong("in_app_order");
-        if (null != inAppOrder) {
-            this.inAppOrder = inAppOrder;
-        }
-        Long installFinish = data.getLong("install_finish");
-        if (null != installFinish) {
-            this.installFinish = installFinish;
-        }
-        Long follow = data.getLong("follow");
-        if (null != follow) {
-            this.follow = follow;
-        }
-//		Long message = data.getLong("message");
-//		if(null!=message){
-//			this.message = message;
-//		}
-        Long inAppDetailUv = data.getLong("in_app_detail_uv");
-        if (null != inAppDetailUv) {
-            this.inAppDetailUv = inAppDetailUv;
-        }
-        Long form = data.getLong("form");
-        if (null != form) {
-            this.form = form;
-        }
-//		BigDecimal convert_cost = data.getBigDecimal("convert_cost");
-//		if(null!=convert_cost){
-//			this.convertCost = convert_cost;
-//		}
-        Long comment = data.getLong("comment");
-        if (null != comment) {
-            this.comment = comment;
-        }
-        Long inAppUv = data.getLong("in_app_uv");
-        if (null != inAppUv) {
-            this.inAppUv = inAppUv;
-        }
-        Long register = data.getLong("register");
-        if (null != register) {
-            this.register = register;
-        }
-    }
-
-    public BytedanceAdvertiserDailyReport() {
-    }
-}

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

@@ -1,606 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 广告主小时级别报表信息
- * @author jeecg-boot
- * @date 2019-09-10
- * @version V1.0
- */
-@Data
-@TableName("ctop_bytedance_report_advertiser_hourly")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_report_advertiser_hourly对象", description = "广告主小时级别报表信息")
-public class BytedanceAdvertiserHourlyReport {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 广告主id
-     */
-    @Excel(name = "广告主id", width = 15)
-    @ApiModelProperty(value = "广告主id")
-    private Long advertiserId;
-    /**
-     * 数据起始时间
-     */
-    @Excel(name = "数据起始时间", width = 15)
-    @ApiModelProperty(value = "数据起始时间")
-    private String statDatetime;
-    /**
-     * 展示量
-     */
-    @Excel(name = "展示量", width = 15)
-    @ApiModelProperty(value = "展示量")
-    private Long showNum;
-    /**
-     * 点击量
-     */
-    @Excel(name = "点击量", width = 15)
-    @ApiModelProperty(value = "点击量")
-    private Long click;
-    /**
-     * 转化量
-     */
-    @Excel(name = "转化量", width = 15)
-    @ApiModelProperty(value = "转化量")
-    private Long convertNum;
-    /**
-     * 总花费
-     */
-    @Excel(name = "总花费", width = 15)
-    @ApiModelProperty(value = "总花费")
-    private java.math.BigDecimal cost;
-    /**
-     * 应用下载-激活
-     */
-    @Excel(name = "应用下载-激活", width = 15)
-    @ApiModelProperty(value = "应用下载-激活")
-    private Long active;
-    /**
-     * 应用下载-安卓下载完成
-     */
-    @Excel(name = "应用下载-安卓下载完成", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓下载完成")
-    private Long downloadFinish;
-    /**
-     * 应用下载-安卓下载开始
-     */
-    @Excel(name = "应用下载-安卓下载开始", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓下载开始")
-    private Long downloadStart;
-    /**
-     * 应用下载-点击安装数
-     */
-    @Excel(name = "应用下载-点击安装数", width = 15)
-    @ApiModelProperty(value = "应用下载-点击安装数")
-    private Long clickInstall;
-    /**
-     * 应用下载-安卓安装完成
-     */
-    @Excel(name = "应用下载-安卓安装完成", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓安装完成")
-    private Long installFinish;
-    /**
-     * 应用下载-注册
-     */
-    @Excel(name = "应用下载-注册", width = 15)
-    @ApiModelProperty(value = "应用下载-注册")
-    private Long register;
-    /**
-     * 应用下载-付费数
-     */
-    @Excel(name = "应用下载-付费数", width = 15)
-    @ApiModelProperty(value = "应用下载-付费数")
-    private Long payCount;
-    /**
-     * 应用下载-到达uv
-     */
-    @Excel(name = "应用下载-到达uv", width = 15)
-    @ApiModelProperty(value = "应用下载-到达uv")
-    private Long inAppUv;
-    /**
-     * 应用下载-详情页到站uv
-     */
-    @Excel(name = "应用下载-详情页到站uv", width = 15)
-    @ApiModelProperty(value = "应用下载-详情页到站uv")
-    private Long inAppDetailUv;
-    /**
-     * 应用下载-加入购物车
-     */
-    @Excel(name = "应用下载-加入购物车", width = 15)
-    @ApiModelProperty(value = "应用下载-加入购物车")
-    private Long inAppCart;
-    /**
-     * 应用下载-提交订单
-     */
-    @Excel(name = "应用下载-提交订单", width = 15)
-    @ApiModelProperty(value = "应用下载-提交订单")
-    private Long inAppOrder;
-    /**
-     * 应用下载-付费
-     */
-    @Excel(name = "应用下载-付费", width = 15)
-    @ApiModelProperty(value = "应用下载-付费")
-    private Long inAppPay;
-    /**
-     * 落地页-电话拨打数
-     */
-    @Excel(name = "落地页-电话拨打数", width = 15)
-    @ApiModelProperty(value = "落地页-电话拨打数")
-    private Long phone;
-    /**
-     * 表单提交数
-     */
-    @Excel(name = "表单提交数", width = 15)
-    @ApiModelProperty(value = "表单提交数")
-    private Long form;
-    /**
-     * 落地页-地图搜索
-     */
-    @Excel(name = "落地页-地图搜索", width = 15)
-    @ApiModelProperty(value = "落地页-地图搜索")
-    private Long mapSearch;
-    /**
-     * 落地页-按钮button
-     */
-    @Excel(name = "落地页-按钮button", width = 15)
-    @ApiModelProperty(value = "落地页-按钮button")
-    private Long button;
-    /**
-     * 落地页-关键页面浏览
-     */
-    @Excel(name = "落地页-关键页面浏览", width = 15)
-    @ApiModelProperty(value = "落地页-关键页面浏览")
-    private Long view;
-    /**
-     * 落地页-QQ咨询数
-     */
-    @Excel(name = "落地页-QQ咨询数", width = 15)
-    @ApiModelProperty(value = "落地页-QQ咨询数")
-    private Long qq;
-    /**
-     * 落地页-抽奖数
-     */
-    @Excel(name = "落地页-抽奖数", width = 15)
-    @ApiModelProperty(value = "落地页-抽奖数")
-    private Long lottery;
-    /**
-     * 落地页-投票
-     */
-    @Excel(name = "落地页-投票", width = 15)
-    @ApiModelProperty(value = "落地页-投票")
-    private Long vote;
-    /**
-     * 落地页-页面跳转
-     */
-    @Excel(name = "落地页-页面跳转", width = 15)
-    @ApiModelProperty(value = "落地页-页面跳转")
-    private Long redirect;
-    /**
-     * 落地页-商品购买
-     */
-    @Excel(name = "落地页-商品购买", width = 15)
-    @ApiModelProperty(value = "落地页-商品购买")
-    private Long shopping;
-    /**
-     * 落地页-在线咨询
-     */
-    @Excel(name = "落地页-在线咨询", width = 15)
-    @ApiModelProperty(value = "落地页-在线咨询")
-    private Long consult;
-    /**
-     * 落地页-微信
-     */
-    @Excel(name = "落地页-微信", width = 15)
-    @ApiModelProperty(value = "落地页-微信")
-    private Long wechat;
-    /**
-     * 落地页-智能电话确认拨打
-     */
-    @Excel(name = "落地页-智能电话确认拨打", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话确认拨打")
-    private Long phoneConfirm;
-    /**
-     * 落地页-智能电话确认接通
-     */
-    @Excel(name = "落地页-智能电话确认接通", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话确认接通")
-    private Long phoneConnect;
-    /**
-     * 落地页-智能电话有效咨询
-     */
-    @Excel(name = "落地页-智能电话有效咨询", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话有效咨询")
-    private Long consultEffective;
-    /**
-     * 视频-总播放
-     */
-    @Excel(name = "视频-总播放", width = 15)
-    @ApiModelProperty(value = "视频-总播放")
-    private Long totalPlay;
-    /**
-     * 视频-有效播放
-     */
-    @Excel(name = "视频-有效播放", width = 15)
-    @ApiModelProperty(value = "视频-有效播放")
-    private Long validPlay;
-    /**
-     * 视频-wifi播放
-     */
-    @Excel(name = "视频-wifi播放", width = 15)
-    @ApiModelProperty(value = "视频-wifi播放")
-    private Long wifiPlay;
-    /**
-     * 视频-播放时长,单位ms
-     */
-    @Excel(name = "视频-播放时长,单位ms", width = 15)
-    @ApiModelProperty(value = "视频-播放时长,单位ms")
-    private Long playDurationSum;
-    /**
-     * 视频-播放25%进度总数
-     */
-    @Excel(name = "视频-播放25%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放25%进度总数")
-    private Long play25FeedBreak;
-    /**
-     * 视频-播放50%进度总数
-     */
-    @Excel(name = "视频-播放50%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放50%进度总数")
-    private Long play50FeedBreak;
-    /**
-     * 视频-播放75%进度总数
-     */
-    @Excel(name = "视频-播放75%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放75%进度总数")
-    private Long play75FeedBreak;
-    /**
-     * 视频-播放100%进度总数
-     */
-    @Excel(name = "视频-播放100%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放100%进度总数")
-    private Long play100FeedBreak;
-    /**
-     * 附加创意-电话按钮
-     */
-    @Excel(name = "附加创意-电话按钮", width = 15)
-    @ApiModelProperty(value = "附加创意-电话按钮")
-    private Long advancedCreativePhoneClick;
-    /**
-     * 附加创意-在线咨询
-     */
-    @Excel(name = "附加创意-在线咨询", width = 15)
-    @ApiModelProperty(value = "附加创意-在线咨询")
-    private Long advancedCreativeCounselClick;
-    /**
-     * 附加创意-表单提交
-     */
-    @Excel(name = "附加创意-表单提交", width = 15)
-    @ApiModelProperty(value = "附加创意-表单提交")
-    private Long advancedCreativeFormClick;
-    /**
-     * 互动数据-分享数
-     */
-    @Excel(name = "互动数据-分享数", width = 15)
-    @ApiModelProperty(value = "互动数据-分享数")
-    private Long share;
-    /**
-     * 互动数据-评论数
-     */
-    @Excel(name = "互动数据-评论数", width = 15)
-    @ApiModelProperty(value = "互动数据-评论数")
-    private Long comment;
-    /**
-     * 互动数据-点赞数
-     */
-    @Excel(name = "互动数据-点赞数", width = 15)
-    @ApiModelProperty(value = "互动数据-点赞数")
-    private Long likeNum;
-    /**
-     * 互动数据-关注数
-     */
-    @Excel(name = "互动数据-关注数", width = 15)
-    @ApiModelProperty(value = "互动数据-关注数")
-    private Long follow;
-    /**
-     * 互动数据-主页访问量
-     */
-    @Excel(name = "互动数据-主页访问量", width = 15)
-    @ApiModelProperty(value = "互动数据-主页访问量")
-    private Long homeVisited;
-    /**
-     * 互动数据-挑战赛查看数
-     */
-    @Excel(name = "互动数据-挑战赛查看数", width = 15)
-    @ApiModelProperty(value = "互动数据-挑战赛查看数")
-    private Long iesChallengeClick;
-    /**
-     * 互动数据-音乐查看数
-     */
-    @Excel(name = "互动数据-音乐查看数", width = 15)
-    @ApiModelProperty(value = "互动数据-音乐查看数")
-    private Long iesMusicClick;
-    /**
-     * 互动数据-单次互动成本
-     */
-    @Excel(name = "互动数据-单次互动成本", width = 15)
-    @ApiModelProperty(value = "互动数据-单次互动成本")
-    private java.math.BigDecimal interactPerCost;
-    /**
-     * 次留数
-     */
-    @Excel(name = "次留数", width = 15)
-    @ApiModelProperty(value = "次留数")
-    private Long nextDayOpen;
-    /**
-     * 次留率
-     */
-    @Excel(name = "次留率", width = 15)
-    @ApiModelProperty(value = "次留率")
-    private java.math.BigDecimal nextDayOpenRate;
-    /**
-     * 次留成本
-     */
-    @Excel(name = "次留成本", width = 15)
-    @ApiModelProperty(value = "次留成本")
-    private java.math.BigDecimal nextDayOpenCost;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-
-    public BytedanceAdvertiserHourlyReport(JSONObject data) {
-        Long playFeedBreak75 = data.getLong("play_75_feed_break");
-        if (null != playFeedBreak75) {
-            this.play75FeedBreak = playFeedBreak75;
-        }
-        Long nextDayOpen = data.getLong("next_day_open");
-        if (null != nextDayOpen) {
-            this.nextDayOpen = nextDayOpen;
-        }
-        Long convertNum = data.getLong("convert");
-        if (null != convertNum) {
-            this.convertNum = convertNum;
-        }
-        Long inAppCart = data.getLong("in_app_cart");
-        if (null != inAppCart) {
-            this.inAppCart = inAppCart;
-        }
-        Long play25FeedBreak = data.getLong("play_25_feed_break");
-        if (null != play25FeedBreak) {
-            this.play25FeedBreak = play25FeedBreak;
-        }
-        Long consultEffective = data.getLong("consult_effective");
-        if (null != consultEffective) {
-            this.consultEffective = consultEffective;
-        }
-        Long view = data.getLong("view");
-        if (null != view) {
-            this.view = view;
-        }
-        Long phoneConfirm = data.getLong("phone_confirm");
-        if (null != phoneConfirm) {
-            this.phoneConfirm = phoneConfirm;
-        }
-        Long iesMusicClick = data.getLong("ies_music_click");
-        if (null != iesMusicClick) {
-            this.iesMusicClick = iesMusicClick;
-        }
-        Long wifiPlay = data.getLong("wifi_play");
-        if (null != wifiPlay) {
-            this.wifiPlay = wifiPlay;
-        }
-        String statDatetime = data.getString("stat_datetime");
-        if (null != statDatetime && !"".equals(statDatetime.trim())) {
-            this.statDatetime = statDatetime;
-        }
-        Long shopping = data.getLong("shopping");
-        if (null != shopping) {
-            this.shopping = shopping;
-        }
-        Long qq = data.getLong("qq");
-        if (null != qq) {
-            this.qq = qq;
-        }
-        Long like = data.getLong("like");
-        if (null != like) {
-            this.likeNum = like;
-        }
-        Long play50FeedBreak = data.getLong("play_50_feed_break");
-        if (null != play50FeedBreak) {
-            this.play50FeedBreak = play50FeedBreak;
-        }
-        Long active = data.getLong("active");
-        if (null != active) {
-            this.active = active;
-        }
-        Long click = data.getLong("click");
-        if (null != click) {
-            this.click = click;
-        }
-        Long advancedCreativePhoneClick = data.getLong("advanced_creative_phone_click");
-        if (null != advancedCreativePhoneClick) {
-            this.advancedCreativePhoneClick = advancedCreativePhoneClick;
-        }
-        Long downloadStart = data.getLong("download_start");
-        if (null != downloadStart) {
-            this.downloadStart = downloadStart;
-        }
-        Long homeVisited = data.getLong("home_visited");
-        if (null != homeVisited) {
-            this.homeVisited = homeVisited;
-        }
-        Long phone = data.getLong("phone");
-        if (null != phone) {
-            this.phone = phone;
-        }
-        Long inAppPay = data.getLong("in_app_pay");
-        if (null != inAppPay) {
-            this.inAppPay = inAppPay;
-        }
-        BigDecimal nextDayOpenCost = data.getBigDecimal("next_day_open_cost");
-        if (null != nextDayOpenCost) {
-            this.nextDayOpenCost = nextDayOpenCost;
-        }
-        Long iesChallengeClick = data.getLong("ies_challenge_click");
-        if (null != iesChallengeClick) {
-            this.iesChallengeClick = iesChallengeClick;
-        }
-        Long totalPlay = data.getLong("total_play");
-        if (null != totalPlay) {
-            this.totalPlay = totalPlay;
-        }
-        Long show = data.getLong("show");
-        if (null != show) {
-            this.showNum = show;
-        }
-        BigDecimal nextDayOpenRate = data.getBigDecimal("next_day_open_rate");
-        if (null != nextDayOpenRate) {
-            this.nextDayOpenRate = nextDayOpenRate;
-        }
-        Long mapSearch = data.getLong("map_search");
-        if (null != mapSearch) {
-            this.mapSearch = mapSearch;
-        }
-        Long clickInstall = data.getLong("click_install");
-        if (null != clickInstall) {
-            this.clickInstall = clickInstall;
-        }
-        BigDecimal interactPerCost = data.getBigDecimal("interact_per_cost");
-        if (null != interactPerCost) {
-            this.interactPerCost = interactPerCost;
-        }
-        Long advertiserId = data.getLong("advertiser_id");
-        if (null != advertiserId) {
-            this.advertiserId = advertiserId;
-        }
-        Long button = data.getLong("button");
-        if (null != button) {
-            this.button = button;
-        }
-        Long playDurationSum = data.getLong("play_duration_sum");
-        if (null != playDurationSum) {
-            this.playDurationSum = playDurationSum;
-        }
-        Long play100FeedBreak = data.getLong("play_100_feed_break");
-        if (null != play100FeedBreak) {
-            this.play100FeedBreak = play100FeedBreak;
-        }
-        Long advancedCreativeCounselClick = data.getLong("advanced_creative_counsel_click");
-        if (null != advancedCreativeCounselClick) {
-            this.advancedCreativeCounselClick = advancedCreativeCounselClick;
-        }
-        Long share = data.getLong("share");
-        if (null != share) {
-            this.share = share;
-        }
-        Long consult = data.getLong("consult");
-        if (null != consult) {
-            this.consult = consult;
-        }
-        Long vote = data.getLong("vote");
-        if (null != vote) {
-            this.vote = vote;
-        }
-        Long validPlay = data.getLong("valid_play");
-        if (null != validPlay) {
-            this.validPlay = validPlay;
-        }
-        Long redirect = data.getLong("redirect");
-        if (null != redirect) {
-            this.redirect = redirect;
-        }
-        Long payCount = data.getLong("pay_count");
-        if (null != payCount) {
-            this.payCount = payCount;
-        }
-        Long advancedCreativeFormClick = data.getLong("advanced_creative_form_click");
-        if (null != advancedCreativeFormClick) {
-            this.advancedCreativeFormClick = advancedCreativeFormClick;
-        }
-        BigDecimal cost = data.getBigDecimal("cost");
-        if (null != cost) {
-            this.cost = cost;
-        }
-        Long downloadFinish = data.getLong("download_finish");
-        if (null != downloadFinish) {
-            this.downloadFinish = downloadFinish;
-        }
-        Long wechat = data.getLong("wechat");
-        if (null != wechat) {
-            this.wechat = wechat;
-        }
-        Long lottery = data.getLong("lottery");
-        if (null != lottery) {
-            this.lottery = lottery;
-        }
-        Long inAppOrder = data.getLong("in_app_order");
-        if (null != inAppOrder) {
-            this.inAppOrder = inAppOrder;
-        }
-        Long installFinish = data.getLong("install_finish");
-        if (null != installFinish) {
-            this.installFinish = installFinish;
-        }
-        Long follow = data.getLong("follow");
-        if (null != follow) {
-            this.follow = follow;
-        }
-//		Long message = data.getLong("message");
-//		if(null!=message){
-//			this.message = message;
-//		}
-        Long inAppDetailUv = data.getLong("in_app_detail_uv");
-        if (null != inAppDetailUv) {
-            this.inAppDetailUv = inAppDetailUv;
-        }
-        Long form = data.getLong("form");
-        if (null != form) {
-            this.form = form;
-        }
-//		BigDecimal convert_cost = data.getBigDecimal("convert_cost");
-//		if(null!=convert_cost){
-//			this.convertCost = convert_cost;
-//		}
-        Long comment = data.getLong("comment");
-        if (null != comment) {
-            this.comment = comment;
-        }
-        Long inAppUv = data.getLong("in_app_uv");
-        if (null != inAppUv) {
-            this.inAppUv = inAppUv;
-        }
-        Long register = data.getLong("register");
-        if (null != register) {
-            this.register = register;
-        }
-    }
-
-    public BytedanceAdvertiserHourlyReport() {
-    }
-}

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

@@ -1,73 +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;
-
-/**
- * 省市县信息
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-09-17
- */
-@Data
-@TableName("ctop_bytedance_area_info")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_area_info对象", description = "省市县信息")
-public class BytedanceAreaInfo {
-
-    /**
-     * id
-     */
-    @TableId()
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * name
-     */
-    @Excel(name = "name", width = 15)
-    @ApiModelProperty(value = "name")
-    private String name;
-    /**
-     * code
-     */
-    @Excel(name = "code", width = 15)
-    @ApiModelProperty(value = "code")
-    private String code;
-    /**
-     * parentCode
-     */
-    @Excel(name = "parentCode", width = 15)
-    @ApiModelProperty(value = "parentCode")
-    private String parentCode;
-    /**
-     * level
-     */
-    @Excel(name = "level", width = 15)
-    @ApiModelProperty(value = "level")
-    private Integer level;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-}

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

@@ -1,627 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 广告组日报表信息
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-09-11
- */
-@Data
-@TableName("ctop_bytedance_report_campaign_daily")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_report_campaign_daily对象", description = "广告组日报表信息")
-public class BytedanceCampaignDailyReport {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 广告主id
-     */
-    @Excel(name = "广告主id", width = 15)
-    @ApiModelProperty(value = "广告主id")
-    private Long advertiserId;
-    /**
-     * 数据起始时间
-     */
-    @Excel(name = "数据起始时间", width = 15)
-    @ApiModelProperty(value = "数据起始时间")
-    private String statDatetime;
-    /**
-     * 展示量
-     */
-    @Excel(name = "展示量", width = 15)
-    @ApiModelProperty(value = "展示量")
-    private Long showNum;
-    /**
-     * 点击量
-     */
-    @Excel(name = "点击量", width = 15)
-    @ApiModelProperty(value = "点击量")
-    private Long click;
-    /**
-     * 转化量
-     */
-    @Excel(name = "转化量", width = 15)
-    @ApiModelProperty(value = "转化量")
-    private Long convertNum;
-    /**
-     * 总花费
-     */
-    @Excel(name = "总花费", width = 15)
-    @ApiModelProperty(value = "总花费")
-    private java.math.BigDecimal cost;
-    /**
-     * 应用下载-激活
-     */
-    @Excel(name = "应用下载-激活", width = 15)
-    @ApiModelProperty(value = "应用下载-激活")
-    private Long active;
-    /**
-     * 应用下载-安卓下载完成
-     */
-    @Excel(name = "应用下载-安卓下载完成", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓下载完成")
-    private Long downloadFinish;
-    /**
-     * 应用下载-安卓下载开始
-     */
-    @Excel(name = "应用下载-安卓下载开始", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓下载开始")
-    private Long downloadStart;
-    /**
-     * 应用下载-点击安装数
-     */
-    @Excel(name = "应用下载-点击安装数", width = 15)
-    @ApiModelProperty(value = "应用下载-点击安装数")
-    private Long clickInstall;
-    /**
-     * 应用下载-安卓安装完成
-     */
-    @Excel(name = "应用下载-安卓安装完成", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓安装完成")
-    private Long installFinish;
-    /**
-     * 应用下载-注册
-     */
-    @Excel(name = "应用下载-注册", width = 15)
-    @ApiModelProperty(value = "应用下载-注册")
-    private Long register;
-    /**
-     * 应用下载-付费数
-     */
-    @Excel(name = "应用下载-付费数", width = 15)
-    @ApiModelProperty(value = "应用下载-付费数")
-    private Long payCount;
-    /**
-     * 应用下载-到达uv
-     */
-    @Excel(name = "应用下载-到达uv", width = 15)
-    @ApiModelProperty(value = "应用下载-到达uv")
-    private Long inAppUv;
-    /**
-     * 应用下载-详情页到站uv
-     */
-    @Excel(name = "应用下载-详情页到站uv", width = 15)
-    @ApiModelProperty(value = "应用下载-详情页到站uv")
-    private Long inAppDetailUv;
-    /**
-     * 应用下载-加入购物车
-     */
-    @Excel(name = "应用下载-加入购物车", width = 15)
-    @ApiModelProperty(value = "应用下载-加入购物车")
-    private Long inAppCart;
-    /**
-     * 应用下载-提交订单
-     */
-    @Excel(name = "应用下载-提交订单", width = 15)
-    @ApiModelProperty(value = "应用下载-提交订单")
-    private Long inAppOrder;
-    /**
-     * 应用下载-付费
-     */
-    @Excel(name = "应用下载-付费", width = 15)
-    @ApiModelProperty(value = "应用下载-付费")
-    private Long inAppPay;
-    /**
-     * 落地页-电话拨打数
-     */
-    @Excel(name = "落地页-电话拨打数", width = 15)
-    @ApiModelProperty(value = "落地页-电话拨打数")
-    private Long phone;
-    /**
-     * 表单提交数
-     */
-    @Excel(name = "表单提交数", width = 15)
-    @ApiModelProperty(value = "表单提交数")
-    private Long form;
-    /**
-     * 落地页-地图搜索
-     */
-    @Excel(name = "落地页-地图搜索", width = 15)
-    @ApiModelProperty(value = "落地页-地图搜索")
-    private Long mapSearch;
-    /**
-     * 落地页-按钮button
-     */
-    @Excel(name = "落地页-按钮button", width = 15)
-    @ApiModelProperty(value = "落地页-按钮button")
-    private Long button;
-    /**
-     * 落地页-关键页面浏览
-     */
-    @Excel(name = "落地页-关键页面浏览", width = 15)
-    @ApiModelProperty(value = "落地页-关键页面浏览")
-    private Long view;
-    /**
-     * 落地页-QQ咨询数
-     */
-    @Excel(name = "落地页-QQ咨询数", width = 15)
-    @ApiModelProperty(value = "落地页-QQ咨询数")
-    private Long qq;
-    /**
-     * 落地页-抽奖数
-     */
-    @Excel(name = "落地页-抽奖数", width = 15)
-    @ApiModelProperty(value = "落地页-抽奖数")
-    private Long lottery;
-    /**
-     * 落地页-投票
-     */
-    @Excel(name = "落地页-投票", width = 15)
-    @ApiModelProperty(value = "落地页-投票")
-    private Long vote;
-    /**
-     * 落地页-页面跳转
-     */
-    @Excel(name = "落地页-页面跳转", width = 15)
-    @ApiModelProperty(value = "落地页-页面跳转")
-    private Long redirect;
-    /**
-     * 落地页-商品购买
-     */
-    @Excel(name = "落地页-商品购买", width = 15)
-    @ApiModelProperty(value = "落地页-商品购买")
-    private Long shopping;
-    /**
-     * 落地页-在线咨询
-     */
-    @Excel(name = "落地页-在线咨询", width = 15)
-    @ApiModelProperty(value = "落地页-在线咨询")
-    private Long consult;
-    /**
-     * 落地页-微信
-     */
-    @Excel(name = "落地页-微信", width = 15)
-    @ApiModelProperty(value = "落地页-微信")
-    private Long wechat;
-    /**
-     * 落地页-智能电话确认拨打
-     */
-    @Excel(name = "落地页-智能电话确认拨打", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话确认拨打")
-    private Long phoneConfirm;
-    /**
-     * 落地页-智能电话确认接通
-     */
-    @Excel(name = "落地页-智能电话确认接通", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话确认接通")
-    private Long phoneConnect;
-    /**
-     * 落地页-智能电话有效咨询
-     */
-    @Excel(name = "落地页-智能电话有效咨询", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话有效咨询")
-    private Long consultEffective;
-    /**
-     * 视频-总播放
-     */
-    @Excel(name = "视频-总播放", width = 15)
-    @ApiModelProperty(value = "视频-总播放")
-    private Long totalPlay;
-    /**
-     * 视频-有效播放
-     */
-    @Excel(name = "视频-有效播放", width = 15)
-    @ApiModelProperty(value = "视频-有效播放")
-    private Long validPlay;
-    /**
-     * 视频-wifi播放
-     */
-    @Excel(name = "视频-wifi播放", width = 15)
-    @ApiModelProperty(value = "视频-wifi播放")
-    private Long wifiPlay;
-    /**
-     * 视频-播放时长,单位ms
-     */
-    @Excel(name = "视频-播放时长,单位ms", width = 15)
-    @ApiModelProperty(value = "视频-播放时长,单位ms")
-    private Long playDurationSum;
-    /**
-     * 视频-播放25%进度总数
-     */
-    @Excel(name = "视频-播放25%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放25%进度总数")
-    private Long play25FeedBreak;
-    /**
-     * 视频-播放50%进度总数
-     */
-    @Excel(name = "视频-播放50%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放50%进度总数")
-    private Long play50FeedBreak;
-    /**
-     * 视频-播放75%进度总数
-     */
-    @Excel(name = "视频-播放75%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放75%进度总数")
-    private Long play75FeedBreak;
-    /**
-     * 视频-播放100%进度总数
-     */
-    @Excel(name = "视频-播放100%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放100%进度总数")
-    private Long play100FeedBreak;
-    /**
-     * 附加创意-电话按钮
-     */
-    @Excel(name = "附加创意-电话按钮", width = 15)
-    @ApiModelProperty(value = "附加创意-电话按钮")
-    private Long advancedCreativePhoneClick;
-    /**
-     * 附加创意-在线咨询
-     */
-    @Excel(name = "附加创意-在线咨询", width = 15)
-    @ApiModelProperty(value = "附加创意-在线咨询")
-    private Long advancedCreativeCounselClick;
-    /**
-     * 附加创意-表单提交
-     */
-    @Excel(name = "附加创意-表单提交", width = 15)
-    @ApiModelProperty(value = "附加创意-表单提交")
-    private Long advancedCreativeFormClick;
-    /**
-     * 互动数据-分享数
-     */
-    @Excel(name = "互动数据-分享数", width = 15)
-    @ApiModelProperty(value = "互动数据-分享数")
-    private Long share;
-    /**
-     * 互动数据-评论数
-     */
-    @Excel(name = "互动数据-评论数", width = 15)
-    @ApiModelProperty(value = "互动数据-评论数")
-    private Long comment;
-    /**
-     * 互动数据-点赞数
-     */
-    @Excel(name = "互动数据-点赞数", width = 15)
-    @ApiModelProperty(value = "互动数据-点赞数")
-    private Long likeNum;
-    /**
-     * 互动数据-关注数
-     */
-    @Excel(name = "互动数据-关注数", width = 15)
-    @ApiModelProperty(value = "互动数据-关注数")
-    private Long follow;
-    /**
-     * 互动数据-主页访问量
-     */
-    @Excel(name = "互动数据-主页访问量", width = 15)
-    @ApiModelProperty(value = "互动数据-主页访问量")
-    private Long homeVisited;
-    /**
-     * 互动数据-挑战赛查看数
-     */
-    @Excel(name = "互动数据-挑战赛查看数", width = 15)
-    @ApiModelProperty(value = "互动数据-挑战赛查看数")
-    private Long iesChallengeClick;
-    /**
-     * 互动数据-音乐查看数
-     */
-    @Excel(name = "互动数据-音乐查看数", width = 15)
-    @ApiModelProperty(value = "互动数据-音乐查看数")
-    private Long iesMusicClick;
-    /**
-     * 互动数据-单次互动成本
-     */
-    @Excel(name = "互动数据-单次互动成本", width = 15)
-    @ApiModelProperty(value = "互动数据-单次互动成本")
-    private java.math.BigDecimal interactPerCost;
-    /**
-     * 次留数
-     */
-    @Excel(name = "次留数", width = 15)
-    @ApiModelProperty(value = "次留数")
-    private Long nextDayOpen;
-    /**
-     * 次留率
-     */
-    @Excel(name = "次留率", width = 15)
-    @ApiModelProperty(value = "次留率")
-    private java.math.BigDecimal nextDayOpenRate;
-    /**
-     * 次留成本
-     */
-    @Excel(name = "次留成本", width = 15)
-    @ApiModelProperty(value = "次留成本")
-    private java.math.BigDecimal nextDayOpenCost;
-    /**
-     * 广告组id
-     */
-    @Excel(name = "广告组id", width = 15)
-    @ApiModelProperty(value = "广告组id")
-    private Long campaignId;
-    /**
-     * 广告组名称
-     */
-    @Excel(name = "广告组名称", width = 15)
-    @ApiModelProperty(value = "广告组名称")
-    private String campaignName;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-
-    public BytedanceCampaignDailyReport(JSONObject data) {
-        Long playFeedBreak75 = data.getLong("play_75_feed_break");
-        if (null != playFeedBreak75) {
-            this.play75FeedBreak = playFeedBreak75;
-        }
-        Long nextDayOpen = data.getLong("next_day_open");
-        if (null != nextDayOpen) {
-            this.nextDayOpen = nextDayOpen;
-        }
-        Long convert = data.getLong("convert");
-        if (null != convert) {
-            this.convertNum = convert;
-        }
-        Long inAppCart = data.getLong("in_app_cart");
-        if (null != inAppCart) {
-            this.inAppCart = inAppCart;
-        }
-        Long play25FeedBreak = data.getLong("play_25_feed_break");
-        if (null != play25FeedBreak) {
-            this.play25FeedBreak = play25FeedBreak;
-        }
-        Long consultEffective = data.getLong("consult_effective");
-        if (null != consultEffective) {
-            this.consultEffective = consultEffective;
-        }
-        Long view = data.getLong("view");
-        if (null != view) {
-            this.view = view;
-        }
-        Long phoneConfirm = data.getLong("phone_confirm");
-        if (null != phoneConfirm) {
-            this.phoneConfirm = phoneConfirm;
-        }
-        Long iesMusicClick = data.getLong("ies_music_click");
-        if (null != iesMusicClick) {
-            this.iesMusicClick = iesMusicClick;
-        }
-        Long wifiPlay = data.getLong("wifi_play");
-        if (null != wifiPlay) {
-            this.wifiPlay = wifiPlay;
-        }
-        String statDatetime = data.getString("stat_datetime");
-        if (null != statDatetime && !"".equals(statDatetime.trim())) {
-            this.statDatetime = statDatetime;
-        }
-        Long shopping = data.getLong("shopping");
-        if (null != shopping) {
-            this.shopping = shopping;
-        }
-        Long qq = data.getLong("qq");
-        if (null != qq) {
-            this.qq = qq;
-        }
-        Long like = data.getLong("like");
-        if (null != like) {
-            this.likeNum = like;
-        }
-        Long play50FeedBreak = data.getLong("play_50_feed_break");
-        if (null != play50FeedBreak) {
-            this.play50FeedBreak = play50FeedBreak;
-        }
-        Long active = data.getLong("active");
-        if (null != active) {
-            this.active = active;
-        }
-        Long click = data.getLong("click");
-        if (null != click) {
-            this.click = click;
-        }
-        Long advancedCreativePhoneClick = data.getLong("advanced_creative_phone_click");
-        if (null != advancedCreativePhoneClick) {
-            this.advancedCreativePhoneClick = advancedCreativePhoneClick;
-        }
-        Long downloadStart = data.getLong("download_start");
-        if (null != downloadStart) {
-            this.downloadStart = downloadStart;
-        }
-        Long homeVisited = data.getLong("home_visited");
-        if (null != homeVisited) {
-            this.homeVisited = homeVisited;
-        }
-        Long phone = data.getLong("phone");
-        if (null != phone) {
-            this.phone = phone;
-        }
-        Long inAppPay = data.getLong("in_app_pay");
-        if (null != inAppPay) {
-            this.inAppPay = inAppPay;
-        }
-        BigDecimal nextDayOpenCost = data.getBigDecimal("next_day_open_cost");
-        if (null != nextDayOpenCost) {
-            this.nextDayOpenCost = nextDayOpenCost;
-        }
-        Long iesChallengeClick = data.getLong("ies_challenge_click");
-        if (null != iesChallengeClick) {
-            this.iesChallengeClick = iesChallengeClick;
-        }
-        Long totalPlay = data.getLong("total_play");
-        if (null != totalPlay) {
-            this.totalPlay = totalPlay;
-        }
-        Long show = data.getLong("show");
-        if (null != show) {
-            this.showNum = show;
-        }
-        BigDecimal nextDayOpenRate = data.getBigDecimal("next_day_open_rate");
-        if (null != nextDayOpenRate) {
-            this.nextDayOpenRate = nextDayOpenRate;
-        }
-        Long mapSearch = data.getLong("map_search");
-        if (null != mapSearch) {
-            this.mapSearch = mapSearch;
-        }
-        Long clickInstall = data.getLong("click_install");
-        if (null != clickInstall) {
-            this.clickInstall = clickInstall;
-        }
-        BigDecimal interactPerCost = data.getBigDecimal("interact_per_cost");
-        if (null != interactPerCost) {
-            this.interactPerCost = interactPerCost;
-        }
-        Long advertiserId = data.getLong("advertiser_id");
-        if (null != advertiserId) {
-            this.advertiserId = advertiserId;
-        }
-        Long button = data.getLong("button");
-        if (null != button) {
-            this.button = button;
-        }
-        Long playDurationSum = data.getLong("play_duration_sum");
-        if (null != playDurationSum) {
-            this.playDurationSum = playDurationSum;
-        }
-        Long play100FeedBreak = data.getLong("play_100_feed_break");
-        if (null != play100FeedBreak) {
-            this.play100FeedBreak = play100FeedBreak;
-        }
-        Long advancedCreativeCounselClick = data.getLong("advanced_creative_counsel_click");
-        if (null != advancedCreativeCounselClick) {
-            this.advancedCreativeCounselClick = advancedCreativeCounselClick;
-        }
-        Long share = data.getLong("share");
-        if (null != share) {
-            this.share = share;
-        }
-        Long consult = data.getLong("consult");
-        if (null != consult) {
-            this.consult = consult;
-        }
-        Long vote = data.getLong("vote");
-        if (null != vote) {
-            this.vote = vote;
-        }
-        Long validPlay = data.getLong("valid_play");
-        if (null != validPlay) {
-            this.validPlay = validPlay;
-        }
-        Long redirect = data.getLong("redirect");
-        if (null != redirect) {
-            this.redirect = redirect;
-        }
-        Long payCount = data.getLong("pay_count");
-        if (null != payCount) {
-            this.payCount = payCount;
-        }
-        Long advancedCreativeFormClick = data.getLong("advanced_creative_form_click");
-        if (null != advancedCreativeFormClick) {
-            this.advancedCreativeFormClick = advancedCreativeFormClick;
-        }
-        BigDecimal cost = data.getBigDecimal("cost");
-        if (null != cost) {
-            this.cost = cost;
-        }
-        Long downloadFinish = data.getLong("download_finish");
-        if (null != downloadFinish) {
-            this.downloadFinish = downloadFinish;
-        }
-        Long wechat = data.getLong("wechat");
-        if (null != wechat) {
-            this.wechat = wechat;
-        }
-        Long lottery = data.getLong("lottery");
-        if (null != lottery) {
-            this.lottery = lottery;
-        }
-        Long inAppOrder = data.getLong("in_app_order");
-        if (null != inAppOrder) {
-            this.inAppOrder = inAppOrder;
-        }
-        Long installFinish = data.getLong("install_finish");
-        if (null != installFinish) {
-            this.installFinish = installFinish;
-        }
-        Long follow = data.getLong("follow");
-        if (null != follow) {
-            this.follow = follow;
-        }
-//		Long message = data.getLong("message");
-//		if(null!=message){
-//			this.message = message;
-//		}
-        Long inAppDetailUv = data.getLong("in_app_detail_uv");
-        if (null != inAppDetailUv) {
-            this.inAppDetailUv = inAppDetailUv;
-        }
-        Long form = data.getLong("form");
-        if (null != form) {
-            this.form = form;
-        }
-//		BigDecimal convert_cost = data.getBigDecimal("convert_cost");
-//		if(null!=convert_cost){
-//			this.convertCost = convert_cost;
-//		}
-        Long comment = data.getLong("comment");
-        if (null != comment) {
-            this.comment = comment;
-        }
-        Long inAppUv = data.getLong("in_app_uv");
-        if (null != inAppUv) {
-            this.inAppUv = inAppUv;
-        }
-        Long register = data.getLong("register");
-        if (null != register) {
-            this.register = register;
-        }
-        Long campaignId = data.getLong("campaign_id");
-        if (null != campaignId) {
-            this.campaignId = campaignId;
-        }
-        String campaignName = data.getString("campaign_name");
-        if (null != campaignName) {
-            this.campaignName = campaignName;
-        }
-    }
-
-    public BytedanceCampaignDailyReport() {
-    }
-}

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

@@ -1,627 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 广告组时报表信息
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-09-11
- */
-@Data
-@TableName("ctop_bytedance_report_campaign_hourly")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_report_campaign_hourly对象", description = "广告组时报表信息")
-public class BytedanceCampaignHourlyReport {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 广告主id
-     */
-    @Excel(name = "广告主id", width = 15)
-    @ApiModelProperty(value = "广告主id")
-    private Long advertiserId;
-    /**
-     * 数据起始时间
-     */
-    @Excel(name = "数据起始时间", width = 15)
-    @ApiModelProperty(value = "数据起始时间")
-    private String statDatetime;
-    /**
-     * 展示量
-     */
-    @Excel(name = "展示量", width = 15)
-    @ApiModelProperty(value = "展示量")
-    private Long showNum;
-    /**
-     * 点击量
-     */
-    @Excel(name = "点击量", width = 15)
-    @ApiModelProperty(value = "点击量")
-    private Long click;
-    /**
-     * 转化量
-     */
-    @Excel(name = "转化量", width = 15)
-    @ApiModelProperty(value = "转化量")
-    private Long convertNum;
-    /**
-     * 总花费
-     */
-    @Excel(name = "总花费", width = 15)
-    @ApiModelProperty(value = "总花费")
-    private java.math.BigDecimal cost;
-    /**
-     * 应用下载-激活
-     */
-    @Excel(name = "应用下载-激活", width = 15)
-    @ApiModelProperty(value = "应用下载-激活")
-    private Long active;
-    /**
-     * 应用下载-安卓下载完成
-     */
-    @Excel(name = "应用下载-安卓下载完成", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓下载完成")
-    private Long downloadFinish;
-    /**
-     * 应用下载-安卓下载开始
-     */
-    @Excel(name = "应用下载-安卓下载开始", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓下载开始")
-    private Long downloadStart;
-    /**
-     * 应用下载-点击安装数
-     */
-    @Excel(name = "应用下载-点击安装数", width = 15)
-    @ApiModelProperty(value = "应用下载-点击安装数")
-    private Long clickInstall;
-    /**
-     * 应用下载-安卓安装完成
-     */
-    @Excel(name = "应用下载-安卓安装完成", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓安装完成")
-    private Long installFinish;
-    /**
-     * 应用下载-注册
-     */
-    @Excel(name = "应用下载-注册", width = 15)
-    @ApiModelProperty(value = "应用下载-注册")
-    private Long register;
-    /**
-     * 应用下载-付费数
-     */
-    @Excel(name = "应用下载-付费数", width = 15)
-    @ApiModelProperty(value = "应用下载-付费数")
-    private Long payCount;
-    /**
-     * 应用下载-到达uv
-     */
-    @Excel(name = "应用下载-到达uv", width = 15)
-    @ApiModelProperty(value = "应用下载-到达uv")
-    private Long inAppUv;
-    /**
-     * 应用下载-详情页到站uv
-     */
-    @Excel(name = "应用下载-详情页到站uv", width = 15)
-    @ApiModelProperty(value = "应用下载-详情页到站uv")
-    private Long inAppDetailUv;
-    /**
-     * 应用下载-加入购物车
-     */
-    @Excel(name = "应用下载-加入购物车", width = 15)
-    @ApiModelProperty(value = "应用下载-加入购物车")
-    private Long inAppCart;
-    /**
-     * 应用下载-提交订单
-     */
-    @Excel(name = "应用下载-提交订单", width = 15)
-    @ApiModelProperty(value = "应用下载-提交订单")
-    private Long inAppOrder;
-    /**
-     * 应用下载-付费
-     */
-    @Excel(name = "应用下载-付费", width = 15)
-    @ApiModelProperty(value = "应用下载-付费")
-    private Long inAppPay;
-    /**
-     * 落地页-电话拨打数
-     */
-    @Excel(name = "落地页-电话拨打数", width = 15)
-    @ApiModelProperty(value = "落地页-电话拨打数")
-    private Long phone;
-    /**
-     * 表单提交数
-     */
-    @Excel(name = "表单提交数", width = 15)
-    @ApiModelProperty(value = "表单提交数")
-    private Long form;
-    /**
-     * 落地页-地图搜索
-     */
-    @Excel(name = "落地页-地图搜索", width = 15)
-    @ApiModelProperty(value = "落地页-地图搜索")
-    private Long mapSearch;
-    /**
-     * 落地页-按钮button
-     */
-    @Excel(name = "落地页-按钮button", width = 15)
-    @ApiModelProperty(value = "落地页-按钮button")
-    private Long button;
-    /**
-     * 落地页-关键页面浏览
-     */
-    @Excel(name = "落地页-关键页面浏览", width = 15)
-    @ApiModelProperty(value = "落地页-关键页面浏览")
-    private Long view;
-    /**
-     * 落地页-QQ咨询数
-     */
-    @Excel(name = "落地页-QQ咨询数", width = 15)
-    @ApiModelProperty(value = "落地页-QQ咨询数")
-    private Long qq;
-    /**
-     * 落地页-抽奖数
-     */
-    @Excel(name = "落地页-抽奖数", width = 15)
-    @ApiModelProperty(value = "落地页-抽奖数")
-    private Long lottery;
-    /**
-     * 落地页-投票
-     */
-    @Excel(name = "落地页-投票", width = 15)
-    @ApiModelProperty(value = "落地页-投票")
-    private Long vote;
-    /**
-     * 落地页-页面跳转
-     */
-    @Excel(name = "落地页-页面跳转", width = 15)
-    @ApiModelProperty(value = "落地页-页面跳转")
-    private Long redirect;
-    /**
-     * 落地页-商品购买
-     */
-    @Excel(name = "落地页-商品购买", width = 15)
-    @ApiModelProperty(value = "落地页-商品购买")
-    private Long shopping;
-    /**
-     * 落地页-在线咨询
-     */
-    @Excel(name = "落地页-在线咨询", width = 15)
-    @ApiModelProperty(value = "落地页-在线咨询")
-    private Long consult;
-    /**
-     * 落地页-微信
-     */
-    @Excel(name = "落地页-微信", width = 15)
-    @ApiModelProperty(value = "落地页-微信")
-    private Long wechat;
-    /**
-     * 落地页-智能电话确认拨打
-     */
-    @Excel(name = "落地页-智能电话确认拨打", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话确认拨打")
-    private Long phoneConfirm;
-    /**
-     * 落地页-智能电话确认接通
-     */
-    @Excel(name = "落地页-智能电话确认接通", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话确认接通")
-    private Long phoneConnect;
-    /**
-     * 落地页-智能电话有效咨询
-     */
-    @Excel(name = "落地页-智能电话有效咨询", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话有效咨询")
-    private Long consultEffective;
-    /**
-     * 视频-总播放
-     */
-    @Excel(name = "视频-总播放", width = 15)
-    @ApiModelProperty(value = "视频-总播放")
-    private Long totalPlay;
-    /**
-     * 视频-有效播放
-     */
-    @Excel(name = "视频-有效播放", width = 15)
-    @ApiModelProperty(value = "视频-有效播放")
-    private Long validPlay;
-    /**
-     * 视频-wifi播放
-     */
-    @Excel(name = "视频-wifi播放", width = 15)
-    @ApiModelProperty(value = "视频-wifi播放")
-    private Long wifiPlay;
-    /**
-     * 视频-播放时长,单位ms
-     */
-    @Excel(name = "视频-播放时长,单位ms", width = 15)
-    @ApiModelProperty(value = "视频-播放时长,单位ms")
-    private Long playDurationSum;
-    /**
-     * 视频-播放25%进度总数
-     */
-    @Excel(name = "视频-播放25%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放25%进度总数")
-    private Long play25FeedBreak;
-    /**
-     * 视频-播放50%进度总数
-     */
-    @Excel(name = "视频-播放50%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放50%进度总数")
-    private Long play50FeedBreak;
-    /**
-     * 视频-播放75%进度总数
-     */
-    @Excel(name = "视频-播放75%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放75%进度总数")
-    private Long play75FeedBreak;
-    /**
-     * 视频-播放100%进度总数
-     */
-    @Excel(name = "视频-播放100%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放100%进度总数")
-    private Long play100FeedBreak;
-    /**
-     * 附加创意-电话按钮
-     */
-    @Excel(name = "附加创意-电话按钮", width = 15)
-    @ApiModelProperty(value = "附加创意-电话按钮")
-    private Long advancedCreativePhoneClick;
-    /**
-     * 附加创意-在线咨询
-     */
-    @Excel(name = "附加创意-在线咨询", width = 15)
-    @ApiModelProperty(value = "附加创意-在线咨询")
-    private Long advancedCreativeCounselClick;
-    /**
-     * 附加创意-表单提交
-     */
-    @Excel(name = "附加创意-表单提交", width = 15)
-    @ApiModelProperty(value = "附加创意-表单提交")
-    private Long advancedCreativeFormClick;
-    /**
-     * 互动数据-分享数
-     */
-    @Excel(name = "互动数据-分享数", width = 15)
-    @ApiModelProperty(value = "互动数据-分享数")
-    private Long share;
-    /**
-     * 互动数据-评论数
-     */
-    @Excel(name = "互动数据-评论数", width = 15)
-    @ApiModelProperty(value = "互动数据-评论数")
-    private Long comment;
-    /**
-     * 互动数据-点赞数
-     */
-    @Excel(name = "互动数据-点赞数", width = 15)
-    @ApiModelProperty(value = "互动数据-点赞数")
-    private Long likeNum;
-    /**
-     * 互动数据-关注数
-     */
-    @Excel(name = "互动数据-关注数", width = 15)
-    @ApiModelProperty(value = "互动数据-关注数")
-    private Long follow;
-    /**
-     * 互动数据-主页访问量
-     */
-    @Excel(name = "互动数据-主页访问量", width = 15)
-    @ApiModelProperty(value = "互动数据-主页访问量")
-    private Long homeVisited;
-    /**
-     * 互动数据-挑战赛查看数
-     */
-    @Excel(name = "互动数据-挑战赛查看数", width = 15)
-    @ApiModelProperty(value = "互动数据-挑战赛查看数")
-    private Long iesChallengeClick;
-    /**
-     * 互动数据-音乐查看数
-     */
-    @Excel(name = "互动数据-音乐查看数", width = 15)
-    @ApiModelProperty(value = "互动数据-音乐查看数")
-    private Long iesMusicClick;
-    /**
-     * 互动数据-单次互动成本
-     */
-    @Excel(name = "互动数据-单次互动成本", width = 15)
-    @ApiModelProperty(value = "互动数据-单次互动成本")
-    private java.math.BigDecimal interactPerCost;
-    /**
-     * 次留数
-     */
-    @Excel(name = "次留数", width = 15)
-    @ApiModelProperty(value = "次留数")
-    private Long nextDayOpen;
-    /**
-     * 次留率
-     */
-    @Excel(name = "次留率", width = 15)
-    @ApiModelProperty(value = "次留率")
-    private java.math.BigDecimal nextDayOpenRate;
-    /**
-     * 次留成本
-     */
-    @Excel(name = "次留成本", width = 15)
-    @ApiModelProperty(value = "次留成本")
-    private java.math.BigDecimal nextDayOpenCost;
-    /**
-     * 广告组id
-     */
-    @Excel(name = "广告组id", width = 15)
-    @ApiModelProperty(value = "广告组id")
-    private Long campaignId;
-    /**
-     * 广告组名称
-     */
-    @Excel(name = "广告组名称", width = 15)
-    @ApiModelProperty(value = "广告组名称")
-    private String campaignName;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-
-    public BytedanceCampaignHourlyReport(JSONObject data) {
-        Long playFeedBreak75 = data.getLong("play_75_feed_break");
-        if (null != playFeedBreak75) {
-            this.play75FeedBreak = playFeedBreak75;
-        }
-        Long nextDayOpen = data.getLong("next_day_open");
-        if (null != nextDayOpen) {
-            this.nextDayOpen = nextDayOpen;
-        }
-        Long convert = data.getLong("convert");
-        if (null != convert) {
-            this.convertNum = convert;
-        }
-        Long inAppCart = data.getLong("in_app_cart");
-        if (null != inAppCart) {
-            this.inAppCart = inAppCart;
-        }
-        Long play25FeedBreak = data.getLong("play_25_feed_break");
-        if (null != play25FeedBreak) {
-            this.play25FeedBreak = play25FeedBreak;
-        }
-        Long consultEffective = data.getLong("consult_effective");
-        if (null != consultEffective) {
-            this.consultEffective = consultEffective;
-        }
-        Long view = data.getLong("view");
-        if (null != view) {
-            this.view = view;
-        }
-        Long phoneConfirm = data.getLong("phone_confirm");
-        if (null != phoneConfirm) {
-            this.phoneConfirm = phoneConfirm;
-        }
-        Long iesMusicClick = data.getLong("ies_music_click");
-        if (null != iesMusicClick) {
-            this.iesMusicClick = iesMusicClick;
-        }
-        Long wifiPlay = data.getLong("wifi_play");
-        if (null != wifiPlay) {
-            this.wifiPlay = wifiPlay;
-        }
-        String statDatetime = data.getString("stat_datetime");
-        if (null != statDatetime && !"".equals(statDatetime.trim())) {
-            this.statDatetime = statDatetime;
-        }
-        Long shopping = data.getLong("shopping");
-        if (null != shopping) {
-            this.shopping = shopping;
-        }
-        Long qq = data.getLong("qq");
-        if (null != qq) {
-            this.qq = qq;
-        }
-        Long like = data.getLong("like");
-        if (null != like) {
-            this.likeNum = like;
-        }
-        Long play50FeedBreak = data.getLong("play_50_feed_break");
-        if (null != play50FeedBreak) {
-            this.play50FeedBreak = play50FeedBreak;
-        }
-        Long active = data.getLong("active");
-        if (null != active) {
-            this.active = active;
-        }
-        Long click = data.getLong("click");
-        if (null != click) {
-            this.click = click;
-        }
-        Long advancedCreativePhoneClick = data.getLong("advanced_creative_phone_click");
-        if (null != advancedCreativePhoneClick) {
-            this.advancedCreativePhoneClick = advancedCreativePhoneClick;
-        }
-        Long downloadStart = data.getLong("download_start");
-        if (null != downloadStart) {
-            this.downloadStart = downloadStart;
-        }
-        Long homeVisited = data.getLong("home_visited");
-        if (null != homeVisited) {
-            this.homeVisited = homeVisited;
-        }
-        Long phone = data.getLong("phone");
-        if (null != phone) {
-            this.phone = phone;
-        }
-        Long inAppPay = data.getLong("in_app_pay");
-        if (null != inAppPay) {
-            this.inAppPay = inAppPay;
-        }
-        BigDecimal nextDayOpenCost = data.getBigDecimal("next_day_open_cost");
-        if (null != nextDayOpenCost) {
-            this.nextDayOpenCost = nextDayOpenCost;
-        }
-        Long iesChallengeClick = data.getLong("ies_challenge_click");
-        if (null != iesChallengeClick) {
-            this.iesChallengeClick = iesChallengeClick;
-        }
-        Long totalPlay = data.getLong("total_play");
-        if (null != totalPlay) {
-            this.totalPlay = totalPlay;
-        }
-        Long show = data.getLong("show");
-        if (null != show) {
-            this.showNum = show;
-        }
-        BigDecimal nextDayOpenRate = data.getBigDecimal("next_day_open_rate");
-        if (null != nextDayOpenRate) {
-            this.nextDayOpenRate = nextDayOpenRate;
-        }
-        Long mapSearch = data.getLong("map_search");
-        if (null != mapSearch) {
-            this.mapSearch = mapSearch;
-        }
-        Long clickInstall = data.getLong("click_install");
-        if (null != clickInstall) {
-            this.clickInstall = clickInstall;
-        }
-        BigDecimal interactPerCost = data.getBigDecimal("interact_per_cost");
-        if (null != interactPerCost) {
-            this.interactPerCost = interactPerCost;
-        }
-        Long advertiserId = data.getLong("advertiser_id");
-        if (null != advertiserId) {
-            this.advertiserId = advertiserId;
-        }
-        Long button = data.getLong("button");
-        if (null != button) {
-            this.button = button;
-        }
-        Long playDurationSum = data.getLong("play_duration_sum");
-        if (null != playDurationSum) {
-            this.playDurationSum = playDurationSum;
-        }
-        Long play100FeedBreak = data.getLong("play_100_feed_break");
-        if (null != play100FeedBreak) {
-            this.play100FeedBreak = play100FeedBreak;
-        }
-        Long advancedCreativeCounselClick = data.getLong("advanced_creative_counsel_click");
-        if (null != advancedCreativeCounselClick) {
-            this.advancedCreativeCounselClick = advancedCreativeCounselClick;
-        }
-        Long share = data.getLong("share");
-        if (null != share) {
-            this.share = share;
-        }
-        Long consult = data.getLong("consult");
-        if (null != consult) {
-            this.consult = consult;
-        }
-        Long vote = data.getLong("vote");
-        if (null != vote) {
-            this.vote = vote;
-        }
-        Long validPlay = data.getLong("valid_play");
-        if (null != validPlay) {
-            this.validPlay = validPlay;
-        }
-        Long redirect = data.getLong("redirect");
-        if (null != redirect) {
-            this.redirect = redirect;
-        }
-        Long payCount = data.getLong("pay_count");
-        if (null != payCount) {
-            this.payCount = payCount;
-        }
-        Long advancedCreativeFormClick = data.getLong("advanced_creative_form_click");
-        if (null != advancedCreativeFormClick) {
-            this.advancedCreativeFormClick = advancedCreativeFormClick;
-        }
-        BigDecimal cost = data.getBigDecimal("cost");
-        if (null != cost) {
-            this.cost = cost;
-        }
-        Long downloadFinish = data.getLong("download_finish");
-        if (null != downloadFinish) {
-            this.downloadFinish = downloadFinish;
-        }
-        Long wechat = data.getLong("wechat");
-        if (null != wechat) {
-            this.wechat = wechat;
-        }
-        Long lottery = data.getLong("lottery");
-        if (null != lottery) {
-            this.lottery = lottery;
-        }
-        Long inAppOrder = data.getLong("in_app_order");
-        if (null != inAppOrder) {
-            this.inAppOrder = inAppOrder;
-        }
-        Long installFinish = data.getLong("install_finish");
-        if (null != installFinish) {
-            this.installFinish = installFinish;
-        }
-        Long follow = data.getLong("follow");
-        if (null != follow) {
-            this.follow = follow;
-        }
-//		Long message = data.getLong("message");
-//		if(null!=message){
-//			this.message = message;
-//		}
-        Long inAppDetailUv = data.getLong("in_app_detail_uv");
-        if (null != inAppDetailUv) {
-            this.inAppDetailUv = inAppDetailUv;
-        }
-        Long form = data.getLong("form");
-        if (null != form) {
-            this.form = form;
-        }
-//		BigDecimal convert_cost = data.getBigDecimal("convert_cost");
-//		if(null!=convert_cost){
-//			this.convertCost = convert_cost;
-//		}
-        Long comment = data.getLong("comment");
-        if (null != comment) {
-            this.comment = comment;
-        }
-        Long inAppUv = data.getLong("in_app_uv");
-        if (null != inAppUv) {
-            this.inAppUv = inAppUv;
-        }
-        Long register = data.getLong("register");
-        if (null != register) {
-            this.register = register;
-        }
-        Long campaignId = data.getLong("campaign_id");
-        if (null != campaignId) {
-            this.campaignId = campaignId;
-        }
-        String campaignName = data.getString("campaign_name");
-        if (null != campaignName) {
-            this.campaignName = campaignName;
-        }
-    }
-
-    public BytedanceCampaignHourlyReport() {
-    }
-}

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

@@ -1,657 +0,0 @@
-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.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-09-11
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_bytedance_report_creative_daily")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_report_creative_daily对象", description = "广告创意日报表信息")
-public class BytedanceCreativeDailyReport {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.UUID)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 广告主id
-     */
-    @Excel(name = "广告主id", width = 15)
-    @ApiModelProperty(value = "广告主id")
-    private Long advertiserId;
-    /**
-     * 数据起始时间
-     */
-    @Excel(name = "数据起始时间", width = 15)
-    @ApiModelProperty(value = "数据起始时间")
-    private String statDatetime;
-    /**
-     * 展示量
-     */
-    @Excel(name = "展示量", width = 15)
-    @ApiModelProperty(value = "展示量")
-    private Long showNum;
-    /**
-     * 点击量
-     */
-    @Excel(name = "点击量", width = 15)
-    @ApiModelProperty(value = "点击量")
-    private Long click;
-    /**
-     * 转化量
-     */
-    @Excel(name = "转化量", width = 15)
-    @ApiModelProperty(value = "转化量")
-    private Long convertNum;
-    /**
-     * 总花费
-     */
-    @Excel(name = "总花费", width = 15)
-    @ApiModelProperty(value = "总花费")
-    private java.math.BigDecimal cost;
-    /**
-     * 应用下载-激活
-     */
-    @Excel(name = "应用下载-激活", width = 15)
-    @ApiModelProperty(value = "应用下载-激活")
-    private Long active;
-    /**
-     * 应用下载-安卓下载完成
-     */
-    @Excel(name = "应用下载-安卓下载完成", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓下载完成")
-    private Long downloadFinish;
-    /**
-     * 应用下载-安卓下载开始
-     */
-    @Excel(name = "应用下载-安卓下载开始", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓下载开始")
-    private Long downloadStart;
-    /**
-     * 应用下载-点击安装数
-     */
-    @Excel(name = "应用下载-点击安装数", width = 15)
-    @ApiModelProperty(value = "应用下载-点击安装数")
-    private Long clickInstall;
-    /**
-     * 应用下载-安卓安装完成
-     */
-    @Excel(name = "应用下载-安卓安装完成", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓安装完成")
-    private Long installFinish;
-    /**
-     * 应用下载-注册
-     */
-    @Excel(name = "应用下载-注册", width = 15)
-    @ApiModelProperty(value = "应用下载-注册")
-    private Long register;
-    /**
-     * 应用下载-付费数
-     */
-    @Excel(name = "应用下载-付费数", width = 15)
-    @ApiModelProperty(value = "应用下载-付费数")
-    private Long payCount;
-    /**
-     * 应用下载-到达uv
-     */
-    @Excel(name = "应用下载-到达uv", width = 15)
-    @ApiModelProperty(value = "应用下载-到达uv")
-    private Long inAppUv;
-    /**
-     * 应用下载-详情页到站uv
-     */
-    @Excel(name = "应用下载-详情页到站uv", width = 15)
-    @ApiModelProperty(value = "应用下载-详情页到站uv")
-    private Long inAppDetailUv;
-    /**
-     * 应用下载-加入购物车
-     */
-    @Excel(name = "应用下载-加入购物车", width = 15)
-    @ApiModelProperty(value = "应用下载-加入购物车")
-    private Long inAppCart;
-    /**
-     * 应用下载-提交订单
-     */
-    @Excel(name = "应用下载-提交订单", width = 15)
-    @ApiModelProperty(value = "应用下载-提交订单")
-    private Long inAppOrder;
-    /**
-     * 应用下载-付费
-     */
-    @Excel(name = "应用下载-付费", width = 15)
-    @ApiModelProperty(value = "应用下载-付费")
-    private Long inAppPay;
-    /**
-     * 落地页-电话拨打数
-     */
-    @Excel(name = "落地页-电话拨打数", width = 15)
-    @ApiModelProperty(value = "落地页-电话拨打数")
-    private Long phone;
-    /**
-     * 表单提交数
-     */
-    @Excel(name = "表单提交数", width = 15)
-    @ApiModelProperty(value = "表单提交数")
-    private Long form;
-    /**
-     * 落地页-地图搜索
-     */
-    @Excel(name = "落地页-地图搜索", width = 15)
-    @ApiModelProperty(value = "落地页-地图搜索")
-    private Long mapSearch;
-    /**
-     * 落地页-按钮button
-     */
-    @Excel(name = "落地页-按钮button", width = 15)
-    @ApiModelProperty(value = "落地页-按钮button")
-    private Long button;
-    /**
-     * 落地页-关键页面浏览
-     */
-    @Excel(name = "落地页-关键页面浏览", width = 15)
-    @ApiModelProperty(value = "落地页-关键页面浏览")
-    private Long view;
-    /**
-     * 落地页-QQ咨询数
-     */
-    @Excel(name = "落地页-QQ咨询数", width = 15)
-    @ApiModelProperty(value = "落地页-QQ咨询数")
-    private Long qq;
-    /**
-     * 落地页-抽奖数
-     */
-    @Excel(name = "落地页-抽奖数", width = 15)
-    @ApiModelProperty(value = "落地页-抽奖数")
-    private Long lottery;
-    /**
-     * 落地页-投票
-     */
-    @Excel(name = "落地页-投票", width = 15)
-    @ApiModelProperty(value = "落地页-投票")
-    private Long vote;
-    /**
-     * 落地页-页面跳转
-     */
-    @Excel(name = "落地页-页面跳转", width = 15)
-    @ApiModelProperty(value = "落地页-页面跳转")
-    private Long redirect;
-    /**
-     * 落地页-商品购买
-     */
-    @Excel(name = "落地页-商品购买", width = 15)
-    @ApiModelProperty(value = "落地页-商品购买")
-    private Long shopping;
-    /**
-     * 落地页-在线咨询
-     */
-    @Excel(name = "落地页-在线咨询", width = 15)
-    @ApiModelProperty(value = "落地页-在线咨询")
-    private Long consult;
-    /**
-     * 落地页-微信
-     */
-    @Excel(name = "落地页-微信", width = 15)
-    @ApiModelProperty(value = "落地页-微信")
-    private Long wechat;
-    /**
-     * 落地页-智能电话确认拨打
-     */
-    @Excel(name = "落地页-智能电话确认拨打", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话确认拨打")
-    private Long phoneConfirm;
-    /**
-     * 落地页-智能电话确认接通
-     */
-    @Excel(name = "落地页-智能电话确认接通", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话确认接通")
-    private Long phoneConnect;
-    /**
-     * 落地页-智能电话有效咨询
-     */
-    @Excel(name = "落地页-智能电话有效咨询", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话有效咨询")
-    private Long consultEffective;
-    /**
-     * 视频-总播放
-     */
-    @Excel(name = "视频-总播放", width = 15)
-    @ApiModelProperty(value = "视频-总播放")
-    private Long totalPlay;
-    /**
-     * 视频-有效播放
-     */
-    @Excel(name = "视频-有效播放", width = 15)
-    @ApiModelProperty(value = "视频-有效播放")
-    private Long validPlay;
-    /**
-     * 视频-wifi播放
-     */
-    @Excel(name = "视频-wifi播放", width = 15)
-    @ApiModelProperty(value = "视频-wifi播放")
-    private Long wifiPlay;
-    /**
-     * 视频-播放时长,单位ms
-     */
-    @Excel(name = "视频-播放时长,单位ms", width = 15)
-    @ApiModelProperty(value = "视频-播放时长,单位ms")
-    private Long playDurationSum;
-    /**
-     * 视频-播放25%进度总数
-     */
-    @Excel(name = "视频-播放25%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放25%进度总数")
-    private Long play25FeedBreak;
-    /**
-     * 视频-播放50%进度总数
-     */
-    @Excel(name = "视频-播放50%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放50%进度总数")
-    private Long play50FeedBreak;
-    /**
-     * 视频-播放75%进度总数
-     */
-    @Excel(name = "视频-播放75%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放75%进度总数")
-    private Long play75FeedBreak;
-    /**
-     * 视频-播放100%进度总数
-     */
-    @Excel(name = "视频-播放100%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放100%进度总数")
-    private Long play100FeedBreak;
-    /**
-     * 附加创意-电话按钮
-     */
-    @Excel(name = "附加创意-电话按钮", width = 15)
-    @ApiModelProperty(value = "附加创意-电话按钮")
-    private Long advancedCreativePhoneClick;
-    /**
-     * 附加创意-在线咨询
-     */
-    @Excel(name = "附加创意-在线咨询", width = 15)
-    @ApiModelProperty(value = "附加创意-在线咨询")
-    private Long advancedCreativeCounselClick;
-    /**
-     * 附加创意-表单提交
-     */
-    @Excel(name = "附加创意-表单提交", width = 15)
-    @ApiModelProperty(value = "附加创意-表单提交")
-    private Long advancedCreativeFormClick;
-    /**
-     * 互动数据-分享数
-     */
-    @Excel(name = "互动数据-分享数", width = 15)
-    @ApiModelProperty(value = "互动数据-分享数")
-    private Long share;
-    /**
-     * 互动数据-评论数
-     */
-    @Excel(name = "互动数据-评论数", width = 15)
-    @ApiModelProperty(value = "互动数据-评论数")
-    private Long comment;
-    /**
-     * 互动数据-点赞数
-     */
-    @Excel(name = "互动数据-点赞数", width = 15)
-    @ApiModelProperty(value = "互动数据-点赞数")
-    private Long likeNum;
-    /**
-     * 互动数据-关注数
-     */
-    @Excel(name = "互动数据-关注数", width = 15)
-    @ApiModelProperty(value = "互动数据-关注数")
-    private Long follow;
-    /**
-     * 互动数据-主页访问量
-     */
-    @Excel(name = "互动数据-主页访问量", width = 15)
-    @ApiModelProperty(value = "互动数据-主页访问量")
-    private Long homeVisited;
-    /**
-     * 互动数据-挑战赛查看数
-     */
-    @Excel(name = "互动数据-挑战赛查看数", width = 15)
-    @ApiModelProperty(value = "互动数据-挑战赛查看数")
-    private Long iesChallengeClick;
-    /**
-     * 互动数据-音乐查看数
-     */
-    @Excel(name = "互动数据-音乐查看数", width = 15)
-    @ApiModelProperty(value = "互动数据-音乐查看数")
-    private Long iesMusicClick;
-    /**
-     * 互动数据-单次互动成本
-     */
-    @Excel(name = "互动数据-单次互动成本", width = 15)
-    @ApiModelProperty(value = "互动数据-单次互动成本")
-    private java.math.BigDecimal interactPerCost;
-    /**
-     * 次留数
-     */
-    @Excel(name = "次留数", width = 15)
-    @ApiModelProperty(value = "次留数")
-    private Long nextDayOpen;
-    /**
-     * 次留率
-     */
-    @Excel(name = "次留率", width = 15)
-    @ApiModelProperty(value = "次留率")
-    private java.math.BigDecimal nextDayOpenRate;
-    /**
-     * 次留成本
-     */
-    @Excel(name = "次留成本", width = 15)
-    @ApiModelProperty(value = "次留成本")
-    private java.math.BigDecimal nextDayOpenCost;
-    /**
-     * 广告组id
-     */
-    @Excel(name = "广告计划id", width = 15)
-    @ApiModelProperty(value = "广告计划id")
-    private Long adId;
-    /**
-     * 广告组名称
-     */
-    @Excel(name = "广告计划名称", width = 15)
-    @ApiModelProperty(value = "广告组名称")
-    private String adName;
-    /**
-     * campaignId
-     */
-    @Excel(name = "广告组id", width = 15)
-    @ApiModelProperty(value = "广告组id")
-    private Long campaignId;
-    /**
-     * 广告组名称
-     */
-    @Excel(name = "广告组名称", width = 15)
-    @ApiModelProperty(value = "广告组名称")
-    private String campaignName;
-    @Excel(name = "创意id", width = 15)
-    @ApiModelProperty(value = "创意id")
-    private Long creativeId;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-
-    public BytedanceCreativeDailyReport(JSONObject data) {
-        Long playFeedBreak75 = data.getLong("play_75_feed_break");
-        if (null != playFeedBreak75) {
-            this.play75FeedBreak = playFeedBreak75;
-        }
-        Long nextDayOpen = data.getLong("next_day_open");
-        if (null != nextDayOpen) {
-            this.nextDayOpen = nextDayOpen;
-        }
-        Long convert = data.getLong("convert");
-        if (null != convert) {
-            this.convertNum = convert;
-        }
-        Long inAppCart = data.getLong("in_app_cart");
-        if (null != inAppCart) {
-            this.inAppCart = inAppCart;
-        }
-        Long play25FeedBreak = data.getLong("play_25_feed_break");
-        if (null != play25FeedBreak) {
-            this.play25FeedBreak = play25FeedBreak;
-        }
-        Long consultEffective = data.getLong("consult_effective");
-        if (null != consultEffective) {
-            this.consultEffective = consultEffective;
-        }
-        Long view = data.getLong("view");
-        if (null != view) {
-            this.view = view;
-        }
-        Long phoneConfirm = data.getLong("phone_confirm");
-        if (null != phoneConfirm) {
-            this.phoneConfirm = phoneConfirm;
-        }
-        Long iesMusicClick = data.getLong("ies_music_click");
-        if (null != iesMusicClick) {
-            this.iesMusicClick = iesMusicClick;
-        }
-        Long wifiPlay = data.getLong("wifi_play");
-        if (null != wifiPlay) {
-            this.wifiPlay = wifiPlay;
-        }
-        String statDatetime = data.getString("stat_datetime");
-        if (null != statDatetime && !"".equals(statDatetime.trim())) {
-            this.statDatetime = statDatetime;
-        }
-        Long shopping = data.getLong("shopping");
-        if (null != shopping) {
-            this.shopping = shopping;
-        }
-        Long qq = data.getLong("qq");
-        if (null != qq) {
-            this.qq = qq;
-        }
-        Long like = data.getLong("like");
-        if (null != like) {
-            this.likeNum = like;
-        }
-        Long play50FeedBreak = data.getLong("play_50_feed_break");
-        if (null != play50FeedBreak) {
-            this.play50FeedBreak = play50FeedBreak;
-        }
-        Long active = data.getLong("active");
-        if (null != active) {
-            this.active = active;
-        }
-        Long click = data.getLong("click");
-        if (null != click) {
-            this.click = click;
-        }
-        Long advancedCreativePhoneClick = data.getLong("advanced_creative_phone_click");
-        if (null != advancedCreativePhoneClick) {
-            this.advancedCreativePhoneClick = advancedCreativePhoneClick;
-        }
-        Long downloadStart = data.getLong("download_start");
-        if (null != downloadStart) {
-            this.downloadStart = downloadStart;
-        }
-        Long homeVisited = data.getLong("home_visited");
-        if (null != homeVisited) {
-            this.homeVisited = homeVisited;
-        }
-        Long phone = data.getLong("phone");
-        if (null != phone) {
-            this.phone = phone;
-        }
-        Long inAppPay = data.getLong("in_app_pay");
-        if (null != inAppPay) {
-            this.inAppPay = inAppPay;
-        }
-        BigDecimal nextDayOpenCost = data.getBigDecimal("next_day_open_cost");
-        if (null != nextDayOpenCost) {
-            this.nextDayOpenCost = nextDayOpenCost;
-        }
-        Long iesChallengeClick = data.getLong("ies_challenge_click");
-        if (null != iesChallengeClick) {
-            this.iesChallengeClick = iesChallengeClick;
-        }
-        Long totalPlay = data.getLong("total_play");
-        if (null != totalPlay) {
-            this.totalPlay = totalPlay;
-        }
-        Long show = data.getLong("show");
-        if (null != show) {
-            this.showNum = show;
-        }
-        BigDecimal nextDayOpenRate = data.getBigDecimal("next_day_open_rate");
-        if (null != nextDayOpenRate) {
-            this.nextDayOpenRate = nextDayOpenRate;
-        }
-        Long mapSearch = data.getLong("map_search");
-        if (null != mapSearch) {
-            this.mapSearch = mapSearch;
-        }
-        Long clickInstall = data.getLong("click_install");
-        if (null != clickInstall) {
-            this.clickInstall = clickInstall;
-        }
-        BigDecimal interactPerCost = data.getBigDecimal("interact_per_cost");
-        if (null != interactPerCost) {
-            this.interactPerCost = interactPerCost;
-        }
-        Long advertiserId = data.getLong("advertiser_id");
-        if (null != advertiserId) {
-            this.advertiserId = advertiserId;
-        }
-        Long button = data.getLong("button");
-        if (null != button) {
-            this.button = button;
-        }
-        Long playDurationSum = data.getLong("play_duration_sum");
-        if (null != playDurationSum) {
-            this.playDurationSum = playDurationSum;
-        }
-        Long play100FeedBreak = data.getLong("play_100_feed_break");
-        if (null != play100FeedBreak) {
-            this.play100FeedBreak = play100FeedBreak;
-        }
-        Long advancedCreativeCounselClick = data.getLong("advanced_creative_counsel_click");
-        if (null != advancedCreativeCounselClick) {
-            this.advancedCreativeCounselClick = advancedCreativeCounselClick;
-        }
-        Long share = data.getLong("share");
-        if (null != share) {
-            this.share = share;
-        }
-        Long consult = data.getLong("consult");
-        if (null != consult) {
-            this.consult = consult;
-        }
-        Long vote = data.getLong("vote");
-        if (null != vote) {
-            this.vote = vote;
-        }
-        Long validPlay = data.getLong("valid_play");
-        if (null != validPlay) {
-            this.validPlay = validPlay;
-        }
-        Long redirect = data.getLong("redirect");
-        if (null != redirect) {
-            this.redirect = redirect;
-        }
-        Long payCount = data.getLong("pay_count");
-        if (null != payCount) {
-            this.payCount = payCount;
-        }
-        Long advancedCreativeFormClick = data.getLong("advanced_creative_form_click");
-        if (null != advancedCreativeFormClick) {
-            this.advancedCreativeFormClick = advancedCreativeFormClick;
-        }
-        BigDecimal cost = data.getBigDecimal("cost");
-        if (null != cost) {
-            this.cost = cost;
-        }
-        Long downloadFinish = data.getLong("download_finish");
-        if (null != downloadFinish) {
-            this.downloadFinish = downloadFinish;
-        }
-        Long wechat = data.getLong("wechat");
-        if (null != wechat) {
-            this.wechat = wechat;
-        }
-        Long lottery = data.getLong("lottery");
-        if (null != lottery) {
-            this.lottery = lottery;
-        }
-        Long inAppOrder = data.getLong("in_app_order");
-        if (null != inAppOrder) {
-            this.inAppOrder = inAppOrder;
-        }
-        Long installFinish = data.getLong("install_finish");
-        if (null != installFinish) {
-            this.installFinish = installFinish;
-        }
-        Long follow = data.getLong("follow");
-        if (null != follow) {
-            this.follow = follow;
-        }
-//		Long message = data.getLong("message");
-//		if(null!=message){
-//			this.message = message;
-//		}
-        Long inAppDetailUv = data.getLong("in_app_detail_uv");
-        if (null != inAppDetailUv) {
-            this.inAppDetailUv = inAppDetailUv;
-        }
-        Long form = data.getLong("form");
-        if (null != form) {
-            this.form = form;
-        }
-//		BigDecimal convert_cost = data.getBigDecimal("convert_cost");
-//		if(null!=convert_cost){
-//			this.convertCost = convert_cost;
-//		}
-        Long comment = data.getLong("comment");
-        if (null != comment) {
-            this.comment = comment;
-        }
-        Long inAppUv = data.getLong("in_app_uv");
-        if (null != inAppUv) {
-            this.inAppUv = inAppUv;
-        }
-        Long register = data.getLong("register");
-        if (null != register) {
-            this.register = register;
-        }
-        Long campaignId = data.getLong("campaign_id");
-        if (null != campaignId) {
-            this.campaignId = campaignId;
-        }
-        String campaignName = data.getString("campaign_name");
-        if (null != campaignName) {
-            this.campaignName = campaignName;
-        }
-        String adName = data.getString("ad_name");
-        if (null != adName) {
-            this.adName = adName;
-        }
-        Long adId = data.getLong("ad_id");
-        if (null != adId) {
-            this.adId = adId;
-        }
-        Long creativeId = data.getLong("creative_id");
-        if (null != creativeId) {
-            this.creativeId = creativeId;
-        }
-    }
-
-    public BytedanceCreativeDailyReport() {
-    }
-}

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

@@ -1,654 +0,0 @@
-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.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-09-11
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_bytedance_report_creative_hourly")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_report_creative_hourly对象", description = "广告创意日报表信息")
-public class BytedanceCreativeHourlyReport {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.UUID)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 广告主id
-     */
-    @Excel(name = "广告主id", width = 15)
-    @ApiModelProperty(value = "广告主id")
-    private Long advertiserId;
-    /**
-     * 数据起始时间
-     */
-    @Excel(name = "数据起始时间", width = 15)
-    @ApiModelProperty(value = "数据起始时间")
-    private String statDatetime;
-    /**
-     * 展示量
-     */
-    @Excel(name = "展示量", width = 15)
-    @ApiModelProperty(value = "展示量")
-    private Long showNum;
-    /**
-     * 点击量
-     */
-    @Excel(name = "点击量", width = 15)
-    @ApiModelProperty(value = "点击量")
-    private Long click;
-    /**
-     * 转化量
-     */
-    @Excel(name = "转化量", width = 15)
-    @ApiModelProperty(value = "转化量")
-    private Long convertNum;
-    /**
-     * 总花费
-     */
-    @Excel(name = "总花费", width = 15)
-    @ApiModelProperty(value = "总花费")
-    private java.math.BigDecimal cost;
-    /**
-     * 应用下载-激活
-     */
-    @Excel(name = "应用下载-激活", width = 15)
-    @ApiModelProperty(value = "应用下载-激活")
-    private Long active;
-    /**
-     * 应用下载-安卓下载完成
-     */
-    @Excel(name = "应用下载-安卓下载完成", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓下载完成")
-    private Long downloadFinish;
-    /**
-     * 应用下载-安卓下载开始
-     */
-    @Excel(name = "应用下载-安卓下载开始", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓下载开始")
-    private Long downloadStart;
-    /**
-     * 应用下载-点击安装数
-     */
-    @Excel(name = "应用下载-点击安装数", width = 15)
-    @ApiModelProperty(value = "应用下载-点击安装数")
-    private Long clickInstall;
-    /**
-     * 应用下载-安卓安装完成
-     */
-    @Excel(name = "应用下载-安卓安装完成", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓安装完成")
-    private Long installFinish;
-    /**
-     * 应用下载-注册
-     */
-    @Excel(name = "应用下载-注册", width = 15)
-    @ApiModelProperty(value = "应用下载-注册")
-    private Long register;
-    /**
-     * 应用下载-付费数
-     */
-    @Excel(name = "应用下载-付费数", width = 15)
-    @ApiModelProperty(value = "应用下载-付费数")
-    private Long payCount;
-    /**
-     * 应用下载-到达uv
-     */
-    @Excel(name = "应用下载-到达uv", width = 15)
-    @ApiModelProperty(value = "应用下载-到达uv")
-    private Long inAppUv;
-    /**
-     * 应用下载-详情页到站uv
-     */
-    @Excel(name = "应用下载-详情页到站uv", width = 15)
-    @ApiModelProperty(value = "应用下载-详情页到站uv")
-    private Long inAppDetailUv;
-    /**
-     * 应用下载-加入购物车
-     */
-    @Excel(name = "应用下载-加入购物车", width = 15)
-    @ApiModelProperty(value = "应用下载-加入购物车")
-    private Long inAppCart;
-    /**
-     * 应用下载-提交订单
-     */
-    @Excel(name = "应用下载-提交订单", width = 15)
-    @ApiModelProperty(value = "应用下载-提交订单")
-    private Long inAppOrder;
-    /**
-     * 应用下载-付费
-     */
-    @Excel(name = "应用下载-付费", width = 15)
-    @ApiModelProperty(value = "应用下载-付费")
-    private Long inAppPay;
-    /**
-     * 落地页-电话拨打数
-     */
-    @Excel(name = "落地页-电话拨打数", width = 15)
-    @ApiModelProperty(value = "落地页-电话拨打数")
-    private Long phone;
-    /**
-     * 表单提交数
-     */
-    @Excel(name = "表单提交数", width = 15)
-    @ApiModelProperty(value = "表单提交数")
-    private Long form;
-    /**
-     * 落地页-地图搜索
-     */
-    @Excel(name = "落地页-地图搜索", width = 15)
-    @ApiModelProperty(value = "落地页-地图搜索")
-    private Long mapSearch;
-    /**
-     * 落地页-按钮button
-     */
-    @Excel(name = "落地页-按钮button", width = 15)
-    @ApiModelProperty(value = "落地页-按钮button")
-    private Long button;
-    /**
-     * 落地页-关键页面浏览
-     */
-    @Excel(name = "落地页-关键页面浏览", width = 15)
-    @ApiModelProperty(value = "落地页-关键页面浏览")
-    private Long view;
-    /**
-     * 落地页-QQ咨询数
-     */
-    @Excel(name = "落地页-QQ咨询数", width = 15)
-    @ApiModelProperty(value = "落地页-QQ咨询数")
-    private Long qq;
-    /**
-     * 落地页-抽奖数
-     */
-    @Excel(name = "落地页-抽奖数", width = 15)
-    @ApiModelProperty(value = "落地页-抽奖数")
-    private Long lottery;
-    /**
-     * 落地页-投票
-     */
-    @Excel(name = "落地页-投票", width = 15)
-    @ApiModelProperty(value = "落地页-投票")
-    private Long vote;
-    /**
-     * 落地页-页面跳转
-     */
-    @Excel(name = "落地页-页面跳转", width = 15)
-    @ApiModelProperty(value = "落地页-页面跳转")
-    private Long redirect;
-    /**
-     * 落地页-商品购买
-     */
-    @Excel(name = "落地页-商品购买", width = 15)
-    @ApiModelProperty(value = "落地页-商品购买")
-    private Long shopping;
-    /**
-     * 落地页-在线咨询
-     */
-    @Excel(name = "落地页-在线咨询", width = 15)
-    @ApiModelProperty(value = "落地页-在线咨询")
-    private Long consult;
-    /**
-     * 落地页-微信
-     */
-    @Excel(name = "落地页-微信", width = 15)
-    @ApiModelProperty(value = "落地页-微信")
-    private Long wechat;
-    /**
-     * 落地页-智能电话确认拨打
-     */
-    @Excel(name = "落地页-智能电话确认拨打", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话确认拨打")
-    private Long phoneConfirm;
-    /**
-     * 落地页-智能电话确认接通
-     */
-    @Excel(name = "落地页-智能电话确认接通", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话确认接通")
-    private Long phoneConnect;
-    /**
-     * 落地页-智能电话有效咨询
-     */
-    @Excel(name = "落地页-智能电话有效咨询", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话有效咨询")
-    private Long consultEffective;
-    /**
-     * 视频-总播放
-     */
-    @Excel(name = "视频-总播放", width = 15)
-    @ApiModelProperty(value = "视频-总播放")
-    private Long totalPlay;
-    /**
-     * 视频-有效播放
-     */
-    @Excel(name = "视频-有效播放", width = 15)
-    @ApiModelProperty(value = "视频-有效播放")
-    private Long validPlay;
-    /**
-     * 视频-wifi播放
-     */
-    @Excel(name = "视频-wifi播放", width = 15)
-    @ApiModelProperty(value = "视频-wifi播放")
-    private Long wifiPlay;
-    /**
-     * 视频-播放时长,单位ms
-     */
-    @Excel(name = "视频-播放时长,单位ms", width = 15)
-    @ApiModelProperty(value = "视频-播放时长,单位ms")
-    private Long playDurationSum;
-    /**
-     * 视频-播放25%进度总数
-     */
-    @Excel(name = "视频-播放25%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放25%进度总数")
-    private Long play25FeedBreak;
-    /**
-     * 视频-播放50%进度总数
-     */
-    @Excel(name = "视频-播放50%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放50%进度总数")
-    private Long play50FeedBreak;
-    /**
-     * 视频-播放75%进度总数
-     */
-    @Excel(name = "视频-播放75%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放75%进度总数")
-    private Long play75FeedBreak;
-    /**
-     * 视频-播放100%进度总数
-     */
-    @Excel(name = "视频-播放100%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放100%进度总数")
-    private Long play100FeedBreak;
-    /**
-     * 附加创意-电话按钮
-     */
-    @Excel(name = "附加创意-电话按钮", width = 15)
-    @ApiModelProperty(value = "附加创意-电话按钮")
-    private Long advancedCreativePhoneClick;
-    /**
-     * 附加创意-在线咨询
-     */
-    @Excel(name = "附加创意-在线咨询", width = 15)
-    @ApiModelProperty(value = "附加创意-在线咨询")
-    private Long advancedCreativeCounselClick;
-    /**
-     * 附加创意-表单提交
-     */
-    @Excel(name = "附加创意-表单提交", width = 15)
-    @ApiModelProperty(value = "附加创意-表单提交")
-    private Long advancedCreativeFormClick;
-    /**
-     * 互动数据-分享数
-     */
-    @Excel(name = "互动数据-分享数", width = 15)
-    @ApiModelProperty(value = "互动数据-分享数")
-    private Long share;
-    /**
-     * 互动数据-评论数
-     */
-    @Excel(name = "互动数据-评论数", width = 15)
-    @ApiModelProperty(value = "互动数据-评论数")
-    private Long comment;
-    /**
-     * 互动数据-点赞数
-     */
-    @Excel(name = "互动数据-点赞数", width = 15)
-    @ApiModelProperty(value = "互动数据-点赞数")
-    private Long likeNum;
-    /**
-     * 互动数据-关注数
-     */
-    @Excel(name = "互动数据-关注数", width = 15)
-    @ApiModelProperty(value = "互动数据-关注数")
-    private Long follow;
-    /**
-     * 互动数据-主页访问量
-     */
-    @Excel(name = "互动数据-主页访问量", width = 15)
-    @ApiModelProperty(value = "互动数据-主页访问量")
-    private Long homeVisited;
-    /**
-     * 互动数据-挑战赛查看数
-     */
-    @Excel(name = "互动数据-挑战赛查看数", width = 15)
-    @ApiModelProperty(value = "互动数据-挑战赛查看数")
-    private Long iesChallengeClick;
-    /**
-     * 互动数据-音乐查看数
-     */
-    @Excel(name = "互动数据-音乐查看数", width = 15)
-    @ApiModelProperty(value = "互动数据-音乐查看数")
-    private Long iesMusicClick;
-    /**
-     * 互动数据-单次互动成本
-     */
-    @Excel(name = "互动数据-单次互动成本", width = 15)
-    @ApiModelProperty(value = "互动数据-单次互动成本")
-    private java.math.BigDecimal interactPerCost;
-    /**
-     * 次留数
-     */
-    @Excel(name = "次留数", width = 15)
-    @ApiModelProperty(value = "次留数")
-    private Long nextDayOpen;
-    /**
-     * 次留率
-     */
-    @Excel(name = "次留率", width = 15)
-    @ApiModelProperty(value = "次留率")
-    private java.math.BigDecimal nextDayOpenRate;
-    /**
-     * 次留成本
-     */
-    @Excel(name = "次留成本", width = 15)
-    @ApiModelProperty(value = "次留成本")
-    private java.math.BigDecimal nextDayOpenCost;
-    /**
-     * 广告组id
-     */
-    @Excel(name = "广告组id", width = 15)
-    @ApiModelProperty(value = "广告组id")
-    private Long adId;
-    /**
-     * 广告组名称
-     */
-    @Excel(name = "广告组名称", width = 15)
-    @ApiModelProperty(value = "广告组名称")
-    private String adName;
-    /**
-     * campaignId
-     */
-    @Excel(name = "campaignId", width = 15)
-    @ApiModelProperty(value = "campaignId")
-    private Long campaignId;
-    @Excel(name = "广告组名称", width = 15)
-    @ApiModelProperty(value = "广告组名称")
-    private String campaignName;
-    @Excel(name = "创意id", width = 15)
-    @ApiModelProperty(value = "创意id")
-    private Long creativeId;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-
-    public BytedanceCreativeHourlyReport(JSONObject data) {
-        Long playFeedBreak75 = data.getLong("play_75_feed_break");
-        if (null != playFeedBreak75) {
-            this.play75FeedBreak = playFeedBreak75;
-        }
-        Long next_day_open = data.getLong("next_day_open");
-        if (null != next_day_open) {
-            this.nextDayOpen = next_day_open;
-        }
-        Long convert = data.getLong("convert");
-        if (null != convert) {
-            this.convertNum = convert;
-        }
-        Long in_app_cart = data.getLong("in_app_cart");
-        if (null != in_app_cart) {
-            this.inAppCart = in_app_cart;
-        }
-        Long play_25_feed_break = data.getLong("play_25_feed_break");
-        if (null != play_25_feed_break) {
-            this.play25FeedBreak = play_25_feed_break;
-        }
-        Long consult_effective = data.getLong("consult_effective");
-        if (null != consult_effective) {
-            this.consultEffective = consult_effective;
-        }
-        Long view = data.getLong("view");
-        if (null != view) {
-            this.view = view;
-        }
-        Long phone_confirm = data.getLong("phone_confirm");
-        if (null != phone_confirm) {
-            this.phoneConfirm = phone_confirm;
-        }
-        Long ies_music_click = data.getLong("ies_music_click");
-        if (null != ies_music_click) {
-            this.iesMusicClick = ies_music_click;
-        }
-        Long wifi_play = data.getLong("wifi_play");
-        if (null != wifi_play) {
-            this.wifiPlay = wifi_play;
-        }
-        String stat_datetime = data.getString("stat_datetime");
-        if (null != stat_datetime && !"".equals(stat_datetime.trim())) {
-            this.statDatetime = stat_datetime;
-        }
-        Long shopping = data.getLong("shopping");
-        if (null != shopping) {
-            this.shopping = shopping;
-        }
-        Long qq = data.getLong("qq");
-        if (null != qq) {
-            this.qq = qq;
-        }
-        Long like = data.getLong("like");
-        if (null != like) {
-            this.likeNum = like;
-        }
-        Long play_50_feed_break = data.getLong("play_50_feed_break");
-        if (null != play_50_feed_break) {
-            this.play50FeedBreak = play_50_feed_break;
-        }
-        Long active = data.getLong("active");
-        if (null != active) {
-            this.active = active;
-        }
-        Long click = data.getLong("click");
-        if (null != click) {
-            this.click = click;
-        }
-        Long advanced_creative_phone_click = data.getLong("advanced_creative_phone_click");
-        if (null != advanced_creative_phone_click) {
-            this.advancedCreativePhoneClick = advanced_creative_phone_click;
-        }
-        Long download_start = data.getLong("download_start");
-        if (null != download_start) {
-            this.downloadStart = download_start;
-        }
-        Long home_visited = data.getLong("home_visited");
-        if (null != home_visited) {
-            this.homeVisited = home_visited;
-        }
-        Long phone = data.getLong("phone");
-        if (null != phone) {
-            this.phone = phone;
-        }
-        Long in_app_pay = data.getLong("in_app_pay");
-        if (null != in_app_pay) {
-            this.inAppPay = in_app_pay;
-        }
-        BigDecimal next_day_open_cost = data.getBigDecimal("next_day_open_cost");
-        if (null != next_day_open_cost) {
-            this.nextDayOpenCost = next_day_open_cost;
-        }
-        Long ies_challenge_click = data.getLong("ies_challenge_click");
-        if (null != ies_challenge_click) {
-            this.iesChallengeClick = ies_challenge_click;
-        }
-        Long total_play = data.getLong("total_play");
-        if (null != total_play) {
-            this.totalPlay = total_play;
-        }
-        Long show = data.getLong("show");
-        if (null != show) {
-            this.showNum = show;
-        }
-        BigDecimal next_day_open_rate = data.getBigDecimal("next_day_open_rate");
-        if (null != next_day_open_rate) {
-            this.nextDayOpenRate = next_day_open_rate;
-        }
-        Long map_search = data.getLong("map_search");
-        if (null != map_search) {
-            this.mapSearch = map_search;
-        }
-        Long click_install = data.getLong("click_install");
-        if (null != click_install) {
-            this.clickInstall = click_install;
-        }
-        BigDecimal interact_per_cost = data.getBigDecimal("interact_per_cost");
-        if (null != interact_per_cost) {
-            this.interactPerCost = interact_per_cost;
-        }
-        Long advertiser_id = data.getLong("advertiser_id");
-        if (null != advertiser_id) {
-            this.advertiserId = advertiser_id;
-        }
-        Long button = data.getLong("button");
-        if (null != button) {
-            this.button = button;
-        }
-        Long play_duration_sum = data.getLong("play_duration_sum");
-        if (null != play_duration_sum) {
-            this.playDurationSum = play_duration_sum;
-        }
-        Long play_100_feed_break = data.getLong("play_100_feed_break");
-        if (null != play_100_feed_break) {
-            this.play100FeedBreak = play_100_feed_break;
-        }
-        Long advanced_creative_counsel_click = data.getLong("advanced_creative_counsel_click");
-        if (null != advanced_creative_counsel_click) {
-            this.advancedCreativeCounselClick = advanced_creative_counsel_click;
-        }
-        Long share = data.getLong("share");
-        if (null != share) {
-            this.share = share;
-        }
-        Long consult = data.getLong("consult");
-        if (null != consult) {
-            this.consult = consult;
-        }
-        Long vote = data.getLong("vote");
-        if (null != vote) {
-            this.vote = vote;
-        }
-        Long valid_play = data.getLong("valid_play");
-        if (null != valid_play) {
-            this.validPlay = valid_play;
-        }
-        Long redirect = data.getLong("redirect");
-        if (null != redirect) {
-            this.redirect = redirect;
-        }
-        Long pay_count = data.getLong("pay_count");
-        if (null != pay_count) {
-            this.payCount = pay_count;
-        }
-        Long advanced_creative_form_click = data.getLong("advanced_creative_form_click");
-        if (null != advanced_creative_form_click) {
-            this.advancedCreativeFormClick = advanced_creative_form_click;
-        }
-        BigDecimal cost = data.getBigDecimal("cost");
-        if (null != cost) {
-            this.cost = cost;
-        }
-        Long download_finish = data.getLong("download_finish");
-        if (null != download_finish) {
-            this.downloadFinish = download_finish;
-        }
-        Long wechat = data.getLong("wechat");
-        if (null != wechat) {
-            this.wechat = wechat;
-        }
-        Long lottery = data.getLong("lottery");
-        if (null != lottery) {
-            this.lottery = lottery;
-        }
-        Long in_app_order = data.getLong("in_app_order");
-        if (null != in_app_order) {
-            this.inAppOrder = in_app_order;
-        }
-        Long install_finish = data.getLong("install_finish");
-        if (null != install_finish) {
-            this.installFinish = install_finish;
-        }
-        Long follow = data.getLong("follow");
-        if (null != follow) {
-            this.follow = follow;
-        }
-//		Long message = data.getLong("message");
-//		if(null!=message){
-//			this.message = message;
-//		}
-        Long in_app_detail_uv = data.getLong("in_app_detail_uv");
-        if (null != in_app_detail_uv) {
-            this.inAppDetailUv = in_app_detail_uv;
-        }
-        Long form = data.getLong("form");
-        if (null != form) {
-            this.form = form;
-        }
-//		BigDecimal convert_cost = data.getBigDecimal("convert_cost");
-//		if(null!=convert_cost){
-//			this.convertCost = convert_cost;
-//		}
-        Long comment = data.getLong("comment");
-        if (null != comment) {
-            this.comment = comment;
-        }
-        Long in_app_uv = data.getLong("in_app_uv");
-        if (null != in_app_uv) {
-            this.inAppUv = in_app_uv;
-        }
-        Long register = data.getLong("register");
-        if (null != register) {
-            this.register = register;
-        }
-        Long campaignId = data.getLong("campaign_id");
-        if (null != campaignId) {
-            this.campaignId = campaignId;
-        }
-        String campaignName = data.getString("campaign_name");
-        if (null != campaignName) {
-            this.campaignName = campaignName;
-        }
-        String adName = data.getString("ad_name");
-        if (null != adName) {
-            this.adName = adName;
-        }
-        Long adId = data.getLong("ad_id");
-        if (null != adId) {
-            this.adId = adId;
-        }
-        Long creative_id = data.getLong("creative_id");
-        if (null != creative_id) {
-            this.creativeId = creative_id;
-        }
-    }
-
-    public BytedanceCreativeHourlyReport() {
-    }
-}

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

@@ -1,140 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * @Description: 投放目标模板信息
- * @Author: jeecg-boot
- * @Date: 2019-07-23
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_bytedance_delivery_target_template")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_delivery_target_template对象", description = "投放目标模板信息")
-public class BytedanceDeliveryTargetTemplate {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 平台广告主id
-     * advertiserId
-     */
-    @Excel(name = "平台广告主id", width = 15)
-    @ApiModelProperty(value = "advertiser_id")
-    private String advertiserId;
-    /**
-     * 投放范围
-     */
-    @Excel(name = "投放范围", width = 15)
-    @ApiModelProperty(value = "delivery_range")
-    private String deliveryRange;
-    /**
-     * 投放范围
-     */
-    @Excel(name = "应用下载类型", width = 32)
-    @ApiModelProperty(value = "download_mode")
-    private String downloadMode;
-
-    /**
-     * 模板名称
-     */
-    @Excel(name = "模板名称", width = 15)
-    @ApiModelProperty(value = "模板名称")
-    private String name;
-    /**
-     * 投放目标
-     */
-    @Excel(name = "投放目标", width = 15)
-    @ApiModelProperty(value = "投放目标")
-    @Dict(dicCode = "toutiao_delivery_target_type")
-    private String deliveryTarget;
-    /**
-     * 下载方式
-     */
-    @Excel(name = "下载方式", width = 15)
-    @ApiModelProperty(value = "下载方式")
-    @Dict(dicCode = "toutiao_dowload_type")
-    private String downloadType;
-    /**
-     * 下载链接
-     */
-    @Excel(name = "下载链接", width = 15)
-    @ApiModelProperty(value = "下载链接")
-    private String downloadUrl;
-    /**
-     * 落地页链接
-     */
-    @Excel(name = "落地页链接", width = 15)
-    @ApiModelProperty(value = "落地页链接")
-    private String externalUrl;
-    /**
-     * 转化目标
-     */
-    @Excel(name = "转化目标", width = 15)
-    @ApiModelProperty(value = "转化目标")
-    private String convertTarget;
-    /**
-     * 应用包名
-     */
-    @Excel(name = "应用包名", width = 15)
-    @ApiModelProperty(value = "应用包名")
-    private String packageName;
-    /**
-     * 直达链接启用状态
-     */
-    @Excel(name = "直达链接启用状态", width = 15)
-    @ApiModelProperty(value = "直达链接启用状态")
-    private String openUrlStatus;
-    /**
-     * 直达链接生成方式
-     */
-    @Excel(name = "直达链接生成方式", width = 15)
-    @ApiModelProperty(value = "直达链接生成方式")
-    private String openUrlCreateMode;
-    /**
-     * 跳转app链接
-     */
-    @Excel(name = "跳转app链接", width = 15)
-    @ApiModelProperty(value = "跳转app链接")
-    private String redirectUrl;
-    /**
-     * 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;
-
-    @TableField(exist = false)
-    private Long urlId;
-
-    public BytedanceDeliveryTargetTemplate() {
-    }
-}

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

@@ -1,73 +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;
-
-/**
- * 兴趣分类信息
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-09-18
- */
-@Data
-@TableName("ctop_bytedance_interest_category")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_interest_category对象", description = "兴趣分类信息")
-public class BytedanceInterestCategory {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 名称
-     */
-    @Excel(name = "名称", width = 15)
-    @ApiModelProperty(value = "名称")
-    private String name;
-    /**
-     * code
-     */
-    @Excel(name = "code", width = 15)
-    @ApiModelProperty(value = "code")
-    private String code;
-    /**
-     * parentCode
-     */
-    @Excel(name = "parentCode", width = 15)
-    @ApiModelProperty(value = "parentCode")
-    private String parentCode;
-    /**
-     * level
-     */
-    @Excel(name = "level", width = 15)
-    @ApiModelProperty(value = "level")
-    private Integer level;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-}

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

@@ -1,66 +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-08-15
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_bytedance_advertise_name_model_rule_info")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_advertise_name_model_rule_info对象", description = "名称生成规则模板信息")
-public class BytedanceNameModelRule {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 模板名称
-     */
-    @Excel(name = "模板名称", width = 15)
-    @ApiModelProperty(value = "模板名称")
-    private String name;
-    /**
-     * 生成规格
-     */
-    @Excel(name = "生成规格", width = 15)
-    @ApiModelProperty(value = "生成规格")
-    private String rule;
-    /**
-     * 模板状态信息
-     */
-    @Excel(name = "模板状态信息", width = 15)
-    @ApiModelProperty(value = "模板状态信息")
-    private Integer status;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-}

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

@@ -1,640 +0,0 @@
-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.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-09-11
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_bytedance_report_plan_daily")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_report_plan_daily对象", description = "广告计划日报表信息")
-public class BytedancePlanDailyReport {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.UUID)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 广告主id
-     */
-    @Excel(name = "广告主id", width = 15)
-    @ApiModelProperty(value = "广告主id")
-    private Long advertiserId;
-    /**
-     * 数据起始时间
-     */
-    @Excel(name = "数据起始时间", width = 15)
-    @ApiModelProperty(value = "数据起始时间")
-    private String statDatetime;
-    /**
-     * 展示量
-     */
-    @Excel(name = "展示量", width = 15)
-    @ApiModelProperty(value = "展示量")
-    private Long showNum;
-    /**
-     * 点击量
-     */
-    @Excel(name = "点击量", width = 15)
-    @ApiModelProperty(value = "点击量")
-    private Long click;
-    /**
-     * 转化量
-     */
-    @Excel(name = "转化量", width = 15)
-    @ApiModelProperty(value = "转化量")
-    private Long convertNum;
-    /**
-     * 总花费
-     */
-    @Excel(name = "总花费", width = 15)
-    @ApiModelProperty(value = "总花费")
-    private java.math.BigDecimal cost;
-    /**
-     * 应用下载-激活
-     */
-    @Excel(name = "应用下载-激活", width = 15)
-    @ApiModelProperty(value = "应用下载-激活")
-    private Long active;
-    /**
-     * 应用下载-安卓下载完成
-     */
-    @Excel(name = "应用下载-安卓下载完成", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓下载完成")
-    private Long downloadFinish;
-    /**
-     * 应用下载-安卓下载开始
-     */
-    @Excel(name = "应用下载-安卓下载开始", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓下载开始")
-    private Long downloadStart;
-    /**
-     * 应用下载-点击安装数
-     */
-    @Excel(name = "应用下载-点击安装数", width = 15)
-    @ApiModelProperty(value = "应用下载-点击安装数")
-    private Long clickInstall;
-    /**
-     * 应用下载-安卓安装完成
-     */
-    @Excel(name = "应用下载-安卓安装完成", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓安装完成")
-    private Long installFinish;
-    /**
-     * 应用下载-注册
-     */
-    @Excel(name = "应用下载-注册", width = 15)
-    @ApiModelProperty(value = "应用下载-注册")
-    private Long register;
-    /**
-     * 应用下载-付费数
-     */
-    @Excel(name = "应用下载-付费数", width = 15)
-    @ApiModelProperty(value = "应用下载-付费数")
-    private Long payCount;
-    /**
-     * 应用下载-到达uv
-     */
-    @Excel(name = "应用下载-到达uv", width = 15)
-    @ApiModelProperty(value = "应用下载-到达uv")
-    private Long inAppUv;
-    /**
-     * 应用下载-详情页到站uv
-     */
-    @Excel(name = "应用下载-详情页到站uv", width = 15)
-    @ApiModelProperty(value = "应用下载-详情页到站uv")
-    private Long inAppDetailUv;
-    /**
-     * 应用下载-加入购物车
-     */
-    @Excel(name = "应用下载-加入购物车", width = 15)
-    @ApiModelProperty(value = "应用下载-加入购物车")
-    private Long inAppCart;
-    /**
-     * 应用下载-提交订单
-     */
-    @Excel(name = "应用下载-提交订单", width = 15)
-    @ApiModelProperty(value = "应用下载-提交订单")
-    private Long inAppOrder;
-    /**
-     * 应用下载-付费
-     */
-    @Excel(name = "应用下载-付费", width = 15)
-    @ApiModelProperty(value = "应用下载-付费")
-    private Long inAppPay;
-    /**
-     * 落地页-电话拨打数
-     */
-    @Excel(name = "落地页-电话拨打数", width = 15)
-    @ApiModelProperty(value = "落地页-电话拨打数")
-    private Long phone;
-    /**
-     * 表单提交数
-     */
-    @Excel(name = "表单提交数", width = 15)
-    @ApiModelProperty(value = "表单提交数")
-    private Long form;
-    /**
-     * 落地页-地图搜索
-     */
-    @Excel(name = "落地页-地图搜索", width = 15)
-    @ApiModelProperty(value = "落地页-地图搜索")
-    private Long mapSearch;
-    /**
-     * 落地页-按钮button
-     */
-    @Excel(name = "落地页-按钮button", width = 15)
-    @ApiModelProperty(value = "落地页-按钮button")
-    private Long button;
-    /**
-     * 落地页-关键页面浏览
-     */
-    @Excel(name = "落地页-关键页面浏览", width = 15)
-    @ApiModelProperty(value = "落地页-关键页面浏览")
-    private Long view;
-    /**
-     * 落地页-QQ咨询数
-     */
-    @Excel(name = "落地页-QQ咨询数", width = 15)
-    @ApiModelProperty(value = "落地页-QQ咨询数")
-    private Long qq;
-    /**
-     * 落地页-抽奖数
-     */
-    @Excel(name = "落地页-抽奖数", width = 15)
-    @ApiModelProperty(value = "落地页-抽奖数")
-    private Long lottery;
-    /**
-     * 落地页-投票
-     */
-    @Excel(name = "落地页-投票", width = 15)
-    @ApiModelProperty(value = "落地页-投票")
-    private Long vote;
-    /**
-     * 落地页-页面跳转
-     */
-    @Excel(name = "落地页-页面跳转", width = 15)
-    @ApiModelProperty(value = "落地页-页面跳转")
-    private Long redirect;
-    /**
-     * 落地页-商品购买
-     */
-    @Excel(name = "落地页-商品购买", width = 15)
-    @ApiModelProperty(value = "落地页-商品购买")
-    private Long shopping;
-    /**
-     * 落地页-在线咨询
-     */
-    @Excel(name = "落地页-在线咨询", width = 15)
-    @ApiModelProperty(value = "落地页-在线咨询")
-    private Long consult;
-    /**
-     * 落地页-微信
-     */
-    @Excel(name = "落地页-微信", width = 15)
-    @ApiModelProperty(value = "落地页-微信")
-    private Long wechat;
-    /**
-     * 落地页-智能电话确认拨打
-     */
-    @Excel(name = "落地页-智能电话确认拨打", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话确认拨打")
-    private Long phoneConfirm;
-    /**
-     * 落地页-智能电话确认接通
-     */
-    @Excel(name = "落地页-智能电话确认接通", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话确认接通")
-    private Long phoneConnect;
-    /**
-     * 落地页-智能电话有效咨询
-     */
-    @Excel(name = "落地页-智能电话有效咨询", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话有效咨询")
-    private Long consultEffective;
-    /**
-     * 视频-总播放
-     */
-    @Excel(name = "视频-总播放", width = 15)
-    @ApiModelProperty(value = "视频-总播放")
-    private Long totalPlay;
-    /**
-     * 视频-有效播放
-     */
-    @Excel(name = "视频-有效播放", width = 15)
-    @ApiModelProperty(value = "视频-有效播放")
-    private Long validPlay;
-    /**
-     * 视频-wifi播放
-     */
-    @Excel(name = "视频-wifi播放", width = 15)
-    @ApiModelProperty(value = "视频-wifi播放")
-    private Long wifiPlay;
-    /**
-     * 视频-播放时长,单位ms
-     */
-    @Excel(name = "视频-播放时长,单位ms", width = 15)
-    @ApiModelProperty(value = "视频-播放时长,单位ms")
-    private Long playDurationSum;
-    /**
-     * 视频-播放25%进度总数
-     */
-    @Excel(name = "视频-播放25%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放25%进度总数")
-    private Long play25FeedBreak;
-    /**
-     * 视频-播放50%进度总数
-     */
-    @Excel(name = "视频-播放50%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放50%进度总数")
-    private Long play50FeedBreak;
-    /**
-     * 视频-播放75%进度总数
-     */
-    @Excel(name = "视频-播放75%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放75%进度总数")
-    private Long play75FeedBreak;
-    /**
-     * 视频-播放100%进度总数
-     */
-    @Excel(name = "视频-播放100%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放100%进度总数")
-    private Long play100FeedBreak;
-    /**
-     * 附加创意-电话按钮
-     */
-    @Excel(name = "附加创意-电话按钮", width = 15)
-    @ApiModelProperty(value = "附加创意-电话按钮")
-    private Long advancedCreativePhoneClick;
-    /**
-     * 附加创意-在线咨询
-     */
-    @Excel(name = "附加创意-在线咨询", width = 15)
-    @ApiModelProperty(value = "附加创意-在线咨询")
-    private Long advancedCreativeCounselClick;
-    /**
-     * 附加创意-表单提交
-     */
-    @Excel(name = "附加创意-表单提交", width = 15)
-    @ApiModelProperty(value = "附加创意-表单提交")
-    private Long advancedCreativeFormClick;
-    /**
-     * 互动数据-分享数
-     */
-    @Excel(name = "互动数据-分享数", width = 15)
-    @ApiModelProperty(value = "互动数据-分享数")
-    private Long share;
-    /**
-     * 互动数据-评论数
-     */
-    @Excel(name = "互动数据-评论数", width = 15)
-    @ApiModelProperty(value = "互动数据-评论数")
-    private Long comment;
-    /**
-     * 互动数据-点赞数
-     */
-    @Excel(name = "互动数据-点赞数", width = 15)
-    @ApiModelProperty(value = "互动数据-点赞数")
-    private Long likeNum;
-    /**
-     * 互动数据-关注数
-     */
-    @Excel(name = "互动数据-关注数", width = 15)
-    @ApiModelProperty(value = "互动数据-关注数")
-    private Long follow;
-    /**
-     * 互动数据-主页访问量
-     */
-    @Excel(name = "互动数据-主页访问量", width = 15)
-    @ApiModelProperty(value = "互动数据-主页访问量")
-    private Long homeVisited;
-    /**
-     * 互动数据-挑战赛查看数
-     */
-    @Excel(name = "互动数据-挑战赛查看数", width = 15)
-    @ApiModelProperty(value = "互动数据-挑战赛查看数")
-    private Long iesChallengeClick;
-    /**
-     * 互动数据-音乐查看数
-     */
-    @Excel(name = "互动数据-音乐查看数", width = 15)
-    @ApiModelProperty(value = "互动数据-音乐查看数")
-    private Long iesMusicClick;
-    /**
-     * 互动数据-单次互动成本
-     */
-    @Excel(name = "互动数据-单次互动成本", width = 15)
-    @ApiModelProperty(value = "互动数据-单次互动成本")
-    private java.math.BigDecimal interactPerCost;
-    /**
-     * 次留数
-     */
-    @Excel(name = "次留数", width = 15)
-    @ApiModelProperty(value = "次留数")
-    private Long nextDayOpen;
-    /**
-     * 次留率
-     */
-    @Excel(name = "次留率", width = 15)
-    @ApiModelProperty(value = "次留率")
-    private java.math.BigDecimal nextDayOpenRate;
-    /**
-     * 次留成本
-     */
-    @Excel(name = "次留成本", width = 15)
-    @ApiModelProperty(value = "次留成本")
-    private java.math.BigDecimal nextDayOpenCost;
-    /**
-     * 广告组id
-     */
-    @Excel(name = "广告组id", width = 15)
-    @ApiModelProperty(value = "广告组id")
-    private Long adId;
-    /**
-     * 广告组名称
-     */
-    @Excel(name = "广告组名称", width = 15)
-    @ApiModelProperty(value = "广告组名称")
-    private String adName;
-    /**
-     * campaignId
-     */
-    @Excel(name = "campaignId", width = 15)
-    @ApiModelProperty(value = "campaignId")
-    private Long campaignId;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-
-    public BytedancePlanDailyReport(JSONObject data) {
-        Long playFeedBreak75 = data.getLong("play_75_feed_break");
-        if (null != playFeedBreak75) {
-            this.play75FeedBreak = playFeedBreak75;
-        }
-        Long nextDayOpen = data.getLong("next_day_open");
-        if (null != nextDayOpen) {
-            this.nextDayOpen = nextDayOpen;
-        }
-        Long convert = data.getLong("convert");
-        if (null != convert) {
-            this.convertNum = convert;
-        }
-        Long inAppCart = data.getLong("in_app_cart");
-        if (null != inAppCart) {
-            this.inAppCart = inAppCart;
-        }
-        Long play25FeedBreak = data.getLong("play_25_feed_break");
-        if (null != play25FeedBreak) {
-            this.play25FeedBreak = play25FeedBreak;
-        }
-        Long consultEffective = data.getLong("consult_effective");
-        if (null != consultEffective) {
-            this.consultEffective = consultEffective;
-        }
-        Long view = data.getLong("view");
-        if (null != view) {
-            this.view = view;
-        }
-        Long phoneConfirm = data.getLong("phone_confirm");
-        if (null != phoneConfirm) {
-            this.phoneConfirm = phoneConfirm;
-        }
-        Long iesMusicClick = data.getLong("ies_music_click");
-        if (null != iesMusicClick) {
-            this.iesMusicClick = iesMusicClick;
-        }
-        Long wifiPlay = data.getLong("wifi_play");
-        if (null != wifiPlay) {
-            this.wifiPlay = wifiPlay;
-        }
-        String stat_datetime = data.getString("stat_datetime");
-        if (null != stat_datetime && !"".equals(stat_datetime.trim())) {
-            this.statDatetime = stat_datetime;
-        }
-        Long shopping = data.getLong("shopping");
-        if (null != shopping) {
-            this.shopping = shopping;
-        }
-        Long qq = data.getLong("qq");
-        if (null != qq) {
-            this.qq = qq;
-        }
-        Long like = data.getLong("like");
-        if (null != like) {
-            this.likeNum = like;
-        }
-        Long play_50_feed_break = data.getLong("play_50_feed_break");
-        if (null != play_50_feed_break) {
-            this.play50FeedBreak = play_50_feed_break;
-        }
-        Long active = data.getLong("active");
-        if (null != active) {
-            this.active = active;
-        }
-        Long click = data.getLong("click");
-        if (null != click) {
-            this.click = click;
-        }
-        Long advanced_creative_phone_click = data.getLong("advanced_creative_phone_click");
-        if (null != advanced_creative_phone_click) {
-            this.advancedCreativePhoneClick = advanced_creative_phone_click;
-        }
-        Long download_start = data.getLong("download_start");
-        if (null != download_start) {
-            this.downloadStart = download_start;
-        }
-        Long home_visited = data.getLong("home_visited");
-        if (null != home_visited) {
-            this.homeVisited = home_visited;
-        }
-        Long phone = data.getLong("phone");
-        if (null != phone) {
-            this.phone = phone;
-        }
-        Long in_app_pay = data.getLong("in_app_pay");
-        if (null != in_app_pay) {
-            this.inAppPay = in_app_pay;
-        }
-        BigDecimal next_day_open_cost = data.getBigDecimal("next_day_open_cost");
-        if (null != next_day_open_cost) {
-            this.nextDayOpenCost = next_day_open_cost;
-        }
-        Long ies_challenge_click = data.getLong("ies_challenge_click");
-        if (null != ies_challenge_click) {
-            this.iesChallengeClick = ies_challenge_click;
-        }
-        Long total_play = data.getLong("total_play");
-        if (null != total_play) {
-            this.totalPlay = total_play;
-        }
-        Long show = data.getLong("show");
-        if (null != show) {
-            this.showNum = show;
-        }
-        BigDecimal next_day_open_rate = data.getBigDecimal("next_day_open_rate");
-        if (null != next_day_open_rate) {
-            this.nextDayOpenRate = next_day_open_rate;
-        }
-        Long map_search = data.getLong("map_search");
-        if (null != map_search) {
-            this.mapSearch = map_search;
-        }
-        Long click_install = data.getLong("click_install");
-        if (null != click_install) {
-            this.clickInstall = click_install;
-        }
-        BigDecimal interact_per_cost = data.getBigDecimal("interact_per_cost");
-        if (null != interact_per_cost) {
-            this.interactPerCost = interact_per_cost;
-        }
-        Long advertiser_id = data.getLong("advertiser_id");
-        if (null != advertiser_id) {
-            this.advertiserId = advertiser_id;
-        }
-        Long button = data.getLong("button");
-        if (null != button) {
-            this.button = button;
-        }
-        Long play_duration_sum = data.getLong("play_duration_sum");
-        if (null != play_duration_sum) {
-            this.playDurationSum = play_duration_sum;
-        }
-        Long play_100_feed_break = data.getLong("play_100_feed_break");
-        if (null != play_100_feed_break) {
-            this.play100FeedBreak = play_100_feed_break;
-        }
-        Long advanced_creative_counsel_click = data.getLong("advanced_creative_counsel_click");
-        if (null != advanced_creative_counsel_click) {
-            this.advancedCreativeCounselClick = advanced_creative_counsel_click;
-        }
-        Long share = data.getLong("share");
-        if (null != share) {
-            this.share = share;
-        }
-        Long consult = data.getLong("consult");
-        if (null != consult) {
-            this.consult = consult;
-        }
-        Long vote = data.getLong("vote");
-        if (null != vote) {
-            this.vote = vote;
-        }
-        Long valid_play = data.getLong("valid_play");
-        if (null != valid_play) {
-            this.validPlay = valid_play;
-        }
-        Long redirect = data.getLong("redirect");
-        if (null != redirect) {
-            this.redirect = redirect;
-        }
-        Long pay_count = data.getLong("pay_count");
-        if (null != pay_count) {
-            this.payCount = pay_count;
-        }
-        Long advanced_creative_form_click = data.getLong("advanced_creative_form_click");
-        if (null != advanced_creative_form_click) {
-            this.advancedCreativeFormClick = advanced_creative_form_click;
-        }
-        BigDecimal cost = data.getBigDecimal("cost");
-        if (null != cost) {
-            this.cost = cost;
-        }
-        Long download_finish = data.getLong("download_finish");
-        if (null != download_finish) {
-            this.downloadFinish = download_finish;
-        }
-        Long wechat = data.getLong("wechat");
-        if (null != wechat) {
-            this.wechat = wechat;
-        }
-        Long lottery = data.getLong("lottery");
-        if (null != lottery) {
-            this.lottery = lottery;
-        }
-        Long in_app_order = data.getLong("in_app_order");
-        if (null != in_app_order) {
-            this.inAppOrder = in_app_order;
-        }
-        Long install_finish = data.getLong("install_finish");
-        if (null != install_finish) {
-            this.installFinish = install_finish;
-        }
-        Long follow = data.getLong("follow");
-        if (null != follow) {
-            this.follow = follow;
-        }
-//		Long message = data.getLong("message");
-//		if(null!=message){
-//			this.message = message;
-//		}
-        Long in_app_detail_uv = data.getLong("in_app_detail_uv");
-        if (null != in_app_detail_uv) {
-            this.inAppDetailUv = in_app_detail_uv;
-        }
-        Long form = data.getLong("form");
-        if (null != form) {
-            this.form = form;
-        }
-//		BigDecimal convert_cost = data.getBigDecimal("convert_cost");
-//		if(null!=convert_cost){
-//			this.convertCost = convert_cost;
-//		}
-        Long comment = data.getLong("comment");
-        if (null != comment) {
-            this.comment = comment;
-        }
-        Long in_app_uv = data.getLong("in_app_uv");
-        if (null != in_app_uv) {
-            this.inAppUv = in_app_uv;
-        }
-        Long register = data.getLong("register");
-        if (null != register) {
-            this.register = register;
-        }
-        Long campaignId = data.getLong("campaign_id");
-        if (null != campaignId) {
-            this.campaignId = campaignId;
-        }
-        String adName = data.getString("ad_name");
-        if (null != adName) {
-            this.adName = adName;
-        }
-        Long adId = data.getLong("ad_id");
-        if (null != adId) {
-            this.adId = adId;
-        }
-    }
-
-    public BytedancePlanDailyReport() {
-    }
-}

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

@@ -1,640 +0,0 @@
-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.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-09-11
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_bytedance_report_plan_hourly")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_report_plan_hourly对象", description = "广告计划时报表信息")
-public class BytedancePlanHourlyReport {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.UUID)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 广告主id
-     */
-    @Excel(name = "广告主id", width = 15)
-    @ApiModelProperty(value = "广告主id")
-    private Long advertiserId;
-    /**
-     * 数据起始时间
-     */
-    @Excel(name = "数据起始时间", width = 15)
-    @ApiModelProperty(value = "数据起始时间")
-    private String statDatetime;
-    /**
-     * 展示量
-     */
-    @Excel(name = "展示量", width = 15)
-    @ApiModelProperty(value = "展示量")
-    private Long showNum;
-    /**
-     * 点击量
-     */
-    @Excel(name = "点击量", width = 15)
-    @ApiModelProperty(value = "点击量")
-    private Long click;
-    /**
-     * 转化量
-     */
-    @Excel(name = "转化量", width = 15)
-    @ApiModelProperty(value = "转化量")
-    private Long convertNum;
-    /**
-     * 总花费
-     */
-    @Excel(name = "总花费", width = 15)
-    @ApiModelProperty(value = "总花费")
-    private java.math.BigDecimal cost;
-    /**
-     * 应用下载-激活
-     */
-    @Excel(name = "应用下载-激活", width = 15)
-    @ApiModelProperty(value = "应用下载-激活")
-    private Long active;
-    /**
-     * 应用下载-安卓下载完成
-     */
-    @Excel(name = "应用下载-安卓下载完成", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓下载完成")
-    private Long downloadFinish;
-    /**
-     * 应用下载-安卓下载开始
-     */
-    @Excel(name = "应用下载-安卓下载开始", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓下载开始")
-    private Long downloadStart;
-    /**
-     * 应用下载-点击安装数
-     */
-    @Excel(name = "应用下载-点击安装数", width = 15)
-    @ApiModelProperty(value = "应用下载-点击安装数")
-    private Long clickInstall;
-    /**
-     * 应用下载-安卓安装完成
-     */
-    @Excel(name = "应用下载-安卓安装完成", width = 15)
-    @ApiModelProperty(value = "应用下载-安卓安装完成")
-    private Long installFinish;
-    /**
-     * 应用下载-注册
-     */
-    @Excel(name = "应用下载-注册", width = 15)
-    @ApiModelProperty(value = "应用下载-注册")
-    private Long register;
-    /**
-     * 应用下载-付费数
-     */
-    @Excel(name = "应用下载-付费数", width = 15)
-    @ApiModelProperty(value = "应用下载-付费数")
-    private Long payCount;
-    /**
-     * 应用下载-到达uv
-     */
-    @Excel(name = "应用下载-到达uv", width = 15)
-    @ApiModelProperty(value = "应用下载-到达uv")
-    private Long inAppUv;
-    /**
-     * 应用下载-详情页到站uv
-     */
-    @Excel(name = "应用下载-详情页到站uv", width = 15)
-    @ApiModelProperty(value = "应用下载-详情页到站uv")
-    private Long inAppDetailUv;
-    /**
-     * 应用下载-加入购物车
-     */
-    @Excel(name = "应用下载-加入购物车", width = 15)
-    @ApiModelProperty(value = "应用下载-加入购物车")
-    private Long inAppCart;
-    /**
-     * 应用下载-提交订单
-     */
-    @Excel(name = "应用下载-提交订单", width = 15)
-    @ApiModelProperty(value = "应用下载-提交订单")
-    private Long inAppOrder;
-    /**
-     * 应用下载-付费
-     */
-    @Excel(name = "应用下载-付费", width = 15)
-    @ApiModelProperty(value = "应用下载-付费")
-    private Long inAppPay;
-    /**
-     * 落地页-电话拨打数
-     */
-    @Excel(name = "落地页-电话拨打数", width = 15)
-    @ApiModelProperty(value = "落地页-电话拨打数")
-    private Long phone;
-    /**
-     * 表单提交数
-     */
-    @Excel(name = "表单提交数", width = 15)
-    @ApiModelProperty(value = "表单提交数")
-    private Long form;
-    /**
-     * 落地页-地图搜索
-     */
-    @Excel(name = "落地页-地图搜索", width = 15)
-    @ApiModelProperty(value = "落地页-地图搜索")
-    private Long mapSearch;
-    /**
-     * 落地页-按钮button
-     */
-    @Excel(name = "落地页-按钮button", width = 15)
-    @ApiModelProperty(value = "落地页-按钮button")
-    private Long button;
-    /**
-     * 落地页-关键页面浏览
-     */
-    @Excel(name = "落地页-关键页面浏览", width = 15)
-    @ApiModelProperty(value = "落地页-关键页面浏览")
-    private Long view;
-    /**
-     * 落地页-QQ咨询数
-     */
-    @Excel(name = "落地页-QQ咨询数", width = 15)
-    @ApiModelProperty(value = "落地页-QQ咨询数")
-    private Long qq;
-    /**
-     * 落地页-抽奖数
-     */
-    @Excel(name = "落地页-抽奖数", width = 15)
-    @ApiModelProperty(value = "落地页-抽奖数")
-    private Long lottery;
-    /**
-     * 落地页-投票
-     */
-    @Excel(name = "落地页-投票", width = 15)
-    @ApiModelProperty(value = "落地页-投票")
-    private Long vote;
-    /**
-     * 落地页-页面跳转
-     */
-    @Excel(name = "落地页-页面跳转", width = 15)
-    @ApiModelProperty(value = "落地页-页面跳转")
-    private Long redirect;
-    /**
-     * 落地页-商品购买
-     */
-    @Excel(name = "落地页-商品购买", width = 15)
-    @ApiModelProperty(value = "落地页-商品购买")
-    private Long shopping;
-    /**
-     * 落地页-在线咨询
-     */
-    @Excel(name = "落地页-在线咨询", width = 15)
-    @ApiModelProperty(value = "落地页-在线咨询")
-    private Long consult;
-    /**
-     * 落地页-微信
-     */
-    @Excel(name = "落地页-微信", width = 15)
-    @ApiModelProperty(value = "落地页-微信")
-    private Long wechat;
-    /**
-     * 落地页-智能电话确认拨打
-     */
-    @Excel(name = "落地页-智能电话确认拨打", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话确认拨打")
-    private Long phoneConfirm;
-    /**
-     * 落地页-智能电话确认接通
-     */
-    @Excel(name = "落地页-智能电话确认接通", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话确认接通")
-    private Long phoneConnect;
-    /**
-     * 落地页-智能电话有效咨询
-     */
-    @Excel(name = "落地页-智能电话有效咨询", width = 15)
-    @ApiModelProperty(value = "落地页-智能电话有效咨询")
-    private Long consultEffective;
-    /**
-     * 视频-总播放
-     */
-    @Excel(name = "视频-总播放", width = 15)
-    @ApiModelProperty(value = "视频-总播放")
-    private Long totalPlay;
-    /**
-     * 视频-有效播放
-     */
-    @Excel(name = "视频-有效播放", width = 15)
-    @ApiModelProperty(value = "视频-有效播放")
-    private Long validPlay;
-    /**
-     * 视频-wifi播放
-     */
-    @Excel(name = "视频-wifi播放", width = 15)
-    @ApiModelProperty(value = "视频-wifi播放")
-    private Long wifiPlay;
-    /**
-     * 视频-播放时长,单位ms
-     */
-    @Excel(name = "视频-播放时长,单位ms", width = 15)
-    @ApiModelProperty(value = "视频-播放时长,单位ms")
-    private Long playDurationSum;
-    /**
-     * 视频-播放25%进度总数
-     */
-    @Excel(name = "视频-播放25%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放25%进度总数")
-    private Long play25FeedBreak;
-    /**
-     * 视频-播放50%进度总数
-     */
-    @Excel(name = "视频-播放50%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放50%进度总数")
-    private Long play50FeedBreak;
-    /**
-     * 视频-播放75%进度总数
-     */
-    @Excel(name = "视频-播放75%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放75%进度总数")
-    private Long play75FeedBreak;
-    /**
-     * 视频-播放100%进度总数
-     */
-    @Excel(name = "视频-播放100%进度总数", width = 15)
-    @ApiModelProperty(value = "视频-播放100%进度总数")
-    private Long play100FeedBreak;
-    /**
-     * 附加创意-电话按钮
-     */
-    @Excel(name = "附加创意-电话按钮", width = 15)
-    @ApiModelProperty(value = "附加创意-电话按钮")
-    private Long advancedCreativePhoneClick;
-    /**
-     * 附加创意-在线咨询
-     */
-    @Excel(name = "附加创意-在线咨询", width = 15)
-    @ApiModelProperty(value = "附加创意-在线咨询")
-    private Long advancedCreativeCounselClick;
-    /**
-     * 附加创意-表单提交
-     */
-    @Excel(name = "附加创意-表单提交", width = 15)
-    @ApiModelProperty(value = "附加创意-表单提交")
-    private Long advancedCreativeFormClick;
-    /**
-     * 互动数据-分享数
-     */
-    @Excel(name = "互动数据-分享数", width = 15)
-    @ApiModelProperty(value = "互动数据-分享数")
-    private Long share;
-    /**
-     * 互动数据-评论数
-     */
-    @Excel(name = "互动数据-评论数", width = 15)
-    @ApiModelProperty(value = "互动数据-评论数")
-    private Long comment;
-    /**
-     * 互动数据-点赞数
-     */
-    @Excel(name = "互动数据-点赞数", width = 15)
-    @ApiModelProperty(value = "互动数据-点赞数")
-    private Long likeNum;
-    /**
-     * 互动数据-关注数
-     */
-    @Excel(name = "互动数据-关注数", width = 15)
-    @ApiModelProperty(value = "互动数据-关注数")
-    private Long follow;
-    /**
-     * 互动数据-主页访问量
-     */
-    @Excel(name = "互动数据-主页访问量", width = 15)
-    @ApiModelProperty(value = "互动数据-主页访问量")
-    private Long homeVisited;
-    /**
-     * 互动数据-挑战赛查看数
-     */
-    @Excel(name = "互动数据-挑战赛查看数", width = 15)
-    @ApiModelProperty(value = "互动数据-挑战赛查看数")
-    private Long iesChallengeClick;
-    /**
-     * 互动数据-音乐查看数
-     */
-    @Excel(name = "互动数据-音乐查看数", width = 15)
-    @ApiModelProperty(value = "互动数据-音乐查看数")
-    private Long iesMusicClick;
-    /**
-     * 互动数据-单次互动成本
-     */
-    @Excel(name = "互动数据-单次互动成本", width = 15)
-    @ApiModelProperty(value = "互动数据-单次互动成本")
-    private java.math.BigDecimal interactPerCost;
-    /**
-     * 次留数
-     */
-    @Excel(name = "次留数", width = 15)
-    @ApiModelProperty(value = "次留数")
-    private Long nextDayOpen;
-    /**
-     * 次留率
-     */
-    @Excel(name = "次留率", width = 15)
-    @ApiModelProperty(value = "次留率")
-    private java.math.BigDecimal nextDayOpenRate;
-    /**
-     * 次留成本
-     */
-    @Excel(name = "次留成本", width = 15)
-    @ApiModelProperty(value = "次留成本")
-    private java.math.BigDecimal nextDayOpenCost;
-    /**
-     * 广告组id
-     */
-    @Excel(name = "广告组id", width = 15)
-    @ApiModelProperty(value = "广告组id")
-    private Long adId;
-    /**
-     * 广告组名称
-     */
-    @Excel(name = "广告组名称", width = 15)
-    @ApiModelProperty(value = "广告组名称")
-    private String adName;
-    /**
-     * campaignId
-     */
-    @Excel(name = "campaignId", width = 15)
-    @ApiModelProperty(value = "campaignId")
-    private Long campaignId;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-
-    public BytedancePlanHourlyReport(JSONObject data) {
-        Long playFeedBreak75 = data.getLong("play_75_feed_break");
-        if (null != playFeedBreak75) {
-            this.play75FeedBreak = playFeedBreak75;
-        }
-        Long next_day_open = data.getLong("next_day_open");
-        if (null != next_day_open) {
-            this.nextDayOpen = next_day_open;
-        }
-        Long convert = data.getLong("convert");
-        if (null != convert) {
-            this.convertNum = convert;
-        }
-        Long in_app_cart = data.getLong("in_app_cart");
-        if (null != in_app_cart) {
-            this.inAppCart = in_app_cart;
-        }
-        Long play_25_feed_break = data.getLong("play_25_feed_break");
-        if (null != play_25_feed_break) {
-            this.play25FeedBreak = play_25_feed_break;
-        }
-        Long consult_effective = data.getLong("consult_effective");
-        if (null != consult_effective) {
-            this.consultEffective = consult_effective;
-        }
-        Long view = data.getLong("view");
-        if (null != view) {
-            this.view = view;
-        }
-        Long phone_confirm = data.getLong("phone_confirm");
-        if (null != phone_confirm) {
-            this.phoneConfirm = phone_confirm;
-        }
-        Long ies_music_click = data.getLong("ies_music_click");
-        if (null != ies_music_click) {
-            this.iesMusicClick = ies_music_click;
-        }
-        Long wifi_play = data.getLong("wifi_play");
-        if (null != wifi_play) {
-            this.wifiPlay = wifi_play;
-        }
-        String stat_datetime = data.getString("stat_datetime");
-        if (null != stat_datetime && !"".equals(stat_datetime.trim())) {
-            this.statDatetime = stat_datetime;
-        }
-        Long shopping = data.getLong("shopping");
-        if (null != shopping) {
-            this.shopping = shopping;
-        }
-        Long qq = data.getLong("qq");
-        if (null != qq) {
-            this.qq = qq;
-        }
-        Long like = data.getLong("like");
-        if (null != like) {
-            this.likeNum = like;
-        }
-        Long play_50_feed_break = data.getLong("play_50_feed_break");
-        if (null != play_50_feed_break) {
-            this.play50FeedBreak = play_50_feed_break;
-        }
-        Long active = data.getLong("active");
-        if (null != active) {
-            this.active = active;
-        }
-        Long click = data.getLong("click");
-        if (null != click) {
-            this.click = click;
-        }
-        Long advanced_creative_phone_click = data.getLong("advanced_creative_phone_click");
-        if (null != advanced_creative_phone_click) {
-            this.advancedCreativePhoneClick = advanced_creative_phone_click;
-        }
-        Long download_start = data.getLong("download_start");
-        if (null != download_start) {
-            this.downloadStart = download_start;
-        }
-        Long home_visited = data.getLong("home_visited");
-        if (null != home_visited) {
-            this.homeVisited = home_visited;
-        }
-        Long phone = data.getLong("phone");
-        if (null != phone) {
-            this.phone = phone;
-        }
-        Long in_app_pay = data.getLong("in_app_pay");
-        if (null != in_app_pay) {
-            this.inAppPay = in_app_pay;
-        }
-        BigDecimal next_day_open_cost = data.getBigDecimal("next_day_open_cost");
-        if (null != next_day_open_cost) {
-            this.nextDayOpenCost = next_day_open_cost;
-        }
-        Long ies_challenge_click = data.getLong("ies_challenge_click");
-        if (null != ies_challenge_click) {
-            this.iesChallengeClick = ies_challenge_click;
-        }
-        Long total_play = data.getLong("total_play");
-        if (null != total_play) {
-            this.totalPlay = total_play;
-        }
-        Long show = data.getLong("show");
-        if (null != show) {
-            this.showNum = show;
-        }
-        BigDecimal next_day_open_rate = data.getBigDecimal("next_day_open_rate");
-        if (null != next_day_open_rate) {
-            this.nextDayOpenRate = next_day_open_rate;
-        }
-        Long map_search = data.getLong("map_search");
-        if (null != map_search) {
-            this.mapSearch = map_search;
-        }
-        Long click_install = data.getLong("click_install");
-        if (null != click_install) {
-            this.clickInstall = click_install;
-        }
-        BigDecimal interact_per_cost = data.getBigDecimal("interact_per_cost");
-        if (null != interact_per_cost) {
-            this.interactPerCost = interact_per_cost;
-        }
-        Long advertiser_id = data.getLong("advertiser_id");
-        if (null != advertiser_id) {
-            this.advertiserId = advertiser_id;
-        }
-        Long button = data.getLong("button");
-        if (null != button) {
-            this.button = button;
-        }
-        Long play_duration_sum = data.getLong("play_duration_sum");
-        if (null != play_duration_sum) {
-            this.playDurationSum = play_duration_sum;
-        }
-        Long play_100_feed_break = data.getLong("play_100_feed_break");
-        if (null != play_100_feed_break) {
-            this.play100FeedBreak = play_100_feed_break;
-        }
-        Long advanced_creative_counsel_click = data.getLong("advanced_creative_counsel_click");
-        if (null != advanced_creative_counsel_click) {
-            this.advancedCreativeCounselClick = advanced_creative_counsel_click;
-        }
-        Long share = data.getLong("share");
-        if (null != share) {
-            this.share = share;
-        }
-        Long consult = data.getLong("consult");
-        if (null != consult) {
-            this.consult = consult;
-        }
-        Long vote = data.getLong("vote");
-        if (null != vote) {
-            this.vote = vote;
-        }
-        Long valid_play = data.getLong("valid_play");
-        if (null != valid_play) {
-            this.validPlay = valid_play;
-        }
-        Long redirect = data.getLong("redirect");
-        if (null != redirect) {
-            this.redirect = redirect;
-        }
-        Long pay_count = data.getLong("pay_count");
-        if (null != pay_count) {
-            this.payCount = pay_count;
-        }
-        Long advanced_creative_form_click = data.getLong("advanced_creative_form_click");
-        if (null != advanced_creative_form_click) {
-            this.advancedCreativeFormClick = advanced_creative_form_click;
-        }
-        BigDecimal cost = data.getBigDecimal("cost");
-        if (null != cost) {
-            this.cost = cost;
-        }
-        Long download_finish = data.getLong("download_finish");
-        if (null != download_finish) {
-            this.downloadFinish = download_finish;
-        }
-        Long wechat = data.getLong("wechat");
-        if (null != wechat) {
-            this.wechat = wechat;
-        }
-        Long lottery = data.getLong("lottery");
-        if (null != lottery) {
-            this.lottery = lottery;
-        }
-        Long in_app_order = data.getLong("in_app_order");
-        if (null != in_app_order) {
-            this.inAppOrder = in_app_order;
-        }
-        Long install_finish = data.getLong("install_finish");
-        if (null != install_finish) {
-            this.installFinish = install_finish;
-        }
-        Long follow = data.getLong("follow");
-        if (null != follow) {
-            this.follow = follow;
-        }
-//		Long message = data.getLong("message");
-//		if(null!=message){
-//			this.message = message;
-//		}
-        Long in_app_detail_uv = data.getLong("in_app_detail_uv");
-        if (null != in_app_detail_uv) {
-            this.inAppDetailUv = in_app_detail_uv;
-        }
-        Long form = data.getLong("form");
-        if (null != form) {
-            this.form = form;
-        }
-//		BigDecimal convert_cost = data.getBigDecimal("convert_cost");
-//		if(null!=convert_cost){
-//			this.convertCost = convert_cost;
-//		}
-        Long comment = data.getLong("comment");
-        if (null != comment) {
-            this.comment = comment;
-        }
-        Long in_app_uv = data.getLong("in_app_uv");
-        if (null != in_app_uv) {
-            this.inAppUv = in_app_uv;
-        }
-        Long register = data.getLong("register");
-        if (null != register) {
-            this.register = register;
-        }
-        Long campaignId = data.getLong("campaign_id");
-        if (null != campaignId) {
-            this.campaignId = campaignId;
-        }
-        String adName = data.getString("ad_name");
-        if (null != adName) {
-            this.adName = adName;
-        }
-        Long adId = data.getLong("ad_id");
-        if (null != adId) {
-            this.adId = adId;
-        }
-    }
-
-    public BytedancePlanHourlyReport() {
-    }
-}

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

@@ -1,74 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * @Description: 今日头条链接信息
- * @Author: jeecg-boot
- * @Date: 2019-08-06
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_bytedance_url_info")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_bytedance_url_info对象", description = "今日头条链接信息")
-public class BytedanceUrlInfo {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * advertiserId
-     */
-    @Excel(name = "advertiserId", width = 15)
-    @ApiModelProperty(value = "advertiserId")
-    private String advertiserId;
-    /**
-     * 描述信息
-     */
-    @Excel(name = "名称", width = 15)
-    @ApiModelProperty(value = "描述信息")
-    private String name;
-    /**
-     * 链接地址
-     */
-    @Excel(name = "链接地址", width = 15)
-    @ApiModelProperty(value = "链接地址")
-    private String url;
-    /**
-     * 应用包名
-     */
-    @Excel(name = "应用包名", width = 15)
-    @ApiModelProperty(value = "应用包名")
-    private String packageName;
-    /**
-     * 链接类型
-     */
-    @Excel(name = "链接类型", width = 15)
-    @ApiModelProperty(value = "链接类型")
-    private String type;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-}

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

@@ -1,137 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecg.common.util.DateUtils;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @Description: oauth授权码
- * @Author: jeecg-boot
- * @Date: 2019-07-09
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_oauth_token")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_oauth_token对象", description = "oauth授权码")
-public class CtopOauthToken {
-
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.UUID)
-    @ApiModelProperty(value = "主键ID")
-    private String id;
-    /**
-     * 媒体ID(外部广告平台类型,快手/头条/抖音等)
-     */
-    @Excel(name = "媒体ID(外部广告平台类型,快手/头条/抖音等)", width = 15)
-    @ApiModelProperty(value = "媒体ID(外部广告平台类型,快手/头条/抖音等)")
-    private String mediaId;
-    /**
-     * 广告主ID(自己平台用户内部id)
-     */
-    @Excel(name = "广告主ID(自己平台用户内部id)", width = 15)
-    @ApiModelProperty(value = "广告主ID(自己平台用户内部id)")
-    private String advertiserId;
-    /**
-     * 广告账户ID(相当于头条返回的access_token数据中的advertiser_id)
-     */
-    @Excel(name = "广告账户ID(相当于头条返回的access_token数据中的advertiser_id)", width = 15)
-    @ApiModelProperty(value = "广告账户ID(相当于头条返回的access_token数据中的advertiser_id)")
-    private Long accountId;
-    /**
-     * 访问令牌
-     */
-    @Excel(name = "访问令牌", width = 15)
-    @ApiModelProperty(value = "访问令牌")
-    private String accessToken;
-    /**
-     * 访问令牌有效期
-     */
-    @Excel(name = "访问令牌有效期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "访问令牌有效期")
-    private Date accessTokenExpiresIn;
-    /**
-     * 刷新令牌
-     */
-    @Excel(name = "刷新令牌", width = 15)
-    @ApiModelProperty(value = "刷新令牌")
-    private String refreshToken;
-    /**
-     * 刷新令牌有效期
-     */
-    @Excel(name = "刷新令牌有效期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "刷新令牌有效期")
-    private Date refreshTokenExpiresIn;
-    /**
-     * 创建时间
-     */
-    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    /**
-     * 修改时间
-     */
-    @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    public CtopOauthToken(String userId, JSONObject data) {
-        this.advertiserId = userId;
-        this.mediaId = "1";
-        this.accountId = data.getLong("advertiser_id");
-        String accessToken = data.getString("access_token");
-        Integer refreshTokenExpiresIn = data.getInteger("refresh_token_expires_in");
-        Integer expiresIn = data.getInteger("expires_in");
-        String refreshToken = data.getString("refresh_token");
-        this.accessToken = accessToken;
-        this.refreshToken = refreshToken;
-        Date now = new Date();
-        this.accessTokenExpiresIn = DateUtils.addSecond(now, expiresIn);
-        this.refreshTokenExpiresIn = DateUtils.addSecond(now, refreshTokenExpiresIn);
-        this.createTime = now;
-        this.updateTime = now;
-    }
-
-    public CtopOauthToken() {
-    }
-
-    public CtopOauthToken(CtopOauthToken token, JSONObject data) {
-        this.advertiserId = token.getAdvertiserId();
-        this.mediaId = "1";
-        this.accountId = token.getAccountId();
-        String accessToken = data.getString("access_token");
-        Integer refreshTokenExpiresIn = data.getInteger("refresh_token_expires_in");
-        Integer expiresIn = data.getInteger("expires_in");
-        String refreshToken = data.getString("refresh_token");
-        this.accessToken = accessToken;
-        this.refreshToken = refreshToken;
-        Date now = new Date();
-        this.accessTokenExpiresIn = DateUtils.addSecond(now, expiresIn);
-        this.refreshTokenExpiresIn = DateUtils.addSecond(now, refreshTokenExpiresIn);
-        this.createTime = now;
-        this.updateTime = now;
-    }
-}

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

@@ -1,134 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * @Description: 文件信息
- * @Author: jeecg-boot
- * @Date: 2019-07-28
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_file_info")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_file_info对象", description = "文件信息")
-public class FileInfo {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 文件名称
-     */
-    @Excel(name = "文件名称", width = 15)
-    @ApiModelProperty(value = "文件名称")
-    private String fileName;
-
-    /**
-     * md5
-     */
-    @Excel(name = "md5", width = 15)
-    @ApiModelProperty(value = "文件MD5值")
-    private String md5;
-
-    /**
-     * 平台文件id
-     */
-    @Excel(name = "平台文件id")
-    @ApiModelProperty(value = "平台文件id")
-    private String fileId;
-
-    /**
-     * 文件类型
-     */
-    @Excel(name = "文件类型", width = 15)
-    @ApiModelProperty(value = "文件类型")
-    private String type;
-
-    /**
-     * 文件类型
-     */
-    @Excel(name = "所属平台类型", width = 15)
-    @ApiModelProperty(value = "所属平台类型")
-    private String platformType;
-
-    /**
-     * 文件访问路径
-     */
-    @Excel(name = "文件地址", width = 15)
-    @ApiModelProperty(value = "文件地址")
-    private String path;
-
-    @Excel(name = "头条账号id", width = 15)
-    @ApiModelProperty(value = "头条账号id")
-    private Long accountId;
-
-    @Excel(name = "广告主id", width = 15)
-    @ApiModelProperty(value = "广告主id")
-    private String advertiserId;
-
-    @Excel(name = "文件访问路径", width = 15)
-    @ApiModelProperty(value = "文件访问路径")
-    private String fileUrl;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-
-    public FileInfo(String md5Hex, JSONObject data, String advertiserId, CtopOauthToken token, String imageUrl, String imagePath, String fileType, String platformType) {
-        this.type = fileType;
-        if ("IMAGE".equals(type)) {
-            this.fileId = data.getString("id");
-        } else {
-            this.fileId = data.getString("video_id");
-        }
-        this.fileName = imagePath.substring(imagePath.lastIndexOf("/") + 1);
-        Date now = new Date();
-        this.createTime = now;
-        this.updateTime = now;
-        this.accountId = token.getAccountId();
-        this.advertiserId = token.getAdvertiserId();
-        this.fileUrl = imageUrl;
-        this.path = imagePath;
-        this.platformType = platformType;
-        this.md5 = md5Hex;
-    }
-
-    public FileInfo() {
-    }
-
-    @Override
-    public String toString() {
-        return "FileInfo{" +
-                "id=" + id +
-                ", fileName='" + fileName + '\'' +
-                ", type='" + type + '\'' +
-                ", platformType='" + platformType + '\'' +
-                ", path='" + path + '\'' +
-                ", fileUrl='" + fileUrl + '\'' +
-                ", createTime=" + createTime +
-                ", updateTime=" + updateTime +
-                '}';
-    }
-}

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

@@ -1,60 +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;
-
-/**
- * 统一资源库文件信息
- * @author jeecg-boot
- * @date 2019-09-02
- * @version V1.0
- */
-@Data
-@TableName("ctop_source_file")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_source_file对象", description = "统一资源库文件信息")
-public class SourceFile {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * MD5code码(唯一性校验)
-     */
-    @Excel(name = "MD5code码(唯一性校验)", width = 15)
-    @ApiModelProperty(value = "MD5code码(唯一性校验)")
-    private String code;
-    /**
-     * url
-     */
-    @Excel(name = "url", width = 15)
-    @ApiModelProperty(value = "url")
-    private String url;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-}

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

@@ -1,131 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 用户分配
- * @author jeecg-boot
- * @date 2019-08-08
- * @version V1.0
- */
-@Data
-@TableName("ctop_user_allocation")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_user_allocation对象", description = "用户分配")
-public class UserAllocation {
-
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-    /**
-     * 登陆人id
-     */
-    @Excel(name = "登陆人id", width = 15)
-    @ApiModelProperty(value = "登陆人id")
-    private String userId;
-    /**
-     * 账户id --授权
-     */
-    @Excel(name = "账户id --授权", width = 15)
-    @ApiModelProperty(value = "账户id --授权")
-    private Long accountId;
-    /**
-     * 广告主ID
-     */
-    @Excel(name = "广告主ID", width = 15)
-    @ApiModelProperty(value = "广告主ID")
-    private String advertiserId;
-    /**
-     * 指定分配人
-     */
-    @Excel(name = "指定分配人", width = 15)
-    @ApiModelProperty(value = "指定分配人")
-    private String distributionName;
-    /**
-     * 部门id
-     */
-    @Excel(name = "部门id", width = 15)
-    @ApiModelProperty(value = "部门id")
-    private String departmentId;
-    /**
-     * 管理员名称
-     */
-    @Excel(name = "管理员名称", width = 15)
-    @ApiModelProperty(value = "管理员名称")
-    private String adminName;
-    /**
-     * 广告主名称
-     */
-    @Excel(name = "广告主名称", width = 15)
-    @ApiModelProperty(value = "广告主名称")
-    private String advertiserName;
-    /**
-     * 输入账号  --登陆
-     */
-    @Excel(name = "输入账号  --登陆", width = 15)
-    @ApiModelProperty(value = "输入账号  --登陆")
-    private String accountName;
-    /**
-     * 创建时间
-     */
-    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    /**
-     * 操作人姓名
-     */
-    @Excel(name = "操作人姓名", width = 15)
-    @ApiModelProperty(value = "操作人姓名")
-    private String operationName;
-    /**
-     * 授权名称
-     */
-    @Excel(name = "授权名称", width = 15)
-    @ApiModelProperty(value = "授权名称")
-    private String authName;
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人", width = 15)
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     * 修改人
-     */
-    @Excel(name = "修改人", width = 15)
-    @ApiModelProperty(value = "修改人")
-    private String updateBy;
-    /**
-     * 修改时间
-     */
-    @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-    /**
-     * 平台类型 1 头条 2快手
-     */
-    @Excel(name = "平台类型 1 头条 2快手", width = 15)
-    @ApiModelProperty(value = "平台类型 1 头条 2快手")
-    private String mediaId;
-
-}

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouCommentAutoDelete.java

@@ -1,9 +1,9 @@
 package org.jeecg.modules.ctop.job;
 
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
+import cn.com.ctop.common.module.entity.BindAccountLogin;
+import cn.com.ctop.common.module.service.IBindAccountLoginService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.jeecg.modules.ctop.entity.BindAccountLogin;
-import org.jeecg.modules.ctop.service.IBindAccountLoginService;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;

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

@@ -1,14 +0,0 @@
-package org.jeecg.modules.ctop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.ctop.entity.BindAccountAuth;
-
-/**
- * @Description: 账号绑定-授权
- * @Author: jeecg-boot
- * @Date:   2019-07-31
- * @Version: V1.0
- */
-public interface BindAccountAuthMapper extends BaseMapper<BindAccountAuth> {
-
-}

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

@@ -1,14 +0,0 @@
-package org.jeecg.modules.ctop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.ctop.entity.BindAccountLogin;
-
-/**
- * @Description: 账号绑定-登陆
- * @Author: jeecg-boot
- * @Date: 2019-07-31
- * @Version: V1.0
- */
-public interface BindAccountLoginMapper extends BaseMapper<BindAccountLogin> {
-
-}

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

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

+ 0 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceAdvertiserBudgetMapper.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.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> {
-
-}

+ 0 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceAdvertiserMapper.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.ByteDanceAdvertiser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 今日头条广告主信息
- * @Author: jeecg-boot
- * @Date: 2019-07-22
- * @Version: V1.0
- */
-public interface ByteDanceAdvertiserMapper extends BaseMapper<ByteDanceAdvertiser> {
-
-}

+ 0 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceBudgetTemplateMapper.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.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> {
-
-}

+ 0 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceCampaignMapper.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.ByteDanceCampaign;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 今日头条广告组信息
- * @Author: jeecg-boot
- * @Date: 2019-07-22
- * @Version: V1.0
- */
-public interface ByteDanceCampaignMapper extends BaseMapper<ByteDanceCampaign> {
-
-}

+ 0 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceCampaignTemplateMapper.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.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> {
-
-}

+ 0 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceCreativeMapper.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.ByteDanceCreative;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 今日头条创意信息
- * @Author: jeecg-boot
- * @Date: 2019-07-22
- * @Version: V1.0
- */
-public interface ByteDanceCreativeMapper extends BaseMapper<ByteDanceCreative> {
-
-}

+ 0 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceCreativeMaterialMapper.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.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/ByteDanceCreativeTemplateMapper.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.ByteDanceCreativeTemplate;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 广告创意模板
- * @Author: jeecg-boot
- * @Date: 2019-07-29
- * @Version: V1.0
- */
-public interface ByteDanceCreativeTemplateMapper extends BaseMapper<ByteDanceCreativeTemplate> {
-
-}

+ 0 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceCustomAudienceMapper.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.ByteDanceCustomAudience;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 人群包信息
- * @Author: jeecg-boot
- * @Date: 2019-07-23
- * @Version: V1.0
- */
-public interface ByteDanceCustomAudienceMapper extends BaseMapper<ByteDanceCustomAudience> {
-
-}

+ 0 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceImageInfoMapper.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.ByteDanceImageInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 头条图片素材信息
- * @Author: jeecg-boot
- * @Date: 2019-07-29
- * @Version: V1.0
- */
-public interface ByteDanceImageInfoMapper extends BaseMapper<ByteDanceImageInfo> {
-
-}

+ 0 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceUserOrientationTemplateMapper.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.ByteDanceUserOrientationTemplate;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 今日头条受众模板信息
- * @Author: jeecg-boot
- * @Date: 2019-07-23
- * @Version: V1.0
- */
-public interface ByteDanceUserOrientationTemplateMapper extends BaseMapper<ByteDanceUserOrientationTemplate> {
-
-}

+ 0 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ByteDanceVideoInfoMapper.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.ByteDanceVideoInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 今日头条视频素材信息
- * @Author: jeecg-boot
- * @Date: 2019-07-29
- * @Version: V1.0
- */
-public interface ByteDanceVideoInfoMapper extends BaseMapper<ByteDanceVideoInfo> {
-
-}

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

@@ -1,14 +0,0 @@
-package org.jeecg.modules.ctop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.ctop.entity.BytedanceAdvertisePlanTemplate;
-
-/**
- * @Description: 广告计划模板信息
- * @Author: jeecg-boot
- * @Date: 2019-07-28
- * @Version: V1.0
- */
-public interface BytedanceAdvertisePlanTemplateMapper extends BaseMapper<BytedanceAdvertisePlanTemplate> {
-
-}

+ 0 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/BytedanceAdvertiserDailyReportMapper.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.BytedanceAdvertiserDailyReport;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 广告主日报表
- * @Author: jeecg-boot
- * @Date: 2019-09-10
- * @Version: V1.0
- */
-public interface BytedanceAdvertiserDailyReportMapper extends BaseMapper<BytedanceAdvertiserDailyReport> {
-
-}

+ 0 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/BytedanceAdvertiserHourlyReportMapper.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.BytedanceAdvertiserHourlyReport;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 广告主小时级别报表信息
- * @Author: jeecg-boot
- * @Date: 2019-09-10
- * @Version: V1.0
- */
-public interface BytedanceAdvertiserHourlyReportMapper extends BaseMapper<BytedanceAdvertiserHourlyReport> {
-
-}

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

@@ -1,18 +0,0 @@
-package org.jeecg.modules.ctop.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.ctop.entity.BytedanceAreaInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 省市县信息
- *
- * @author: jeecg-boot
- * @date: 2019-09-17
- * @cersion: V1.0
- */
-public interface BytedanceAreaInfoMapper extends BaseMapper<BytedanceAreaInfo> {
-
-}

+ 0 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/BytedanceCampaignDailyReportMapper.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.BytedanceCampaignDailyReport;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 广告组日报表信息
- * @Author: jeecg-boot
- * @Date: 2019-09-11
- * @Version: V1.0
- */
-public interface BytedanceCampaignDailyReportMapper extends BaseMapper<BytedanceCampaignDailyReport> {
-
-}

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


Неке датотеке нису приказане због велике количине промена