소스 검색

Merge remote-tracking branch 'origin/master'

jiequan.bi 4 년 전
부모
커밋
c291d7051c
91개의 변경된 파일106개의 추가작업 그리고 6458개의 파일을 삭제
  1. 0 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  2. 4 42
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java
  3. 0 93
      module-common/src/main/java/cn/com/ctop/common/module/entity/KuaiShouCleanMaterialReport.java
  4. 0 15
      module-common/src/main/java/cn/com/ctop/common/module/mapper/KuaiShouCleanMaterialReportMapper.java
  5. 1 1
      module-common/src/main/java/cn/com/ctop/common/module/mapper/MaterialInfoMapper.java
  6. 0 5
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/KuaiShouCleanMaterialReportMapper.xml
  7. 0 26
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialInfoMapper.xml
  8. 0 15
      module-common/src/main/java/cn/com/ctop/common/module/service/IKuaiShouCleanMaterialReportService.java
  9. 2 4
      module-common/src/main/java/cn/com/ctop/common/module/service/IMaterialInfoService.java
  10. 0 18
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/KuaiShouCleanMaterialReportServiceImpl.java
  11. 4 43
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java
  12. 0 31
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouCleanMaterialJob.java
  13. 0 35
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouActionBarTextController.java
  14. 0 165
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouAppCreateController.java
  15. 0 249
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouCampaignCreateController.java
  16. 0 262
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouCreateAppTemplateController.java
  17. 0 77
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouCreateController.java
  18. 0 249
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouCreativeCreateController.java
  19. 0 287
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouGroupCreateLogController.java
  20. 0 249
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouGroupCreateTargetController.java
  21. 0 273
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouImageController.java
  22. 0 249
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouImageUploandController.java
  23. 0 304
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouVideoController.java
  24. 0 249
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouVideoUploadController.java
  25. 0 13
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/UpdateController.java
  26. 0 118
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouAppCreate.java
  27. 0 82
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouCampaignCreate.java
  28. 0 132
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouCreateAppTemplate.java
  29. 0 106
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouCreativeCreate.java
  30. 0 219
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouGroupCreateLog.java
  31. 0 124
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouGroupCreateTarget.java
  32. 0 109
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouImage.java
  33. 0 106
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouImageUploand.java
  34. 0 121
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouVideo.java
  35. 0 97
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouVideoUpload.java
  36. 0 14
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouAppCreateMapper.java
  37. 0 14
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouCampaignCreateMapper.java
  38. 0 14
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouCreateAppTemplateMapper.java
  39. 0 14
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouCreativeCreateMapper.java
  40. 0 14
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouGroupCreateLogMapper.java
  41. 0 14
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouGroupCreateTargetMapper.java
  42. 0 14
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouImageMapper.java
  43. 0 14
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouImageUploandMapper.java
  44. 0 14
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouVideoMapper.java
  45. 0 14
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouVideoUploadMapper.java
  46. 0 5
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouAppCreateMapper.xml
  47. 0 5
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouCampaignCreateMapper.xml
  48. 0 5
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouCreateAppTemplateMapper.xml
  49. 0 5
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouCreativeCreateMapper.xml
  50. 0 5
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouGroupCreateLogMapper.xml
  51. 0 5
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouGroupCreateTargetMapper.xml
  52. 0 5
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouImageMapper.xml
  53. 0 5
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouImageUploandMapper.xml
  54. 0 5
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouVideoMapper.xml
  55. 0 5
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouVideoUploadMapper.xml
  56. 0 14
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouAppCreateService.java
  57. 0 16
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouCampaignCreateService.java
  58. 0 17
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouCreateAppTemplateService.java
  59. 0 17
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouCreateService.java
  60. 0 14
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouCreativeCreateService.java
  61. 0 17
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouGroupCreateLogService.java
  62. 0 14
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouGroupCreateTargetService.java
  63. 0 22
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouImageService.java
  64. 0 14
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouImageUploandService.java
  65. 0 18
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouVideoService.java
  66. 0 14
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouVideoUploadService.java
  67. 3 47
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaishouInterfaceService.java
  68. 0 18
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouAppCreateServiceImpl.java
  69. 0 32
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouCampaignCreateServiceImpl.java
  70. 0 113
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouCreateAppTemplateServiceImpl.java
  71. 0 576
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouCreateServiceImpl.java
  72. 0 18
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouCreativeCreateServiceImpl.java
  73. 0 41
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouGroupCreateLogServiceImpl.java
  74. 0 18
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouGroupCreateTargetServiceImpl.java
  75. 0 151
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouImageServiceImpl.java
  76. 0 18
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouImageUploandServiceImpl.java
  77. 1 5
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouMaterialUploadServiceImpl.java
  78. 0 129
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouVideoServiceImpl.java
  79. 0 18
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouVideoUploadServiceImpl.java
  80. 1 392
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java
  81. 0 7
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/material/mapper/KuaishouAccessTokenMapper.java
  82. 0 7
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/material/service/IKuaishouAccessTokenService.java
  83. 0 11
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/material/service/impl/KuaishouAccessTokenServiceImpl.java
  84. 0 164
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KuaiShouCleanMaterialReportController.java
  85. 0 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/KuaishouReportDailyCreativeMapper.java
  86. 0 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaiShouDailyAgentMapper.xml
  87. 0 17
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyCreativeMapper.xml
  88. 0 6
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IKuaishouReportDailyCreativeService.java
  89. 2 15
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyCreativeServiceImpl.java
  90. 35 46
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/BytedanceAccountReportMapper.xml
  91. 53 56
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/BytedanceReportMapper.xml

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

@@ -173,7 +173,6 @@ public class CallbackController {
                     if (!Check.isNull(checkUserAllocation)) {
                         return "授权失败,该账号已被:" + checkUserAllocation.getUserName() + " 绑定!";
                     }
-                    String projectName = json.getString("projectName");
                     UserAllocation userAllocation = new UserAllocation();
                     userAllocation.setUserName(userName);
                     userAllocation.setUserId(userId);
@@ -184,14 +183,11 @@ public class CallbackController {
                     if ((Integer) advertiseBaseInfoMap.get("code") == 0) {
                         userAllocation.setAuthName((String) advertiseBaseInfoMap.get("userName"));
                     }
-               //     userAllocation.setAdvertiserName(advertiserName);
                     userAllocation.setMediaId(mediaId);
                     userAllocation.setAccountId(accountId);
                     userAllocation.setProjectId(projectId);
-                 //   userAllocation.setProjectName(projectName);
                     userAllocation.setWarningProportion(warningProportion);
                     userAllocation.setWarningAmount(warningAmount);
-
                     userAllocation.setCreateTime(new Date());
                     userAllocation.setUpdateTime(new Date());
                     allocationMapper.deleteById(userAllocation.getId());
@@ -273,26 +269,20 @@ public class CallbackController {
             // 媒体类型: 1 头条 2 快手
             String mediaId = json.getString("mediaId");
 
-            // 广告主名称
-            String advertiserName = json.getString("advertiser_name");
             //创建人
             String userId = json.getString("userId");
             //创建人
             String userName = json.getString("userName");
             Long projectId = json.getLong("projectId");
-            String projectName = json.getString("projectName");
             BigDecimal warningProportion = json.getBigDecimal("WarningProportion");
             BigDecimal warningAmount = json.getBigDecimal("WarningAmount");
-
             JSONObject data = resultObject.getJSONObject("data");
-
             if (Check.isNull(data)) {
                 returnMap.put("code", -1);
                 returnMap.put("desc", "返回信息为空");
                 return returnMap;
 
             }
-
             data.remove("advertiser_id");
             JSONArray advertiser_ids = data.getJSONArray("advertiser_ids");
             if (Check.isNull(advertiser_ids)) {
@@ -344,10 +334,8 @@ public class CallbackController {
                             userAllocation.setUserId(userId);
                             userAllocation.setUserName(userName);
                             userAllocation.setAccountId(token.getAccountId());
-                       //     userAllocation.setAdvertiserName(advertiserName);
                             userAllocation.setMediaId(mediaId);
                             userAllocation.setProjectId(projectId);
-                         //   userAllocation.setProjectName(projectName);
                             userAllocation.setSystemType(systemType);
                             userAllocation.setAuthName((String) advertiserDataMap.get("name"));
                             userAllocation.setAdvertiserId(advertiserId);
@@ -398,10 +386,8 @@ public class CallbackController {
                     userAllocation.setUserId(userId);
                     userAllocation.setUserName(userName);
                     userAllocation.setAccountId(token.getAccountId());
-               //     userAllocation.setAdvertiserName(advertiserName);
                     userAllocation.setMediaId(mediaId);
                     userAllocation.setProjectId(projectId);
-                //    userAllocation.setProjectName(projectName);
                     userAllocation.setSystemType(systemType);
                     userAllocation.setAuthName((String) advertiserDataMap.get("name"));
                     userAllocation.setAdvertiserId(advertiserId);

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

@@ -2,28 +2,9 @@ package org.jeecg.modules.ctop.controller;
 
 import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.constant.CtopRoleCodeConstant;
-import cn.com.ctop.common.module.entity.ByteDanceCleanMaterialReport;
-import cn.com.ctop.common.module.entity.KuaiShouCleanMaterialReport;
-import cn.com.ctop.common.module.entity.MaterialAscription;
-import cn.com.ctop.common.module.entity.MaterialCutFrame;
-import cn.com.ctop.common.module.entity.MaterialImageInfo;
-import cn.com.ctop.common.module.entity.MaterialInfo;
-import cn.com.ctop.common.module.entity.MaterialParameter;
-import cn.com.ctop.common.module.entity.MaterialTag;
-import cn.com.ctop.common.module.entity.Project;
+import cn.com.ctop.common.module.entity.*;
 import cn.com.ctop.common.module.enums.MaterialSupplierEnum;
-import cn.com.ctop.common.module.service.IByteDanceCleanMaterialReportService;
-import cn.com.ctop.common.module.service.IKuaiShouCleanMaterialReportService;
-import cn.com.ctop.common.module.service.IMaterialAscriptionService;
-import cn.com.ctop.common.module.service.IMaterialCutFrameService;
-import cn.com.ctop.common.module.service.IMaterialImageInfoService;
-import cn.com.ctop.common.module.service.IMaterialInfoService;
-import cn.com.ctop.common.module.service.IMaterialParameterService;
-import cn.com.ctop.common.module.service.IMaterialTagService;
-import cn.com.ctop.common.module.service.IMessageTemplate;
-import cn.com.ctop.common.module.service.IProjectService;
-import cn.com.ctop.common.module.service.ISendMessageService;
-import cn.com.ctop.common.module.service.IVideoWatermarkTaskService;
+import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.CloudVideoProcessUtil;
 import cn.com.ctop.common.module.utils.JsonUtil;
@@ -45,24 +26,13 @@ import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecg.modules.system.service.ISysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.net.URLDecoder;
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 素材信息
@@ -89,8 +59,6 @@ public class MaterialInfoController {
     @Autowired
     private IByteDanceCleanMaterialReportService byteDanceCleanMaterialReportService;
     @Autowired
-    private IKuaiShouCleanMaterialReportService kuaiShouCleanMaterialReportService;
-    @Autowired
     private IVideoWatermarkTaskService watermarkTaskService;
     @Autowired
     private IProjectMemberService memberService;
@@ -308,12 +276,6 @@ public class MaterialInfoController {
                     material.setByteDance(JSONObject.parseObject(byteDanceString));
                 }
 
-                KuaiShouCleanMaterialReport kuaiShou = kuaiShouCleanMaterialReportService.getById(material.getCode());
-                if (!Check.isNull(kuaiShou)) {
-                    String kuaiShouString = JsonUtil.objectToJson(kuaiShou);
-                    material.setKuaiShou(JSONObject.parseObject(kuaiShouString));
-                }
-
 
                 Project project = projectService.getById(material.getProjectId());
                 if (!Check.isNull(project)) {

+ 0 - 93
module-common/src/main/java/cn/com/ctop/common/module/entity/KuaiShouCleanMaterialReport.java

@@ -1,93 +0,0 @@
-package cn.com.ctop.common.module.entity;
-
-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
- * @version V1.0
- * @date 2020-02-24
- */
-@Data
-@TableName("ctop_kuaishou_clean_material_report")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_kuaishou_clean_material_report对象", description = "快手素材清洗数据")
-public class KuaiShouCleanMaterialReport {
-
-    /**
-     * signature
-     */
-    @Excel(name = "id", width = 15)
-    @ApiModelProperty(value = "id")
-    private String id;
-    /**
-     * 花费(元)
-     */
-    @Excel(name = "花费(元)", width = 15)
-    @ApiModelProperty(value = "花费(元)")
-    private java.math.BigDecimal charge;
-    /**
-     * 曝光数
-     */
-    @Excel(name = "曝光数", width = 15)
-    @ApiModelProperty(value = "曝光数")
-    private Integer photoShow;
-    /**
-     * 封面点击数
-     */
-    @Excel(name = "封面点击数", width = 15)
-    @ApiModelProperty(value = "封面点击数")
-    private Integer photoClick;
-    /**
-     * 点击数
-     */
-    @Excel(name = "点击数", width = 15)
-    @ApiModelProperty(value = "点击数")
-    private Integer aclick;
-    /**
-     * 行为数
-     */
-    @Excel(name = "行为数", width = 15)
-    @ApiModelProperty(value = "行为数")
-    private Integer bclick;
-    /**
-     * 激活数
-     */
-    @Excel(name = "激活数", width = 15)
-    @ApiModelProperty(value = "激活数")
-    private Integer activation;
-    /**
-     * 表单提交数
-     */
-    @Excel(name = "表单提交数", width = 15)
-    @ApiModelProperty(value = "表单提交数")
-    private Integer formCount;
-    /**
-     * 创建时间
-     */
-    @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 - 15
module-common/src/main/java/cn/com/ctop/common/module/mapper/KuaiShouCleanMaterialReportMapper.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.common.module.mapper;
-
-import cn.com.ctop.common.module.entity.KuaiShouCleanMaterialReport;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 快手素材清洗数据
- *
- * @author: jeecg-boot
- * @date: 2020-02-24
- * @cersion: V1.0
- */
-public interface KuaiShouCleanMaterialReportMapper extends BaseMapper<KuaiShouCleanMaterialReport> {
-
-}

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/mapper/MaterialInfoMapper.java

@@ -25,7 +25,7 @@ public interface MaterialInfoMapper extends BaseMapper<MaterialInfo> {
 
     Integer getToutiaoUpVideoCount(@Param("code") String code);
 
-    JSONObject getGeneralizationInfo(@Param("code") String code);
+
 
     List<String> getEffiSignature();
 

+ 0 - 5
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/KuaiShouCleanMaterialReportMapper.xml

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

+ 0 - 26
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialInfoMapper.xml

@@ -52,32 +52,6 @@
     </select>
 
 
-    <select id="getGeneralizationInfo" resultType="com.alibaba.fastjson.JSONObject">
-     SELECT
-	 SUM(t.cost) cost,
-	 SUM(t.photoShow) photoShow,
-	 SUM(t.photoClick) photoClick
-      FROM
-	 (
-		SELECT
-		cost cost,
-        show_num photoShow,
-        click photoClick
-		FROM
-		ctop_bytedance_clean_material_report
-		WHERE
-		id = #{code}
-		UNION ALL
-		SELECT
-		charge cost,
-        photo_show photoShow,
-        photo_click photoClick
-		FROM
-		ctop_kuaishou_clean_material_report
-		WHERE
-		id = #{code}
-	  )t
-    </select>
 
     <select id="getEffiSignature" resultType="string">
         select

+ 0 - 15
module-common/src/main/java/cn/com/ctop/common/module/service/IKuaiShouCleanMaterialReportService.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.common.module.service;
-
-import cn.com.ctop.common.module.entity.KuaiShouCleanMaterialReport;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 快手素材清洗数据
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-02-24
- */
-public interface IKuaiShouCleanMaterialReportService extends IService<KuaiShouCleanMaterialReport> {
-
-}

+ 2 - 4
module-common/src/main/java/cn/com/ctop/common/module/service/IMaterialInfoService.java

@@ -48,8 +48,6 @@ public interface IMaterialInfoService extends IService<MaterialInfo> {
 
     Integer getToutiaoUpVideoCount(@Param("code") String code);
 
-    JSONObject getGeneralizationInfo(String code);
-
     /**
      * 素材库 关联上传素材
      *
@@ -59,7 +57,7 @@ public interface IMaterialInfoService extends IService<MaterialInfo> {
     Map<String, Object> correlationUpload(JSONObject json);
 
     /**
-     *  下单制关联素材库
+     * 下单制关联素材库
      */
     String platformUploadVideo(JSONObject json);
 
@@ -79,5 +77,5 @@ public interface IMaterialInfoService extends IService<MaterialInfo> {
 
     List<MaterialInfo> getListByDate(String startDate, String endDate);
 
-    Map<String,Object> getListByParams(String tagCode,String type, Integer status, List<Long> projectIds, String materialName, String code, String startDate, String endDate, String userId, Integer pageNo, Integer pageSize);
+    Map<String, Object> getListByParams(String tagCode, String type, Integer status, List<Long> projectIds, String materialName, String code, String startDate, String endDate, String userId, Integer pageNo, Integer pageSize);
 }

+ 0 - 18
module-common/src/main/java/cn/com/ctop/common/module/service/impl/KuaiShouCleanMaterialReportServiceImpl.java

@@ -1,18 +0,0 @@
-package cn.com.ctop.common.module.service.impl;
-
-import cn.com.ctop.common.module.entity.KuaiShouCleanMaterialReport;
-import cn.com.ctop.common.module.mapper.KuaiShouCleanMaterialReportMapper;
-import cn.com.ctop.common.module.service.IKuaiShouCleanMaterialReportService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * 快手素材清洗数据
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-02-24
- */
-@Service
-public class KuaiShouCleanMaterialReportServiceImpl extends ServiceImpl<KuaiShouCleanMaterialReportMapper, KuaiShouCleanMaterialReport> implements IKuaiShouCleanMaterialReportService {
-}

+ 4 - 43
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -1,39 +1,14 @@
 package cn.com.ctop.common.module.service.impl;
 
 import cn.com.ctop.common.module.constant.CosConstant;
-import cn.com.ctop.common.module.entity.MaterialAscription;
-import cn.com.ctop.common.module.entity.MaterialCutFrame;
-import cn.com.ctop.common.module.entity.MaterialImageInfo;
-import cn.com.ctop.common.module.entity.MaterialInfo;
-import cn.com.ctop.common.module.entity.MaterialParameter;
-import cn.com.ctop.common.module.entity.MaterialTag;
-import cn.com.ctop.common.module.entity.MaterialTagInfo;
-import cn.com.ctop.common.module.entity.Project;
-import cn.com.ctop.common.module.entity.SupplierWatermark;
-import cn.com.ctop.common.module.entity.TagInfo;
-import cn.com.ctop.common.module.entity.TencentWatermarkTemplate;
-import cn.com.ctop.common.module.entity.VideoWatermarkTask;
+import cn.com.ctop.common.module.entity.*;
 import cn.com.ctop.common.module.enums.MaterialSupplierEnum;
 import cn.com.ctop.common.module.mapper.MaterialAscriptionMapper;
 import cn.com.ctop.common.module.mapper.MaterialInfoMapper;
 import cn.com.ctop.common.module.mapper.MaterialParameterMapper;
 import cn.com.ctop.common.module.mapper.MaterialTagMapper;
-import cn.com.ctop.common.module.service.IMaterialCutFrameService;
-import cn.com.ctop.common.module.service.IMaterialImageInfoService;
-import cn.com.ctop.common.module.service.IMaterialInfoService;
-import cn.com.ctop.common.module.service.IMaterialTagInfoService;
-import cn.com.ctop.common.module.service.IProjectService;
-import cn.com.ctop.common.module.service.ISupplierWatermarkService;
-import cn.com.ctop.common.module.service.ITagInfoService;
-import cn.com.ctop.common.module.service.ITencentWatermarkTemplateService;
-import cn.com.ctop.common.module.service.IVideoWatermarkTaskService;
-import cn.com.ctop.common.module.utils.AesEncryptUtil;
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.common.module.utils.CloudVideoProcessUtil;
-import cn.com.ctop.common.module.utils.LoadFileUtil;
-import cn.com.ctop.common.module.utils.PropertiesUtils;
-import cn.com.ctop.common.module.utils.ResultMapUtils;
-import cn.com.ctop.common.module.utils.StatusCode;
+import cn.com.ctop.common.module.service.*;
+import cn.com.ctop.common.module.utils.*;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -59,11 +34,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URLDecoder;
 import java.nio.channels.FileChannel;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -512,16 +483,6 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
     }
 
 
-    /**
-     * 获取素材概括信息
-     *
-     * @param code
-     * @return
-     */
-    @Override
-    public JSONObject getGeneralizationInfo(String code) {
-        return materialInfoMapper.getGeneralizationInfo(code);
-    }
 
 
     @Autowired

+ 0 - 31
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouCleanMaterialJob.java

@@ -1,31 +0,0 @@
-package cn.com.ctop.job.kuaishou.handler;
-
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyCreativeService;
-import com.xxl.job.core.context.XxlJobHelper;
-import com.xxl.job.core.handler.annotation.XxlJob;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-@Component
-public class KuaiShouCleanMaterialJob {
-    @Autowired
-    private IKuaishouReportDailyCreativeService kuaiShouCleanMaterialReportService;
-    static ExecutorService executorService = Executors.newFixedThreadPool(5);
-
-    @XxlJob("kuaiShouCleanMaterial")
-    public void execute() {
-        List<String> signatureList = kuaiShouCleanMaterialReportService.getSignature();
-        if (Check.isNull(signatureList)) {
-            XxlJobHelper.log("素材数据获取为空");
-            XxlJobHelper.handleFail();
-            return ;
-        }
-        signatureList.forEach(signature-> executorService.submit(()-> kuaiShouCleanMaterialReportService.calculationReport(signature)));
-        return ;
-    }
-}

+ 0 - 35
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouActionBarTextController.java

@@ -4,9 +4,7 @@ import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.StringUtils;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouActionBarText;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignCreate;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouActionBarTextService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCampaignCreateService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -32,40 +30,7 @@ import java.util.Arrays;
 public class KuaiShouActionBarTextController {
     @Autowired
     private IKuaiShouActionBarTextService kuaiShouActionBarTextService;
-    @Autowired
-    private IKuaiShouCampaignCreateService campaignCreateService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param kuaiShouActionBarText
-     * @param pageNo
-     * @param pageSize
-     * @return
-     */
-    @AutoLog(value = "快手-行动号召文案-分页列表查询")
-    @ApiOperation(value = "快手-行动号召文案-分页列表查询", notes = "快手-行动号召文案-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<KuaiShouActionBarText>> queryPageList(KuaiShouActionBarText kuaiShouActionBarText,
-                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                              @RequestParam(name = "campaignId") String campaignId) {
-        Result<IPage<KuaiShouActionBarText>> result = new Result<>();
-        KuaiShouCampaignCreate campaignCreate = campaignCreateService.selectCampaignByCampaignId(campaignId);
-        if (!Check.isNull(campaignCreate)) {
-            QueryWrapper<KuaiShouActionBarText> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("type", campaignCreate.getType());
-            Page<KuaiShouActionBarText> page = new Page<>(pageNo, pageSize);
-            IPage<KuaiShouActionBarText> pageList = kuaiShouActionBarTextService.page(page, queryWrapper);
-            result.setSuccess(true);
-            result.setResult(pageList);
-        } else {
-            result.setSuccess(false);
-            result.setMessage("未获取到广告计划信息");
-        }
 
-        return result;
-    }
 
     /**
      * 添加

+ 0 - 165
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouAppCreateController.java

@@ -1,165 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.common.module.utils.StringUtils;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppCreate;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAppCreateService;
-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.system.query.QueryGenerator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-
-/**
- * @Description: 创建应用
- * @Author: jeecg-boot
- * @Date: 2019-07-26
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "创建应用")
-@RestController
-@RequestMapping("/kuaishou/kuaiShouAppCreate")
-public class KuaiShouAppCreateController {
-    @Autowired
-    private IKuaiShouAppCreateService kuaiShouAppCreateService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param kuaiShouAppCreate
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "创建应用-分页列表查询")
-    @ApiOperation(value = "创建应用-分页列表查询", notes = "创建应用-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<KuaiShouAppCreate>> queryPageList(KuaiShouAppCreate kuaiShouAppCreate,
-                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                          HttpServletRequest req) {
-        Result<IPage<KuaiShouAppCreate>> result = new Result<>();
-        QueryWrapper<KuaiShouAppCreate> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAppCreate, req.getParameterMap());
-        Page<KuaiShouAppCreate> page = new Page<>(pageNo, pageSize);
-        queryWrapper.orderByDesc("id");
-        IPage<KuaiShouAppCreate> pageList = kuaiShouAppCreateService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param kuaiShouAppCreate
-     * @return
-     */
-    @AutoLog(value = "创建应用-添加")
-    @ApiOperation(value = "创建应用-添加", notes = "创建应用-添加")
-    @PostMapping(value = "/add")
-    public Result<KuaiShouAppCreate> add(@RequestBody KuaiShouAppCreate kuaiShouAppCreate) {
-        Result<KuaiShouAppCreate> result = new Result<>();
-        try {
-            kuaiShouAppCreateService.save(kuaiShouAppCreate);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param kuaiShouAppCreate
-     * @return
-     */
-    @AutoLog(value = "创建应用-编辑")
-    @ApiOperation(value = "创建应用-编辑", notes = "创建应用-编辑")
-    @PutMapping(value = "/edit")
-    public Result<KuaiShouAppCreate> edit(@RequestBody KuaiShouAppCreate kuaiShouAppCreate) {
-        Result<KuaiShouAppCreate> result = new Result<>();
-        KuaiShouAppCreate kuaiShouAppCreateEntity = kuaiShouAppCreateService.getById(kuaiShouAppCreate.getId());
-        if (kuaiShouAppCreateEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = kuaiShouAppCreateService.updateById(kuaiShouAppCreate);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "创建应用-通过id删除")
-    @ApiOperation(value = "创建应用-通过id删除", notes = "创建应用-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<Object> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            kuaiShouAppCreateService.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<KuaiShouAppCreate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<KuaiShouAppCreate> result = new Result<>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.kuaiShouAppCreateService.removeByIds(Arrays.asList(ids.split(StringUtils.COMMA)));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "创建应用-通过id查询")
-    @ApiOperation(value = "创建应用-通过id查询", notes = "创建应用-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<KuaiShouAppCreate> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<KuaiShouAppCreate> result = new Result<>();
-        KuaiShouAppCreate kuaiShouAppCreate = kuaiShouAppCreateService.getById(id);
-        if (kuaiShouAppCreate == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(kuaiShouAppCreate);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-}

+ 0 - 249
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouCampaignCreateController.java

@@ -1,249 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.common.module.utils.StringUtils;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignCreate;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCampaignCreateService;
-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.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 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("/kuaishou/kuaiShouCampaignCreate")
-public class KuaiShouCampaignCreateController {
-    @Autowired
-    private IKuaiShouCampaignCreateService kuaiShouCampaignCreateService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param kuaiShouCampaignCreate
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "快手-创建广告计划-分页列表查询")
-    @ApiOperation(value = "快手-创建广告计划-分页列表查询", notes = "快手-创建广告计划-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<KuaiShouCampaignCreate>> queryPageList(KuaiShouCampaignCreate kuaiShouCampaignCreate,
-                                                               @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                               HttpServletRequest req) {
-        Result<IPage<KuaiShouCampaignCreate>> result = new Result<IPage<KuaiShouCampaignCreate>>();
-        QueryWrapper<KuaiShouCampaignCreate> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaignCreate, req.getParameterMap());
-        Page<KuaiShouCampaignCreate> page = new Page<KuaiShouCampaignCreate>(pageNo, pageSize);
-        IPage<KuaiShouCampaignCreate> pageList = kuaiShouCampaignCreateService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param kuaiShouCampaignCreate
-     * @return
-     */
-    @AutoLog(value = "快手-创建广告计划-添加")
-    @ApiOperation(value = "快手-创建广告计划-添加", notes = "快手-创建广告计划-添加")
-    @PostMapping(value = "/add")
-    public Result<KuaiShouCampaignCreate> add(@RequestBody KuaiShouCampaignCreate kuaiShouCampaignCreate) {
-        Result<KuaiShouCampaignCreate> result = new Result<KuaiShouCampaignCreate>();
-        try {
-            kuaiShouCampaignCreateService.save(kuaiShouCampaignCreate);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param kuaiShouCampaignCreate
-     * @return
-     */
-    @AutoLog(value = "快手-创建广告计划-编辑")
-    @ApiOperation(value = "快手-创建广告计划-编辑", notes = "快手-创建广告计划-编辑")
-    @PutMapping(value = "/edit")
-    public Result<KuaiShouCampaignCreate> edit(@RequestBody KuaiShouCampaignCreate kuaiShouCampaignCreate) {
-        Result<KuaiShouCampaignCreate> result = new Result<KuaiShouCampaignCreate>();
-        KuaiShouCampaignCreate kuaiShouCampaignCreateEntity = kuaiShouCampaignCreateService.getById(kuaiShouCampaignCreate.getId());
-        if (kuaiShouCampaignCreateEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = kuaiShouCampaignCreateService.updateById(kuaiShouCampaignCreate);
-            //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 {
-            kuaiShouCampaignCreateService.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<KuaiShouCampaignCreate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<KuaiShouCampaignCreate> result = new Result<KuaiShouCampaignCreate>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.kuaiShouCampaignCreateService.removeByIds(Arrays.asList(ids.split(StringUtils.COMMA)));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "快手-创建广告计划-通过id查询")
-    @ApiOperation(value = "快手-创建广告计划-通过id查询", notes = "快手-创建广告计划-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<KuaiShouCampaignCreate> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<KuaiShouCampaignCreate> result = new Result<KuaiShouCampaignCreate>();
-        KuaiShouCampaignCreate kuaiShouCampaignCreate = kuaiShouCampaignCreateService.getById(id);
-        if (kuaiShouCampaignCreate == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(kuaiShouCampaignCreate);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<KuaiShouCampaignCreate> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                KuaiShouCampaignCreate kuaiShouCampaignCreate = JSON.parseObject(deString, KuaiShouCampaignCreate.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaignCreate, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<KuaiShouCampaignCreate> pageList = kuaiShouCampaignCreateService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-创建广告计划列表");
-        mv.addObject(NormalExcelConstants.CLASS, KuaiShouCampaignCreate.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<KuaiShouCampaignCreate> listKuaiShouCampaignCreates = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouCampaignCreate.class, params);
-                kuaiShouCampaignCreateService.saveBatch(listKuaiShouCampaignCreates);
-                return Result.ok("文件导入成功!数据行数:" + listKuaiShouCampaignCreates.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 - 262
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouCreateAppTemplateController.java

@@ -1,262 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.common.module.utils.StringUtils;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreateAppTemplate;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreateAppTemplateService;
-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.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-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 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("/kuaishou/kuaiShouCreateAppTemplate")
-public class KuaiShouCreateAppTemplateController {
-    @Autowired
-    private IKuaiShouCreateAppTemplateService kuaiShouCreateAppTemplateService;
-
-    @PostMapping(value = "/insert")
-    public Map<String, Object> insert(@RequestBody KuaiShouCreateAppTemplate appTemplate) {
-        return kuaiShouCreateAppTemplateService.insert(appTemplate);
-    }
-
-    /**
-     * 分页列表查询
-     *
-     * @param kuaiShouCreateAppTemplate
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "创建应用-分页列表查询")
-    @ApiOperation(value = "创建应用-分页列表查询", notes = "创建应用-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<KuaiShouCreateAppTemplate>> queryPageList(KuaiShouCreateAppTemplate kuaiShouCreateAppTemplate,
-                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                  HttpServletRequest req) {
-        Result<IPage<KuaiShouCreateAppTemplate>> result = new Result<IPage<KuaiShouCreateAppTemplate>>();
-        QueryWrapper<KuaiShouCreateAppTemplate> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCreateAppTemplate, req.getParameterMap());
-        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (!Check.isNull(user)) {
-            queryWrapper.eq("login_id", user.getId());
-        }
-        queryWrapper.orderByDesc("create_time");
-        Page<KuaiShouCreateAppTemplate> page = new Page<KuaiShouCreateAppTemplate>(pageNo, pageSize);
-        IPage<KuaiShouCreateAppTemplate> pageList = kuaiShouCreateAppTemplateService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param kuaiShouCreateAppTemplate
-     * @return
-     */
-    @AutoLog(value = "创建应用-添加")
-    @ApiOperation(value = "创建应用-添加", notes = "创建应用-添加")
-    @PostMapping(value = "/add")
-    public Result<KuaiShouCreateAppTemplate> add(@RequestBody KuaiShouCreateAppTemplate kuaiShouCreateAppTemplate) {
-        Result<KuaiShouCreateAppTemplate> result = new Result<KuaiShouCreateAppTemplate>();
-        try {
-            kuaiShouCreateAppTemplateService.save(kuaiShouCreateAppTemplate);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param kuaiShouCreateAppTemplate
-     * @return
-     */
-    @AutoLog(value = "创建应用-编辑")
-    @ApiOperation(value = "创建应用-编辑", notes = "创建应用-编辑")
-    @PutMapping(value = "/edit")
-    public Result<KuaiShouCreateAppTemplate> edit(@RequestBody KuaiShouCreateAppTemplate kuaiShouCreateAppTemplate) {
-        Result<KuaiShouCreateAppTemplate> result = new Result<KuaiShouCreateAppTemplate>();
-        KuaiShouCreateAppTemplate kuaiShouCreateAppTemplateEntity = kuaiShouCreateAppTemplateService.getById(kuaiShouCreateAppTemplate.getId());
-        if (kuaiShouCreateAppTemplateEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = kuaiShouCreateAppTemplateService.updateById(kuaiShouCreateAppTemplate);
-            //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 {
-            kuaiShouCreateAppTemplateService.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<KuaiShouCreateAppTemplate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<KuaiShouCreateAppTemplate> result = new Result<KuaiShouCreateAppTemplate>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.kuaiShouCreateAppTemplateService.removeByIds(Arrays.asList(ids.split(StringUtils.COMMA)));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "创建应用-通过id查询")
-    @ApiOperation(value = "创建应用-通过id查询", notes = "创建应用-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<KuaiShouCreateAppTemplate> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<KuaiShouCreateAppTemplate> result = new Result<>();
-        KuaiShouCreateAppTemplate kuaiShouCreateAppTemplate = kuaiShouCreateAppTemplateService.getById(id);
-        if (kuaiShouCreateAppTemplate == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(kuaiShouCreateAppTemplate);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<KuaiShouCreateAppTemplate> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                KuaiShouCreateAppTemplate kuaiShouCreateAppTemplate = JSON.parseObject(deString, KuaiShouCreateAppTemplate.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCreateAppTemplate, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<KuaiShouCreateAppTemplate> pageList = kuaiShouCreateAppTemplateService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "创建应用列表");
-        mv.addObject(NormalExcelConstants.CLASS, KuaiShouCreateAppTemplate.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<KuaiShouCreateAppTemplate> listKuaiShouCreateAppTemplates = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouCreateAppTemplate.class, params);
-                kuaiShouCreateAppTemplateService.saveBatch(listKuaiShouCreateAppTemplates);
-                return Result.ok("文件导入成功!数据行数:" + listKuaiShouCreateAppTemplates.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 - 77
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouCreateController.java

@@ -1,77 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.controller;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateLog;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreateService;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import org.jeecg.common.api.vo.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-@RestController
-@RequestMapping("/kuaishou/create")
-public class KuaiShouCreateController {
-
-    @Autowired
-    private IKuaiShouCreateService kuaiShouCreateService;
-
-    /**
-     * 创建 广告组
-     *
-     * @param groupCreateTemplate
-     * @return
-     */
-    @PostMapping("/createGroups")
-    public Result<KuaiShouGroupCreateLog> createGroups(@RequestBody KuaiShouGroupCreateLog groupCreateTemplate) {
-        Result<KuaiShouGroupCreateLog> result = new Result<>();
-        Map<String, Object> map = kuaiShouCreateService.createGroups(groupCreateTemplate);
-        if ((Integer) map.get("code") == 0) {
-            result.setSuccess(true);
-        } else {
-            result.setSuccess(false);
-            result.setMessage((String) map.get("message"));
-        }
-        return result;
-
-
-    }
-
-    /**
-     * 创建创意
-     *
-     * @param requestJson
-     * @return
-     */
-    @PostMapping("/createCreative")
-    public Result<KuaiShouGroupCreateLog> createCreative(@RequestBody JSONObject requestJson) {
-        Result<KuaiShouGroupCreateLog> result = new Result<>();
-        Map<String, Object> map = kuaiShouCreateService.createCreative(requestJson);
-        if ((Integer) map.get("code") == 0) {
-            result.setSuccess(true);
-        } else {
-            result.setSuccess(false);
-            result.setMessage((String) map.get("message"));
-        }
-        return result;
-
-
-    }
-
-
-    @PostMapping("/getOptions")
-    public JSONArray getOptions(@RequestBody JSONObject requestJson) {
-        return kuaiShouCreateService.getOptions(requestJson.getString("loginId"), requestJson.getLong("accountId"));
-    }
-
-    @PostMapping("/getChildren")
-    public JSONArray getChildren(@RequestBody JSONObject requestJson) {
-        return kuaiShouCreateService.getChildren(requestJson.getString("loginId"), requestJson.getLong("campaignId"), requestJson.getLong("accountId"));
-    }
-
-
-}

+ 0 - 249
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouCreativeCreateController.java

@@ -1,249 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.common.module.utils.StringUtils;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreativeCreate;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreativeCreateService;
-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.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 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-24
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "快手-创建创意信息")
-@RestController
-@RequestMapping("/kuaishou/kuaiShouCreativeCreate")
-public class KuaiShouCreativeCreateController {
-    @Autowired
-    private IKuaiShouCreativeCreateService kuaiShouCreativeCreateService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param kuaiShouCreativeCreate
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "快手-创建创意信息-分页列表查询")
-    @ApiOperation(value = "快手-创建创意信息-分页列表查询", notes = "快手-创建创意信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<KuaiShouCreativeCreate>> queryPageList(KuaiShouCreativeCreate kuaiShouCreativeCreate,
-                                                               @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                               HttpServletRequest req) {
-        Result<IPage<KuaiShouCreativeCreate>> result = new Result<IPage<KuaiShouCreativeCreate>>();
-        QueryWrapper<KuaiShouCreativeCreate> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCreativeCreate, req.getParameterMap());
-        Page<KuaiShouCreativeCreate> page = new Page<KuaiShouCreativeCreate>(pageNo, pageSize);
-        IPage<KuaiShouCreativeCreate> pageList = kuaiShouCreativeCreateService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param kuaiShouCreativeCreate
-     * @return
-     */
-    @AutoLog(value = "快手-创建创意信息-添加")
-    @ApiOperation(value = "快手-创建创意信息-添加", notes = "快手-创建创意信息-添加")
-    @PostMapping(value = "/add")
-    public Result<KuaiShouCreativeCreate> add(@RequestBody KuaiShouCreativeCreate kuaiShouCreativeCreate) {
-        Result<KuaiShouCreativeCreate> result = new Result<KuaiShouCreativeCreate>();
-        try {
-            kuaiShouCreativeCreateService.save(kuaiShouCreativeCreate);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param kuaiShouCreativeCreate
-     * @return
-     */
-    @AutoLog(value = "快手-创建创意信息-编辑")
-    @ApiOperation(value = "快手-创建创意信息-编辑", notes = "快手-创建创意信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<KuaiShouCreativeCreate> edit(@RequestBody KuaiShouCreativeCreate kuaiShouCreativeCreate) {
-        Result<KuaiShouCreativeCreate> result = new Result<KuaiShouCreativeCreate>();
-        KuaiShouCreativeCreate kuaiShouCreativeCreateEntity = kuaiShouCreativeCreateService.getById(kuaiShouCreativeCreate.getId());
-        if (kuaiShouCreativeCreateEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = kuaiShouCreativeCreateService.updateById(kuaiShouCreativeCreate);
-            //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 {
-            kuaiShouCreativeCreateService.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<KuaiShouCreativeCreate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<KuaiShouCreativeCreate> result = new Result<KuaiShouCreativeCreate>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.kuaiShouCreativeCreateService.removeByIds(Arrays.asList(ids.split(StringUtils.COMMA)));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "快手-创建创意信息-通过id查询")
-    @ApiOperation(value = "快手-创建创意信息-通过id查询", notes = "快手-创建创意信息-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<KuaiShouCreativeCreate> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<KuaiShouCreativeCreate> result = new Result<KuaiShouCreativeCreate>();
-        KuaiShouCreativeCreate kuaiShouCreativeCreate = kuaiShouCreativeCreateService.getById(id);
-        if (kuaiShouCreativeCreate == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(kuaiShouCreativeCreate);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<KuaiShouCreativeCreate> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                KuaiShouCreativeCreate kuaiShouCreativeCreate = JSON.parseObject(deString, KuaiShouCreativeCreate.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCreativeCreate, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<KuaiShouCreativeCreate> pageList = kuaiShouCreativeCreateService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-创建创意信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, KuaiShouCreativeCreate.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<KuaiShouCreativeCreate> listKuaiShouCreativeCreates = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouCreativeCreate.class, params);
-                kuaiShouCreativeCreateService.saveBatch(listKuaiShouCreativeCreates);
-                return Result.ok("文件导入成功!数据行数:" + listKuaiShouCreativeCreates.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 - 287
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouGroupCreateLogController.java

@@ -1,287 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.common.module.utils.StringUtils;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateLog;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupCreateLogService;
-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.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-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 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-09
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "快手-批量创建广告组")
-@RestController
-@RequestMapping("/kuaishou/kuaiShouGroupCreateLog")
-public class KuaiShouGroupCreateLogController {
-    @Autowired
-    private IKuaiShouGroupCreateLogService kuaiShouGroupCreateLogService;
-
-    @PostMapping(value = "/insert")
-    public Map<String, Object> insert(@RequestBody KuaiShouGroupCreateLog groupCreateTemplate) {
-        return kuaiShouGroupCreateLogService.insert(groupCreateTemplate);
-    }
-
-    /**
-     * 分页列表查询
-     *
-     * @param kuaiShouGroupCreateLog
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "快手-批量创建广告组-分页列表查询")
-    @ApiOperation(value = "快手-批量创建广告组-分页列表查询", notes = "快手-批量创建广告组-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<KuaiShouGroupCreateLog>> queryPageList(KuaiShouGroupCreateLog kuaiShouGroupCreateLog,
-                                                               @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                               HttpServletRequest req) {
-        Result<IPage<KuaiShouGroupCreateLog>> result = new Result<IPage<KuaiShouGroupCreateLog>>();
-        QueryWrapper<KuaiShouGroupCreateLog> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupCreateLog, req.getParameterMap());
-        queryWrapper.orderByDesc("id");
-        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (!Check.isNull(user)) {
-            queryWrapper.eq("login_id", user.getId());
-        }
-        Page<KuaiShouGroupCreateLog> page = new Page<KuaiShouGroupCreateLog>(pageNo, pageSize);
-        IPage<KuaiShouGroupCreateLog> pageList = kuaiShouGroupCreateLogService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-
-    /**
-     * 分页列表查询
-     *
-     * @param kuaiShouGroupCreateLog
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "快手-批量创建广告组-分页列表查询")
-    @ApiOperation(value = "快手-批量创建广告组-分页列表查询", notes = "快手-批量创建广告组-分页列表查询")
-    @GetMapping(value = "/select/group")
-    public KuaiShouGroupCreateLog queryPageList(KuaiShouGroupCreateLog kuaiShouGroupCreateLog,
-                                                HttpServletRequest req) {
-        Result<IPage<KuaiShouGroupCreateLog>> result = new Result<IPage<KuaiShouGroupCreateLog>>();
-        QueryWrapper<KuaiShouGroupCreateLog> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupCreateLog, req.getParameterMap());
-        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (!Check.isNull(user)) {
-            queryWrapper.eq("login_id", user.getId());
-        }
-        queryWrapper.orderByDesc("create_time");
-        queryWrapper.last("limit 1");
-        KuaiShouGroupCreateLog groupCreateLog = (KuaiShouGroupCreateLog) kuaiShouGroupCreateLogService.getOne(queryWrapper);
-        return groupCreateLog;
-    }
-
-    /**
-     * 添加
-     *
-     * @param kuaiShouGroupCreateLog
-     * @return
-     */
-    @AutoLog(value = "快手-批量创建广告组-添加")
-    @ApiOperation(value = "快手-批量创建广告组-添加", notes = "快手-批量创建广告组-添加")
-    @PostMapping(value = "/add")
-    public Result<KuaiShouGroupCreateLog> add(@RequestBody KuaiShouGroupCreateLog kuaiShouGroupCreateLog) {
-        Result<KuaiShouGroupCreateLog> result = new Result<KuaiShouGroupCreateLog>();
-        try {
-            kuaiShouGroupCreateLogService.save(kuaiShouGroupCreateLog);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param kuaiShouGroupCreateLog
-     * @return
-     */
-    @AutoLog(value = "快手-批量创建广告组-编辑")
-    @ApiOperation(value = "快手-批量创建广告组-编辑", notes = "快手-批量创建广告组-编辑")
-    @PutMapping(value = "/edit")
-    public Result<KuaiShouGroupCreateLog> edit(@RequestBody KuaiShouGroupCreateLog kuaiShouGroupCreateLog) {
-        Result<KuaiShouGroupCreateLog> result = new Result<KuaiShouGroupCreateLog>();
-        KuaiShouGroupCreateLog kuaiShouGroupCreateLogEntity = kuaiShouGroupCreateLogService.getById(kuaiShouGroupCreateLog.getId());
-        if (kuaiShouGroupCreateLogEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = kuaiShouGroupCreateLogService.updateById(kuaiShouGroupCreateLog);
-            //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 {
-            kuaiShouGroupCreateLogService.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<KuaiShouGroupCreateLog> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<KuaiShouGroupCreateLog> result = new Result<KuaiShouGroupCreateLog>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.kuaiShouGroupCreateLogService.removeByIds(Arrays.asList(ids.split(StringUtils.COMMA)));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "快手-批量创建广告组-通过id查询")
-    @ApiOperation(value = "快手-批量创建广告组-通过id查询", notes = "快手-批量创建广告组-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<KuaiShouGroupCreateLog> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<KuaiShouGroupCreateLog> result = new Result<KuaiShouGroupCreateLog>();
-        KuaiShouGroupCreateLog kuaiShouGroupCreateLog = kuaiShouGroupCreateLogService.getById(id);
-        if (kuaiShouGroupCreateLog == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(kuaiShouGroupCreateLog);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<KuaiShouGroupCreateLog> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                KuaiShouGroupCreateLog kuaiShouGroupCreateLog = JSON.parseObject(deString, KuaiShouGroupCreateLog.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupCreateLog, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<KuaiShouGroupCreateLog> pageList = kuaiShouGroupCreateLogService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-批量创建广告组列表");
-        mv.addObject(NormalExcelConstants.CLASS, KuaiShouGroupCreateLog.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<KuaiShouGroupCreateLog> listKuaiShouGroupCreateLogs = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouGroupCreateLog.class, params);
-                kuaiShouGroupCreateLogService.saveBatch(listKuaiShouGroupCreateLogs);
-                return Result.ok("文件导入成功!数据行数:" + listKuaiShouGroupCreateLogs.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 - 249
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouGroupCreateTargetController.java

@@ -1,249 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.common.module.utils.StringUtils;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateTarget;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupCreateTargetService;
-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.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 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-24
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "快手-创建广告组定向信息")
-@RestController
-@RequestMapping("/kuaishou/kuaiShouGroupCreateTarget")
-public class KuaiShouGroupCreateTargetController {
-    @Autowired
-    private IKuaiShouGroupCreateTargetService kuaiShouGroupCreateTargetService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param kuaiShouGroupCreateTarget
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "快手-创建广告组定向信息-分页列表查询")
-    @ApiOperation(value = "快手-创建广告组定向信息-分页列表查询", notes = "快手-创建广告组定向信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<KuaiShouGroupCreateTarget>> queryPageList(KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget,
-                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                  HttpServletRequest req) {
-        Result<IPage<KuaiShouGroupCreateTarget>> result = new Result<IPage<KuaiShouGroupCreateTarget>>();
-        QueryWrapper<KuaiShouGroupCreateTarget> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupCreateTarget, req.getParameterMap());
-        Page<KuaiShouGroupCreateTarget> page = new Page<KuaiShouGroupCreateTarget>(pageNo, pageSize);
-        IPage<KuaiShouGroupCreateTarget> pageList = kuaiShouGroupCreateTargetService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param kuaiShouGroupCreateTarget
-     * @return
-     */
-    @AutoLog(value = "快手-创建广告组定向信息-添加")
-    @ApiOperation(value = "快手-创建广告组定向信息-添加", notes = "快手-创建广告组定向信息-添加")
-    @PostMapping(value = "/add")
-    public Result<KuaiShouGroupCreateTarget> add(@RequestBody KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget) {
-        Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
-        try {
-            kuaiShouGroupCreateTargetService.save(kuaiShouGroupCreateTarget);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param kuaiShouGroupCreateTarget
-     * @return
-     */
-    @AutoLog(value = "快手-创建广告组定向信息-编辑")
-    @ApiOperation(value = "快手-创建广告组定向信息-编辑", notes = "快手-创建广告组定向信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<KuaiShouGroupCreateTarget> edit(@RequestBody KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget) {
-        Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
-        KuaiShouGroupCreateTarget kuaiShouGroupCreateTargetEntity = kuaiShouGroupCreateTargetService.getById(kuaiShouGroupCreateTarget.getId());
-        if (kuaiShouGroupCreateTargetEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = kuaiShouGroupCreateTargetService.updateById(kuaiShouGroupCreateTarget);
-            //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 {
-            kuaiShouGroupCreateTargetService.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<KuaiShouGroupCreateTarget> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.kuaiShouGroupCreateTargetService.removeByIds(Arrays.asList(ids.split(StringUtils.COMMA)));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "快手-创建广告组定向信息-通过id查询")
-    @ApiOperation(value = "快手-创建广告组定向信息-通过id查询", notes = "快手-创建广告组定向信息-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<KuaiShouGroupCreateTarget> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
-        KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget = kuaiShouGroupCreateTargetService.getById(id);
-        if (kuaiShouGroupCreateTarget == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(kuaiShouGroupCreateTarget);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<KuaiShouGroupCreateTarget> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget = JSON.parseObject(deString, KuaiShouGroupCreateTarget.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupCreateTarget, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<KuaiShouGroupCreateTarget> pageList = kuaiShouGroupCreateTargetService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-创建广告组定向信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, KuaiShouGroupCreateTarget.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<KuaiShouGroupCreateTarget> listKuaiShouGroupCreateTargets = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouGroupCreateTarget.class, params);
-                kuaiShouGroupCreateTargetService.saveBatch(listKuaiShouGroupCreateTargets);
-                return Result.ok("文件导入成功!数据行数:" + listKuaiShouGroupCreateTargets.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 - 273
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouImageController.java

@@ -1,273 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.common.module.utils.StringUtils;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImage;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageService;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-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.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-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 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-14
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "快手-本地图片保存")
-@RestController
-@RequestMapping("/kuaishou/kuaiShouImage")
-public class KuaiShouImageController {
-    @Autowired
-    private IKuaiShouImageService kuaiShouImageService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param kuaiShouImage
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "快手-本地图片保存-分页列表查询")
-    @ApiOperation(value = "快手-本地图片保存-分页列表查询", notes = "快手-本地图片保存-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<KuaiShouImage>> queryPageList(KuaiShouImage kuaiShouImage,
-                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                      HttpServletRequest req) {
-        Result<IPage<KuaiShouImage>> result = new Result<IPage<KuaiShouImage>>();
-
-        QueryWrapper<KuaiShouImage> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImage, req.getParameterMap());
-        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (!Check.isNull(user)) {
-            queryWrapper.eq("login_id", user.getId());
-        }
-        queryWrapper.orderByDesc("id");
-        Page<KuaiShouImage> page = new Page<KuaiShouImage>(pageNo, pageSize);
-        IPage<KuaiShouImage> pageList = kuaiShouImageService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-
-    @GetMapping(value = "/image/list")
-    public JSONArray imageList(KuaiShouImage kuaiShouImage, HttpServletRequest req) {
-        QueryWrapper<KuaiShouImage> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImage, req.getParameterMap());
-        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (!Check.isNull(user)) {
-            queryWrapper.eq("login_id", user.getId());
-        }
-        queryWrapper.orderByDesc("create_time");
-        JSONArray jsonArr = kuaiShouImageService.selectImageList(queryWrapper);
-        return jsonArr;
-    }
-
-
-    /**
-     * 添加
-     *
-     * @param kuaiShouImage
-     * @return
-     */
-    @AutoLog(value = "快手-本地图片保存-添加")
-    @ApiOperation(value = "快手-本地图片保存-添加", notes = "快手-本地图片保存-添加")
-    @PostMapping(value = "/add")
-    public Result<KuaiShouImage> add(@RequestBody KuaiShouImage kuaiShouImage) {
-        Result<KuaiShouImage> result = new Result<KuaiShouImage>();
-        try {
-            kuaiShouImageService.save(kuaiShouImage);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param kuaiShouImage
-     * @return
-     */
-    @AutoLog(value = "快手-本地图片保存-编辑")
-    @ApiOperation(value = "快手-本地图片保存-编辑", notes = "快手-本地图片保存-编辑")
-    @PutMapping(value = "/edit")
-    public Result<KuaiShouImage> edit(@RequestBody KuaiShouImage kuaiShouImage) {
-        Result<KuaiShouImage> result = new Result<KuaiShouImage>();
-        KuaiShouImage kuaiShouImageEntity = kuaiShouImageService.getById(kuaiShouImage.getId());
-        if (kuaiShouImageEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = kuaiShouImageService.updateById(kuaiShouImage);
-            //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 {
-            kuaiShouImageService.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<KuaiShouImage> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<KuaiShouImage> result = new Result<KuaiShouImage>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.kuaiShouImageService.removeByIds(Arrays.asList(ids.split(StringUtils.COMMA)));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "快手-本地图片保存-通过id查询")
-    @ApiOperation(value = "快手-本地图片保存-通过id查询", notes = "快手-本地图片保存-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<KuaiShouImage> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<KuaiShouImage> result = new Result<KuaiShouImage>();
-        KuaiShouImage kuaiShouImage = kuaiShouImageService.getById(id);
-        if (kuaiShouImage == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(kuaiShouImage);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<KuaiShouImage> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                KuaiShouImage kuaiShouImage = JSON.parseObject(deString, KuaiShouImage.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImage, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<KuaiShouImage> pageList = kuaiShouImageService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-本地图片保存列表");
-        mv.addObject(NormalExcelConstants.CLASS, KuaiShouImage.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<KuaiShouImage> listKuaiShouImages = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouImage.class, params);
-                kuaiShouImageService.saveBatch(listKuaiShouImages);
-                return Result.ok("文件导入成功!数据行数:" + listKuaiShouImages.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 - 249
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouImageUploandController.java

@@ -1,249 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.common.module.utils.StringUtils;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageUploand;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageUploandService;
-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.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 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-26
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "快手-上传图片接口")
-@RestController
-@RequestMapping("/kuaishou/kuaiShouImageUploand")
-public class KuaiShouImageUploandController {
-    @Autowired
-    private IKuaiShouImageUploandService kuaiShouImageUploandService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param kuaiShouImageUploand
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "快手-上传图片接口-分页列表查询")
-    @ApiOperation(value = "快手-上传图片接口-分页列表查询", notes = "快手-上传图片接口-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<KuaiShouImageUploand>> queryPageList(KuaiShouImageUploand kuaiShouImageUploand,
-                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                             HttpServletRequest req) {
-        Result<IPage<KuaiShouImageUploand>> result = new Result<IPage<KuaiShouImageUploand>>();
-        QueryWrapper<KuaiShouImageUploand> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImageUploand, req.getParameterMap());
-        Page<KuaiShouImageUploand> page = new Page<KuaiShouImageUploand>(pageNo, pageSize);
-        IPage<KuaiShouImageUploand> pageList = kuaiShouImageUploandService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param kuaiShouImageUploand
-     * @return
-     */
-    @AutoLog(value = "快手-上传图片接口-添加")
-    @ApiOperation(value = "快手-上传图片接口-添加", notes = "快手-上传图片接口-添加")
-    @PostMapping(value = "/add")
-    public Result<KuaiShouImageUploand> add(@RequestBody KuaiShouImageUploand kuaiShouImageUploand) {
-        Result<KuaiShouImageUploand> result = new Result<KuaiShouImageUploand>();
-        try {
-            kuaiShouImageUploandService.save(kuaiShouImageUploand);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param kuaiShouImageUploand
-     * @return
-     */
-    @AutoLog(value = "快手-上传图片接口-编辑")
-    @ApiOperation(value = "快手-上传图片接口-编辑", notes = "快手-上传图片接口-编辑")
-    @PutMapping(value = "/edit")
-    public Result<KuaiShouImageUploand> edit(@RequestBody KuaiShouImageUploand kuaiShouImageUploand) {
-        Result<KuaiShouImageUploand> result = new Result<KuaiShouImageUploand>();
-        KuaiShouImageUploand kuaiShouImageUploandEntity = kuaiShouImageUploandService.getById(kuaiShouImageUploand.getId());
-        if (kuaiShouImageUploandEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = kuaiShouImageUploandService.updateById(kuaiShouImageUploand);
-            //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 {
-            kuaiShouImageUploandService.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<KuaiShouImageUploand> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<KuaiShouImageUploand> result = new Result<KuaiShouImageUploand>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.kuaiShouImageUploandService.removeByIds(Arrays.asList(ids.split(StringUtils.COMMA)));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "快手-上传图片接口-通过id查询")
-    @ApiOperation(value = "快手-上传图片接口-通过id查询", notes = "快手-上传图片接口-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<KuaiShouImageUploand> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<KuaiShouImageUploand> result = new Result<KuaiShouImageUploand>();
-        KuaiShouImageUploand kuaiShouImageUploand = kuaiShouImageUploandService.getById(id);
-        if (kuaiShouImageUploand == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(kuaiShouImageUploand);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<KuaiShouImageUploand> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                KuaiShouImageUploand kuaiShouImageUploand = JSON.parseObject(deString, KuaiShouImageUploand.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImageUploand, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<KuaiShouImageUploand> pageList = kuaiShouImageUploandService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-上传图片接口列表");
-        mv.addObject(NormalExcelConstants.CLASS, KuaiShouImageUploand.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<KuaiShouImageUploand> listKuaiShouImageUploands = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouImageUploand.class, params);
-                kuaiShouImageUploandService.saveBatch(listKuaiShouImageUploands);
-                return Result.ok("文件导入成功!数据行数:" + listKuaiShouImageUploands.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 - 304
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouVideoController.java

@@ -1,304 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.common.module.utils.StringUtils;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideo;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoService;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-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.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-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 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-14
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "快手-本地图片保存")
-@RestController
-@RequestMapping("/kuaishou/kuaiShouVideo")
-public class KuaiShouVideoController {
-    @Autowired
-    private IKuaiShouVideoService kuaiShouVideoService;
-    @Autowired
-    private IKuaiShouImageService imageService;
-
-
-    @PostMapping(value = "/insert")
-    public Result<KuaiShouVideo> insert(@RequestBody JSONObject requestJson) {
-        Result<KuaiShouVideo> result = new Result<>();
-        try {
-            kuaiShouVideoService.insert(requestJson);
-            imageService.insert(requestJson);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-
-    /**
-     * 通过id查询
-     *
-     * @return
-     */
-    @AutoLog(value = "快手-本地图片保存-通过id查询")
-    @ApiOperation(value = "快手-本地图片保存-通过id查询", notes = "快手-本地图片保存-通过id查询")
-    @PostMapping(value = "/queryShouVideo")
-    public Result<KuaiShouVideo> queryShouVideo(@RequestBody JSONObject requestJson) {
-        Result<KuaiShouVideo> result = new Result<KuaiShouVideo>();
-        QueryWrapper<KuaiShouVideo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("local_url", requestJson.getString("localUrl"));
-        queryWrapper.eq("login_id", requestJson.getString("loginId"));
-        queryWrapper.orderByDesc("create_time");
-        queryWrapper.last("limit 1");
-        KuaiShouVideo kuaiShouVideo = kuaiShouVideoService.getOne(queryWrapper);
-        if (kuaiShouVideo == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(kuaiShouVideo);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-
-    /**
-     * 分页列表查询
-     *
-     * @param kuaiShouVideo
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "快手-本地图片保存-分页列表查询")
-    @ApiOperation(value = "快手-本地图片保存-分页列表查询", notes = "快手-本地图片保存-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<KuaiShouVideo>> queryPageList(KuaiShouVideo kuaiShouVideo,
-                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                      HttpServletRequest req) {
-        Result<IPage<KuaiShouVideo>> result = new Result<IPage<KuaiShouVideo>>();
-        QueryWrapper<KuaiShouVideo> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouVideo, req.getParameterMap());
-        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (!Check.isNull(user)) {
-            queryWrapper.eq("login_id", user.getId());
-        }
-        queryWrapper.eq("status", 1);
-        queryWrapper.orderByDesc("id");
-        Page<KuaiShouVideo> page = new Page<KuaiShouVideo>(pageNo, pageSize);
-        IPage<KuaiShouVideo> pageList = kuaiShouVideoService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param kuaiShouVideo
-     * @return
-     */
-    @AutoLog(value = "快手-本地图片保存-添加")
-    @ApiOperation(value = "快手-本地图片保存-添加", notes = "快手-本地图片保存-添加")
-    @PostMapping(value = "/add")
-    public Result<KuaiShouVideo> add(@RequestBody KuaiShouVideo kuaiShouVideo) {
-        Result<KuaiShouVideo> result = new Result<KuaiShouVideo>();
-        try {
-            kuaiShouVideoService.save(kuaiShouVideo);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param kuaiShouVideo
-     * @return
-     */
-    @AutoLog(value = "快手-本地图片保存-编辑")
-    @ApiOperation(value = "快手-本地图片保存-编辑", notes = "快手-本地图片保存-编辑")
-    @PutMapping(value = "/edit")
-    public Result<KuaiShouVideo> edit(@RequestBody KuaiShouVideo kuaiShouVideo) {
-        Result<KuaiShouVideo> result = new Result<KuaiShouVideo>();
-        KuaiShouVideo kuaiShouVideoEntity = kuaiShouVideoService.getById(kuaiShouVideo.getId());
-        if (kuaiShouVideoEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = kuaiShouVideoService.updateById(kuaiShouVideo);
-            //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 {
-            kuaiShouVideoService.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<KuaiShouVideo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<KuaiShouVideo> result = new Result<KuaiShouVideo>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.kuaiShouVideoService.removeByIds(Arrays.asList(ids.split(StringUtils.COMMA)));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "快手-本地图片保存-通过id查询")
-    @ApiOperation(value = "快手-本地图片保存-通过id查询", notes = "快手-本地图片保存-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<KuaiShouVideo> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<KuaiShouVideo> result = new Result<KuaiShouVideo>();
-        KuaiShouVideo kuaiShouVideo = kuaiShouVideoService.getById(id);
-        if (kuaiShouVideo == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(kuaiShouVideo);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<KuaiShouVideo> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                KuaiShouVideo kuaiShouVideo = JSON.parseObject(deString, KuaiShouVideo.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouVideo, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<KuaiShouVideo> pageList = kuaiShouVideoService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-本地图片保存列表");
-        mv.addObject(NormalExcelConstants.CLASS, KuaiShouVideo.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<KuaiShouVideo> listKuaiShouVideos = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouVideo.class, params);
-                kuaiShouVideoService.saveBatch(listKuaiShouVideos);
-                return Result.ok("文件导入成功!数据行数:" + listKuaiShouVideos.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 - 249
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouVideoUploadController.java

@@ -1,249 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.common.module.utils.StringUtils;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoUpload;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoUploadService;
-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.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 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-26
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "快手-视频上传")
-@RestController
-@RequestMapping("/kuaishou/kuaiShouVideoUpload")
-public class KuaiShouVideoUploadController {
-    @Autowired
-    private IKuaiShouVideoUploadService kuaiShouVideoUploadService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param kuaiShouVideoUpload
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "快手-视频上传-分页列表查询")
-    @ApiOperation(value = "快手-视频上传-分页列表查询", notes = "快手-视频上传-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<KuaiShouVideoUpload>> queryPageList(KuaiShouVideoUpload kuaiShouVideoUpload,
-                                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                            HttpServletRequest req) {
-        Result<IPage<KuaiShouVideoUpload>> result = new Result<IPage<KuaiShouVideoUpload>>();
-        QueryWrapper<KuaiShouVideoUpload> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouVideoUpload, req.getParameterMap());
-        Page<KuaiShouVideoUpload> page = new Page<KuaiShouVideoUpload>(pageNo, pageSize);
-        IPage<KuaiShouVideoUpload> pageList = kuaiShouVideoUploadService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param kuaiShouVideoUpload
-     * @return
-     */
-    @AutoLog(value = "快手-视频上传-添加")
-    @ApiOperation(value = "快手-视频上传-添加", notes = "快手-视频上传-添加")
-    @PostMapping(value = "/add")
-    public Result<KuaiShouVideoUpload> add(@RequestBody KuaiShouVideoUpload kuaiShouVideoUpload) {
-        Result<KuaiShouVideoUpload> result = new Result<KuaiShouVideoUpload>();
-        try {
-            kuaiShouVideoUploadService.save(kuaiShouVideoUpload);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param kuaiShouVideoUpload
-     * @return
-     */
-    @AutoLog(value = "快手-视频上传-编辑")
-    @ApiOperation(value = "快手-视频上传-编辑", notes = "快手-视频上传-编辑")
-    @PutMapping(value = "/edit")
-    public Result<KuaiShouVideoUpload> edit(@RequestBody KuaiShouVideoUpload kuaiShouVideoUpload) {
-        Result<KuaiShouVideoUpload> result = new Result<KuaiShouVideoUpload>();
-        KuaiShouVideoUpload kuaiShouVideoUploadEntity = kuaiShouVideoUploadService.getById(kuaiShouVideoUpload.getId());
-        if (kuaiShouVideoUploadEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = kuaiShouVideoUploadService.updateById(kuaiShouVideoUpload);
-            //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 {
-            kuaiShouVideoUploadService.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<KuaiShouVideoUpload> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<KuaiShouVideoUpload> result = new Result<KuaiShouVideoUpload>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.kuaiShouVideoUploadService.removeByIds(Arrays.asList(ids.split(StringUtils.COMMA)));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "快手-视频上传-通过id查询")
-    @ApiOperation(value = "快手-视频上传-通过id查询", notes = "快手-视频上传-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<KuaiShouVideoUpload> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<KuaiShouVideoUpload> result = new Result<KuaiShouVideoUpload>();
-        KuaiShouVideoUpload kuaiShouVideoUpload = kuaiShouVideoUploadService.getById(id);
-        if (kuaiShouVideoUpload == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(kuaiShouVideoUpload);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<KuaiShouVideoUpload> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                KuaiShouVideoUpload kuaiShouVideoUpload = JSON.parseObject(deString, KuaiShouVideoUpload.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouVideoUpload, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<KuaiShouVideoUpload> pageList = kuaiShouVideoUploadService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-视频上传列表");
-        mv.addObject(NormalExcelConstants.CLASS, KuaiShouVideoUpload.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<KuaiShouVideoUpload> listKuaiShouVideoUploads = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouVideoUpload.class, params);
-                kuaiShouVideoUploadService.saveBatch(listKuaiShouVideoUploads);
-                return Result.ok("文件导入成功!数据行数:" + listKuaiShouVideoUploads.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 - 13
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/UpdateController.java

@@ -1,13 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.controller;
-
-import io.swagger.annotations.Api;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Slf4j
-@Api(tags = "快手-修改接口")
-@RestController
-@RequestMapping("/kuaishou/batch")
-public class UpdateController {
-}

+ 0 - 118
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouAppCreate.java

@@ -1,118 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.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;
-
-/**
- * @Description: 创建应用
- * @Author: jeecg-boot
- * @Date: 2019-07-26
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_kuaishou_app_create")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_kuaishou_app_create对象", description = "创建应用")
-public class KuaiShouAppCreate {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 账户ID
-     */
-    @Excel(name = "账户ID", width = 15)
-    @ApiModelProperty(value = "账户ID")
-    private Long accountId;
-    /**
-     * 本地存储地址
-     */
-    @Excel(name = "本地存储地址", width = 15)
-    @ApiModelProperty(value = "本地存储地址")
-    private Object savaPath;
-    /**
-     * 上传应用地址
-     */
-    @Excel(name = "上传应用地址", width = 15)
-    @ApiModelProperty(value = "上传应用地址")
-    private Object url;
-    /**
-     * 应用标记
-     */
-    @Excel(name = "应用标记", width = 15)
-    @ApiModelProperty(value = "应用标记")
-    private String appVersion;
-    /**
-     * 应用名称
-     */
-    @Excel(name = "应用名称", width = 15)
-    @ApiModelProperty(value = "应用名称")
-    private String appName;
-    /**
-     * 图片token
-     */
-    @Excel(name = "图片token", width = 15)
-    @ApiModelProperty(value = "图片token")
-    private Object imageToken;
-    /**
-     * 应用包名
-     */
-    @Excel(name = "应用包名", width = 15)
-    @ApiModelProperty(value = "应用包名")
-    private String packageName;
-    /**
-     * 应用类型 1: Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏
-     */
-    @Excel(name = "应用类型 1: Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏", width = 15)
-    @ApiModelProperty(value = "应用类型 1: Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏")
-    private Integer platform;
-    /**
-     * 请求成功后 返回应用地址
-     */
-    @Excel(name = "请求成功后 返回应用地址", width = 15)
-    @ApiModelProperty(value = "请求成功后 返回应用地址")
-    private Object returnUrl;
-    /**
-     * 应用id
-     */
-    @Excel(name = "应用id", width = 15)
-    @ApiModelProperty(value = "应用id")
-    private Long appId;
-    /**
-     * 文件上传时间
-     */
-    @Excel(name = "文件上传时间", width = 15)
-    @ApiModelProperty(value = "文件上传时间")
-    private String uploadTime;
-    /**
-     * 创建时间
-     */
-    @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 - 82
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouCampaignCreate.java

@@ -1,82 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.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;
-
-/**
- * @Description: 快手-创建广告计划
- * @Author: jeecg-boot
- * @Date: 2019-07-23
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_kuaishou_campaign_create")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_kuaishou_campaign_create对象", description = "快手-创建广告计划")
-public class KuaiShouCampaignCreate {
-
-    /**
-     * 账户ID
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "账户ID")
-    private Long id;
-    /**
-     * 账户ID
-     */
-    @Excel(name = "账户ID", width = 15)
-    @ApiModelProperty(value = "账户ID")
-    private Long accountId;
-    /**
-     * 广告计划名称
-     */
-    @Excel(name = "广告计划名称", width = 15)
-    @ApiModelProperty(value = "广告计划名称")
-    private String campaignName;
-    /**
-     * 2:提升应用安装 3:获取电商下单 4:推广品牌活动 5:收集销售线索
-     */
-    @Excel(name = "2:提升应用安装 3:获取电商下单 4:推广品牌活动 5:收集销售线索", width = 15)
-    @ApiModelProperty(value = "2:提升应用安装 3:获取电商下单 4:推广品牌活动 5:收集销售线索")
-    private Integer type;
-    /**
-     * 计划单日预算金额 单位:厘 0表示预算不限,不小于500元,不超过100000000
-     */
-    @Excel(name = "计划单日预算金额 单位:厘 0表示预算不限,不小于500元,不超过100000000", width = 15)
-    @ApiModelProperty(value = "计划单日预算金额 单位:厘 0表示预算不限,不小于500元,不超过100000000")
-    private Integer dayBudget;
-    /**
-     * 广告计划id
-     */
-    @Excel(name = "广告计划id", width = 15)
-    @ApiModelProperty(value = "广告计划id")
-    private Long campaignId;
-    /**
-     * 创建时间
-     */
-    @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 - 132
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouCreateAppTemplate.java

@@ -1,132 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.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 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;
-
-/**
- * @Description: 创建应用
- * @Author: jeecg-boot
- * @Date: 2019-08-06
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_kuaishou_create_app_template")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_kuaishou_create_app_template对象", description = "创建应用")
-public class KuaiShouCreateAppTemplate {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * app类型 安卓 ios
-     */
-    @Excel(name = "app类型 安卓 ios", width = 15)
-    @ApiModelProperty(value = "app类型 安卓 ios")
-    private String appType;
-    /**
-     * 应用类型   : 1 Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏
-     */
-    @Excel(name = "应用类型   : 1 Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏", width = 15)
-    @ApiModelProperty(value = "应用类型   : 1 Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏")
-    private String platform;
-    /**
-     * 应用标记
-     */
-    @Excel(name = "应用标记", width = 15)
-    @ApiModelProperty(value = "应用标记")
-    private String appVersion;
-    /**
-     * 应用名称
-     */
-    @Excel(name = "应用名称", width = 15)
-    @ApiModelProperty(value = "应用名称")
-    private String appName;
-    /**
-     * 应用包名
-     */
-    @Excel(name = "应用包名", width = 15)
-    @ApiModelProperty(value = "应用包名")
-    private String packageName;
-    /**
-     * 上传文件到服务器返回地址
-     */
-    @Excel(name = "上传文件到服务器返回地址", width = 15)
-    @ApiModelProperty(value = "上传文件到服务器返回地址")
-    private Object file;
-    /**
-     * 上传图片到服务器返回地址
-     */
-    @Excel(name = "上传图片到服务器返回地址", width = 15)
-    @ApiModelProperty(value = "上传图片到服务器返回地址")
-    private Object imageUrl;
-    /**
-     * 输入应用下载地址
-     */
-    @Excel(name = "输入应用下载地址", width = 15)
-    @ApiModelProperty(value = "输入应用下载地址")
-    private Object url;
-
-
-    /**
-     * url类型 1:淘宝商品短链 2:淘宝商品 itemID
-     */
-    @Excel(name = "上传类型 1:上传文件 2:填写链接", width = 15)
-    @ApiModelProperty(value = "上传类型 1:本地上传 2:url 链接")
-    private Integer uploadType;
-
-
-    private Long accountId;
-
-
-    /**
-     * 登录人id
-     */
-    @Excel(name = "登录人id", width = 15)
-    @ApiModelProperty(value = "登录人id")
-    private String loginId;
-    /**
-     * 创建时间
-     */
-    @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;
-    /**
-     * createBy
-     */
-    @Excel(name = "createBy", width = 15)
-    @ApiModelProperty(value = "createBy")
-    private String createBy;
-    /**
-     * updateBy
-     */
-    @Excel(name = "updateBy", width = 15)
-    @ApiModelProperty(value = "updateBy")
-    private String updateBy;
-}

+ 0 - 106
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouCreativeCreate.java

@@ -1,106 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.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;
-
-/**
- * @Description: 快手-创建创意信息
- * @Author: jeecg-boot
- * @Date: 2019-07-24
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_kuaishou_creative_create")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_kuaishou_creative_create对象", description = "快手-创建创意信息")
-public class KuaiShouCreativeCreate {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 账户ID
-     */
-    @Excel(name = "账户ID", width = 15)
-    @ApiModelProperty(value = "账户ID")
-    private Long accountId;
-    /**
-     * 广告组ID
-     */
-    @Excel(name = "广告组ID", width = 15)
-    @ApiModelProperty(value = "广告组ID")
-    private Long unitId;
-    /**
-     * 广告创意名称
-     */
-    @Excel(name = "广告创意名称", width = 15)
-    @ApiModelProperty(value = "广告创意名称")
-    private String creativeName;
-    /**
-     * 视频作品ID
-     */
-    @Excel(name = "视频作品ID", width = 15)
-    @ApiModelProperty(value = "视频作品ID")
-    private String photoId;
-    /**
-     * 封面图片token
-     */
-    @Excel(name = "封面图片token", width = 15)
-    @ApiModelProperty(value = "封面图片token")
-    private String imageToken;
-    /**
-     * 行动号召按钮文案
-     */
-    @Excel(name = "行动号召按钮文案", width = 15)
-    @ApiModelProperty(value = "行动号召按钮文案")
-    private String actionBarText;
-    /**
-     * 广告语
-     */
-    @Excel(name = "广告语", width = 15)
-    @ApiModelProperty(value = "广告语")
-    private String description;
-    /**
-     * 点击测试链接
-     */
-    @Excel(name = "点击测试链接", width = 15)
-    @ApiModelProperty(value = "点击测试链接")
-    private String clickTrackUrl;
-    /**
-     * 广告创意ID
-     */
-    @Excel(name = "广告创意ID", width = 15)
-    @ApiModelProperty(value = "广告创意ID")
-    private Long creativeId;
-    /**
-     * 创建时间
-     */
-    @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 - 219
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouGroupCreateLog.java

@@ -1,219 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.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 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;
-
-/**
- * @Description: 快手-批量创建广告组
- * @Author: jeecg-boot
- * @Date: 2019-08-09
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_kuaishou_group_create_log")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_kuaishou_group_create_log对象", description = "快手-批量创建广告组")
-public class KuaiShouGroupCreateLog {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 广告计划模板ID
-     */
-    @Excel(name = "广告计划模板ID", width = 15)
-    @ApiModelProperty(value = "广告计划模板ID")
-    private Long campaignTemplateId;
-    /**
-     * 账户ID
-     */
-    @Excel(name = "账户ID", width = 15)
-    @ApiModelProperty(value = "账户ID")
-    private Long accountId;
-    /**
-     * 广告活动ID
-     */
-    @Excel(name = "广告活动ID", width = 15)
-    @ApiModelProperty(value = "广告活动ID")
-    private Long campaignId;
-    /**
-     * 广告组名称
-     */
-    @Excel(name = "广告组名称", width = 15)
-    @ApiModelProperty(value = "广告组名称")
-    private String unitName;
-    /**
-     * 出价类型
-     */
-    @Excel(name = "出价类型", width = 15)
-    @ApiModelProperty(value = "出价类型")
-    private Integer bidType;
-    /**
-     * 出价
-     */
-    @Excel(name = "出价", width = 15)
-    @ApiModelProperty(value = "出价")
-    private Long bid;
-    /**
-     * OCPC出价
-     */
-    @Excel(name = "OCPC出价", width = 15)
-    @ApiModelProperty(value = "OCPC出价")
-    private Long cpaBid;
-    /**
-     * 优化目标
-     */
-    @Excel(name = "优化目标", width = 15)
-    @ApiModelProperty(value = "优化目标")
-    private Integer ocpxActionType;
-    /**
-     * 深度转化目标 null
-     */
-    @Excel(name = "深度转化目标", width = 15)
-    @ApiModelProperty(value = "深度转化目标 null")
-    private Integer deepConversionType;
-
-    /**
-     * 深度转化目标出价
-     */
-    @Excel(name = "出价", width = 15)
-    @ApiModelProperty(value = "出价")
-    private Long deepConversionBid;
-
-    /**
-     * 资源位置
-     */
-    @Excel(name = "资源位置", width = 15)
-    @ApiModelProperty(value = "资源位置")
-    private Integer sceneId;
-    /**
-     * 投放开始时间
-     */
-    @Excel(name = "投放开始时间", width = 15)
-    @ApiModelProperty(value = "投放开始时间")
-    private String beginTime;
-
-
-    /**
-     * 创意制作方式
-     */
-    @Excel(name = "投放开始时间", width = 15)
-    @ApiModelProperty(value = "创意制作方式")
-    private Integer unitType;
-
-
-    /**
-     * 投放结束时间
-     */
-    @Excel(name = "投放结束时间", width = 15)
-    @ApiModelProperty(value = "投放结束时间")
-    private String endTime;
-    /**
-     * 投放时段
-     */
-    @Excel(name = "投放时段", width = 15)
-    @ApiModelProperty(value = "投放时段")
-    private Object scheduleTime;
-    /**
-     * 单日预算
-     */
-    @Excel(name = "单日预算", width = 15)
-    @ApiModelProperty(value = "单日预算")
-    private Integer dayBudget;
-    /**
-     * url类型 1:淘宝商品短链 2:淘宝商品 itemID
-     */
-    @Excel(name = "url类型 1:淘宝商品短链 2:淘宝商品 itemID", width = 15)
-    @ApiModelProperty(value = "url类型 1:淘宝商品短链 2:淘宝商品 itemID")
-    private Integer urlType;
-    /**
-     * 投放链接
-     */
-    @Excel(name = "投放链接", width = 15)
-    @ApiModelProperty(value = "投放链接")
-    private Object url;
-    /**
-     * APP ID
-     */
-    @Excel(name = "APP ID", width = 15)
-    @ApiModelProperty(value = "APP ID")
-    private Integer appId;
-    /**
-     * 创意展现方式  1:轮播 2:优选
-     */
-    @Excel(name = "创意展现方式  1:轮播 2:优选", width = 15)
-    @ApiModelProperty(value = "创意展现方式  1:轮播 2:优选")
-    private Integer showModel;
-    /**
-     * 投放方式 1:快速投放 2:平滑投放
-     */
-    @Excel(name = "投放方式 1:快速投放 2:平滑投放", width = 15)
-    @ApiModelProperty(value = "投放方式 1:快速投放 2:平滑投放")
-    private Integer speed;
-    /**
-     * 广告组ID
-     */
-    @Excel(name = "广告组ID", width = 15)
-    @ApiModelProperty(value = "广告组ID")
-    private Long unitId;
-    /**
-     * 当前登录人id
-     */
-    @Excel(name = "当前登录人id", width = 15)
-    @ApiModelProperty(value = "当前登录人id")
-    private String loginId;
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人", width = 15)
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-
-    @TableField(exist = false)
-    private Integer createCount;
-
-
-    @TableField(exist = false)
-    private String redundancy;
-
-
-    /**
-     * 修改人
-     */
-    @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 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 - 124
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouGroupCreateTarget.java

@@ -1,124 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.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;
-
-/**
- * @Description: 快手-创建广告组定向信息
- * @Author: jeecg-boot
- * @Date: 2019-07-24
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_kuaishou_group_create_target")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_kuaishou_group_create_target对象", description = "快手-创建广告组定向信息")
-public class KuaiShouGroupCreateTarget {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 账户ID
-     */
-    @Excel(name = "账户ID", width = 15)
-    @ApiModelProperty(value = "账户ID")
-    private Long accountId;
-    /**
-     * 广告组ID
-     */
-    @Excel(name = "广告组ID", width = 15)
-    @ApiModelProperty(value = "广告组ID")
-    private Long unitId;
-    /**
-     * 地域
-     */
-    @Excel(name = "地域", width = 15)
-    @ApiModelProperty(value = "地域")
-    private Object region;
-    /**
-     * 年龄最小限制
-     */
-    @Excel(name = "年龄最小限制", width = 15)
-    @ApiModelProperty(value = "年龄最小限制")
-    private Integer ageMin;
-    /**
-     * 年龄最大限制
-     */
-    @Excel(name = "年龄最大限制", width = 15)
-    @ApiModelProperty(value = "年龄最大限制")
-    private Integer ageMax;
-    /**
-     * 性别 1:女性, 2:男性, 0:不限
-     */
-    @Excel(name = "性别 1:女性, 2:男性, 0:不限", width = 15)
-    @ApiModelProperty(value = "性别 1:女性, 2:男性, 0:不限")
-    private Integer gender;
-    /**
-     * 操作系统 1: Android, 2: iOS, 0:不限
-     */
-    @Excel(name = "操作系统 1: Android, 2: iOS, 0:不限", width = 15)
-    @ApiModelProperty(value = "操作系统 1: Android, 2: iOS, 0:不限")
-    private Integer platformOs;
-    /**
-     * 安卓版本  3:不限, 4: 4.x+, 5: 5.x+, 6: 6.x+, 7: 7.x+;
-     */
-    @Excel(name = "安卓版本  3:不限, 4: 4.x+, 5: 5.x+, 6: 6.x+, 7: 7.x+;", width = 15)
-    @ApiModelProperty(value = "安卓版本  3:不限, 4: 4.x+, 5: 5.x+, 6: 6.x+, 7: 7.x+;")
-    private Integer androidOsv;
-    /**
-     * ios版本  6:不限, 7: 7.x+, 8: 8.x+,9: 9.x+, 10: 10.x+
-     */
-    @Excel(name = "ios版本  6:不限, 7: 7.x+, 8: 8.x+,9: 9.x+, 10: 10.x+", width = 15)
-    @ApiModelProperty(value = "ios版本  6:不限, 7: 7.x+, 8: 8.x+,9: 9.x+, 10: 10.x+")
-    private Integer iosOsv;
-    /**
-     * 网络环境 1: Wi-Fi, 2:移动网络,0:表示不限
-     */
-    @Excel(name = "网络环境 1: Wi-Fi, 2:移动网络,0:表示不限", width = 15)
-    @ApiModelProperty(value = "网络环境 1: Wi-Fi, 2:移动网络,0:表示不限")
-    private Integer network;
-    /**
-     * 设备品牌 1: OPPO, 2: VIVO,3:华为, 4:小米,5:荣耀, 6:三星,7:金立, 8:魅族,9:乐视, 10:其他,11 : 苹 果
-     */
-    @Excel(name = "设备品牌 1: OPPO, 2: VIVO,3:华为, 4:小米,5:荣耀, 6:三星,7:金立, 8:魅族,9:乐视, 10:其他,11 : 苹 果", width = 15)
-    @ApiModelProperty(value = "设备品牌 1: OPPO, 2: VIVO,3:华为, 4:小米,5:荣耀, 6:三星,7:金立, 8:魅族,9:乐视, 10:其他,11 : 苹 果")
-    private Object deviceBrand;
-    /**
-     * 设备价格 1: 1500 元以下,2: 1501~2000,3: 2001~2500,4: 2501~3000,5: 3001~3500,6: 3501~4000,7: 4001~4500,8: 4501~5000,9: 5001~5500,10: 5500 元以上
-     */
-    @Excel(name = "设备价格 1: 1500 元以下,2: 1501~2000,3: 2001~2500,4: 2501~3000,5: 3001~3500,6: 3501~4000,7: 4001~4500,8: 4501~5000,9: 5001~5500,10: 5500 元以上", width = 15)
-    @ApiModelProperty(value = "设备价格 1: 1500 元以下,2: 1501~2000,3: 2001~2500,4: 2501~3000,5: 3001~3500,6: 3501~4000,7: 4001~4500,8: 4501~5000,9: 5001~5500,10: 5500 元以上")
-    private Object devicePrice;
-    /**
-     * 创建时间
-     */
-    @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 - 109
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouImage.java

@@ -1,109 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.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;
-
-/**
- * @Description: 快手-本地图片保存
- * @Author: jeecg-boot
- * @Date: 2019-08-14
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_kuaishou_image")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_kuaishou_image对象", description = "快手-本地图片保存")
-public class KuaiShouImage {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-
-    /**
-     * 图片保存本地地址
-     */
-    @Excel(name = "accountId", width = 15)
-    @ApiModelProperty(value = "accountId")
-    private Long accountId;
-
-    /**
-     * 图片保存本地地址
-     */
-    @Excel(name = "图片保存本地地址", width = 15)
-    @ApiModelProperty(value = "图片保存本地地址")
-    private Object localUrl;
-    /**
-     * videoName
-     */
-    @Excel(name = "imageName", width = 15)
-    @ApiModelProperty(value = "imageName")
-    private String imageName;
-    /**
-     * 视频类别
-     */
-    @Excel(name = "视频类别", width = 15)
-    @ApiModelProperty(value = "视频类别")
-    private String imageType;
-    /**
-     * 登录人id
-     */
-    @Excel(name = "登录人id", width = 15)
-    @ApiModelProperty(value = "登录人id")
-    private String loginId;
-    /**
-     * 图片类型 1-竖版图片 2-横版图片
-     */
-    @Excel(name = "图片类型 1-竖版图片 2-横版图片", width = 15)
-    @ApiModelProperty(value = "图片类型 1-竖版图片 2-横版图片")
-    private String materialType;
-
-    /**
-     * 图片类型 1-普通 2-后贴片
-     */
-    @Excel(name = "素材类型 1-普通 2-后贴片", width = 15)
-    @ApiModelProperty(value = "图片类型 1-竖版图片 2-横版图片")
-    private String positionType;
-    /**
-     * 创建时间
-     */
-    @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;
-    /**
-     * createBy
-     */
-    @Excel(name = "createBy", width = 15)
-    @ApiModelProperty(value = "createBy")
-    private String createBy;
-    /**
-     * updateBy
-     */
-    @Excel(name = "updateBy", width = 15)
-    @ApiModelProperty(value = "updateBy")
-    private String updateBy;
-}

+ 0 - 106
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouImageUploand.java

@@ -1,106 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.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;
-
-/**
- * @Description: 快手-上传图片接口
- * @Author: jeecg-boot
- * @Date: 2019-07-26
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_kuaishou_image_uploand")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_kuaishou_image_uploand对象", description = "快手-上传图片接口")
-public class KuaiShouImageUploand {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 账户ID
-     */
-    @Excel(name = "账户ID", width = 15)
-    @ApiModelProperty(value = "账户ID")
-    private Long accountId;
-    /**
-     * 本地存储地址
-     */
-    @Excel(name = "本地存储地址", width = 15)
-    @ApiModelProperty(value = "本地存储地址")
-    private Object savaPath;
-    /**
-     * 图片预览地址
-     */
-    @Excel(name = "图片预览地址", width = 15)
-    @ApiModelProperty(value = "图片预览地址")
-    private Object url;
-    /**
-     * 宽
-     */
-    @Excel(name = "宽", width = 15)
-    @ApiModelProperty(value = "宽")
-    private Long width;
-    /**
-     * 高
-     */
-    @Excel(name = "高", width = 15)
-    @ApiModelProperty(value = "高")
-    private Long height;
-    /**
-     * 图片大小
-     */
-    @Excel(name = "图片大小", width = 15)
-    @ApiModelProperty(value = "图片大小")
-    private Long size;
-    /**
-     * 图片格式
-     */
-    @Excel(name = "图片格式", width = 15)
-    @ApiModelProperty(value = "图片格式")
-    private String format;
-    /**
-     * 图片 token
-     */
-    @Excel(name = "图片 token", width = 15)
-    @ApiModelProperty(value = "图片 token")
-    private Object imageToken;
-    /**
-     * 文件上传时间
-     */
-    @Excel(name = "文件上传时间", width = 15)
-    @ApiModelProperty(value = "文件上传时间")
-    private String uploadTime;
-    /**
-     * 创建时间
-     */
-    @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 - 121
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouVideo.java

@@ -1,121 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.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;
-
-/**
- * @Description: 快手-本地图片保存
- * @Author: jeecg-boot
- * @Date: 2019-08-14
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_kuaishou_video")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_kuaishou_video对象", description = "快手-本地图片保存")
-public class KuaiShouVideo {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-
-
-    /**
-     * accountId
-     */
-    @Excel(name = "accountId", width = 15)
-    @ApiModelProperty(value = "accountId")
-    private Long accountId;
-
-
-    @Excel(name = "status", width = 15)
-    @ApiModelProperty(value = "status")
-    private Integer status;
-
-    /**
-     * 视频保存本地地址
-     */
-    @Excel(name = "视频保存本地地址", width = 15)
-    @ApiModelProperty(value = "视频保存本地地址")
-    private Object localUrl;
-    /**
-     * 视频描述
-     */
-    @Excel(name = "视频描述", width = 15)
-    @ApiModelProperty(value = "视频描述")
-    private Object videoDesc;
-    /**
-     * videoName
-     */
-    @Excel(name = "videoName", width = 15)
-    @ApiModelProperty(value = "videoName")
-    private String videoName;
-    /**
-     * 视频类别
-     */
-    @Excel(name = "视频类别", width = 15)
-    @ApiModelProperty(value = "视频类别")
-    private String videoType;
-    /**
-     * 登录人id
-     */
-    @Excel(name = "登录人id", width = 15)
-    @ApiModelProperty(value = "登录人id")
-    private String loginId;
-    /**
-     * 视频类型 1-竖版视频 2-横版视频
-     */
-    @Excel(name = "视频类型 1-竖版视频 2-横版视频", width = 15)
-    @ApiModelProperty(value = "视频类型 1-竖版视频 2-横版视频")
-    private String materialType;
-
-    /**
-     * 视频类型 1-竖版视频 2-横版视频
-     */
-    @Excel(name = "素材类型 1-普通 2-后贴片", width = 15)
-    @ApiModelProperty(value = "视频类型 1-竖版视频 2-横版视频")
-    private String positionType;
-    /**
-     * 创建时间
-     */
-    @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;
-    /**
-     * createBy
-     */
-    @Excel(name = "createBy", width = 15)
-    @ApiModelProperty(value = "createBy")
-    private String createBy;
-    /**
-     * updateBy
-     */
-    @Excel(name = "updateBy", width = 15)
-    @ApiModelProperty(value = "updateBy")
-    private String updateBy;
-}

+ 0 - 97
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouVideoUpload.java

@@ -1,97 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.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;
-
-/**
- * @Description: 快手-视频上传
- * @Author: jeecg-boot
- * @Date: 2019-07-26
- * @Version: V1.0
- */
-@Data
-@TableName("ctop_kuaishou_video_upload")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_kuaishou_video_upload对象", description = "快手-视频上传")
-public class KuaiShouVideoUpload {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 账户ID
-     */
-    @Excel(name = "账户ID", width = 15)
-    @ApiModelProperty(value = "账户ID")
-    private Long accountId;
-    /**
-     * 视频id
-     */
-    @Excel(name = "视频id", width = 15)
-    @ApiModelProperty(value = "视频id")
-    private String photoId;
-    /**
-     * 本地保存地址
-     */
-    @Excel(name = "本地保存地址", width = 15)
-    @ApiModelProperty(value = "本地保存地址")
-    private Object savaPath;
-
-    /**
-     * 本地保存地址
-     */
-    @Excel(name = "md5", width = 15)
-    @ApiModelProperty(value = "md5")
-    private Object signature;
-
-
-    /**
-     * 视频大小
-     */
-    @Excel(name = "视频大小", width = 15)
-    @ApiModelProperty(value = "视频大小")
-    private String size;
-    /**
-     * 视频类型
-     */
-    @Excel(name = "视频类型", width = 15)
-    @ApiModelProperty(value = "视频类型")
-    private String type;
-    /**
-     * 视频上传时间
-     */
-    @Excel(name = "视频上传时间", width = 15)
-    @ApiModelProperty(value = "视频上传时间")
-    private String uploadTime;
-    /**
-     * 创建时间
-     */
-    @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 - 14
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouAppCreateMapper.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.mapper;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppCreate;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 创建应用
- * @Author: jeecg-boot
- * @Date: 2019-07-26
- * @Version: V1.0
- */
-public interface KuaiShouAppCreateMapper extends BaseMapper<KuaiShouAppCreate> {
-
-}

+ 0 - 14
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouCampaignCreateMapper.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.mapper;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignCreate;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 快手-创建广告计划
- * @Author: jeecg-boot
- * @Date: 2019-07-23
- * @Version: V1.0
- */
-public interface KuaiShouCampaignCreateMapper extends BaseMapper<KuaiShouCampaignCreate> {
-
-}

+ 0 - 14
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouCreateAppTemplateMapper.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.mapper;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreateAppTemplate;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 创建应用
- * @Author: jeecg-boot
- * @Date: 2019-08-06
- * @Version: V1.0
- */
-public interface KuaiShouCreateAppTemplateMapper extends BaseMapper<KuaiShouCreateAppTemplate> {
-
-}

+ 0 - 14
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouCreativeCreateMapper.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.mapper;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreativeCreate;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 快手-创建创意信息
- * @Author: jeecg-boot
- * @Date: 2019-07-24
- * @Version: V1.0
- */
-public interface KuaiShouCreativeCreateMapper extends BaseMapper<KuaiShouCreativeCreate> {
-
-}

+ 0 - 14
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouGroupCreateLogMapper.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.mapper;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 快手-批量创建广告组
- * @Author: jeecg-boot
- * @Date: 2019-08-09
- * @Version: V1.0
- */
-public interface KuaiShouGroupCreateLogMapper extends BaseMapper<KuaiShouGroupCreateLog> {
-
-}

+ 0 - 14
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouGroupCreateTargetMapper.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.mapper;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateTarget;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 快手-创建广告组定向信息
- * @Author: jeecg-boot
- * @Date: 2019-07-24
- * @Version: V1.0
- */
-public interface KuaiShouGroupCreateTargetMapper extends BaseMapper<KuaiShouGroupCreateTarget> {
-
-}

+ 0 - 14
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouImageMapper.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.mapper;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 快手-本地图片保存
- * @Author: jeecg-boot
- * @Date: 2019-08-14
- * @Version: V1.0
- */
-public interface KuaiShouImageMapper extends BaseMapper<KuaiShouImage> {
-
-}

+ 0 - 14
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouImageUploandMapper.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.mapper;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageUploand;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 快手-上传图片接口
- * @Author: jeecg-boot
- * @Date: 2019-07-26
- * @Version: V1.0
- */
-public interface KuaiShouImageUploandMapper extends BaseMapper<KuaiShouImageUploand> {
-
-}

+ 0 - 14
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouVideoMapper.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.mapper;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 快手-本地图片保存
- * @Author: jeecg-boot
- * @Date: 2019-08-14
- * @Version: V1.0
- */
-public interface KuaiShouVideoMapper extends BaseMapper<KuaiShouVideo> {
-
-}

+ 0 - 14
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouVideoUploadMapper.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.mapper;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoUpload;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 快手-视频上传
- * @Author: jeecg-boot
- * @Date: 2019-07-26
- * @Version: V1.0
- */
-public interface KuaiShouVideoUploadMapper extends BaseMapper<KuaiShouVideoUpload> {
-
-}

+ 0 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouAppCreateMapper.xml

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

+ 0 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouCampaignCreateMapper.xml

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

+ 0 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouCreateAppTemplateMapper.xml

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

+ 0 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouCreativeCreateMapper.xml

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

+ 0 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouGroupCreateLogMapper.xml

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

+ 0 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouGroupCreateTargetMapper.xml

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

+ 0 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouImageMapper.xml

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

+ 0 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouImageUploandMapper.xml

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

+ 0 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouVideoMapper.xml

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

+ 0 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouVideoUploadMapper.xml

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

+ 0 - 14
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouAppCreateService.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppCreate;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 创建应用
- * @Author: jeecg-boot
- * @Date: 2019-07-26
- * @Version: V1.0
- */
-public interface IKuaiShouAppCreateService extends IService<KuaiShouAppCreate> {
-
-}

+ 0 - 16
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouCampaignCreateService.java

@@ -1,16 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignCreate;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 快手-创建广告计划
- * @Author: jeecg-boot
- * @Date: 2019-07-23
- * @Version: V1.0
- */
-public interface IKuaiShouCampaignCreateService extends IService<KuaiShouCampaignCreate> {
-
-    KuaiShouCampaignCreate selectCampaignByCampaignId(String campaignId);
-
-}

+ 0 - 17
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouCreateAppTemplateService.java

@@ -1,17 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreateAppTemplate;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Map;
-
-/**
- * @Description: 创建应用
- * @Author: jeecg-boot
- * @Date: 2019-08-06
- * @Version: V1.0
- */
-public interface IKuaiShouCreateAppTemplateService extends IService<KuaiShouCreateAppTemplate> {
-
-    Map<String, Object> insert(KuaiShouCreateAppTemplate appTemplate);
-}

+ 0 - 17
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouCreateService.java

@@ -1,17 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateLog;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-
-import java.util.Map;
-
-public interface IKuaiShouCreateService {
-    Map<String, Object> createGroups(KuaiShouGroupCreateLog groupCreateTemplate);
-
-    JSONArray getOptions(String loginId, Long accountId);
-
-    JSONArray getChildren(String loginId, Long campaignId, Long accountId);
-
-    Map<String, Object> createCreative(JSONObject requestJson);
-}

+ 0 - 14
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouCreativeCreateService.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreativeCreate;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 快手-创建创意信息
- * @Author: jeecg-boot
- * @Date: 2019-07-24
- * @Version: V1.0
- */
-public interface IKuaiShouCreativeCreateService extends IService<KuaiShouCreativeCreate> {
-
-}

+ 0 - 17
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouGroupCreateLogService.java

@@ -1,17 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Map;
-
-/**
- * @Description: 快手-批量创建广告组
- * @Author: jeecg-boot
- * @Date: 2019-08-09
- * @Version: V1.0
- */
-public interface IKuaiShouGroupCreateLogService extends IService<KuaiShouGroupCreateLog> {
-
-    Map<String, Object> insert(KuaiShouGroupCreateLog groupCreateTemplate);
-}

+ 0 - 14
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouGroupCreateTargetService.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateTarget;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 快手-创建广告组定向信息
- * @Author: jeecg-boot
- * @Date: 2019-07-24
- * @Version: V1.0
- */
-public interface IKuaiShouGroupCreateTargetService extends IService<KuaiShouGroupCreateTarget> {
-
-}

+ 0 - 22
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouImageService.java

@@ -1,22 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImage;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 快手-本地图片保存
- * @Author: jeecg-boot
- * @Date: 2019-08-14
- * @Version: V1.0
- */
-public interface IKuaiShouImageService extends IService<KuaiShouImage> {
-
-    void insert(JSONObject requestJson) throws Exception;
-
-    String localInsert(JSONObject imageJson);
-
-    JSONArray selectImageList(QueryWrapper<KuaiShouImage> queryWrapper);
-}

+ 0 - 14
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouImageUploandService.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageUploand;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 快手-上传图片接口
- * @Author: jeecg-boot
- * @Date: 2019-07-26
- * @Version: V1.0
- */
-public interface IKuaiShouImageUploandService extends IService<KuaiShouImageUploand> {
-
-}

+ 0 - 18
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouVideoService.java

@@ -1,18 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideo;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 快手-本地图片保存
- * @Author: jeecg-boot
- * @Date: 2019-08-14
- * @Version: V1.0
- */
-public interface IKuaiShouVideoService extends IService<KuaiShouVideo> {
-
-    void insert(JSONObject requestJson) throws Exception;
-
-    String localInsert(JSONObject requestJson) throws Exception;
-}

+ 0 - 14
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouVideoUploadService.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoUpload;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 快手-视频上传
- * @Author: jeecg-boot
- * @Date: 2019-07-26
- * @Version: V1.0
- */
-public interface IKuaiShouVideoUploadService extends IService<KuaiShouVideoUpload> {
-
-}

+ 3 - 47
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaishouInterfaceService.java

@@ -20,6 +20,9 @@ import java.util.Map;
  */
 public interface IKuaishouInterfaceService {
 
+    KuaishouResultToken getAccessToken(String authCode, Integer agentType);
+
+
     /**
      * 计划日报
      *
@@ -158,15 +161,6 @@ public interface IKuaishouInterfaceService {
 
 
     /**
-     * 获取token
-     *
-     * @param authCode
-     * @return
-     */
-    KuaishouResultToken getAccessToken(String authCode, Integer agentType);
-
-
-    /**
      * 获取可选的深度转化类型
      *
      * @param advertiserId
@@ -202,14 +196,6 @@ public interface IKuaishouInterfaceService {
      */
     void getCreativeByCreativeId(String accessToken, Long advertiserId, Long creativeId);
 
-    /**
-     * 文件上传
-     *
-     * @param advertiserId
-     * @param accessToken
-     * @return
-     */
-    Map<String, Object> videoUpload(Long advertiserId, String accessToken, String videoUrl);
 
     /**
      * 获取视频
@@ -238,26 +224,6 @@ public interface IKuaishouInterfaceService {
 
 
     /**
-     * 图片上传
-     *
-     * @param advertiserId
-     * @param accessToken
-     * @return
-     */
-    Map<String, Object> imageUpload(Long advertiserId, String accessToken, String filePath, Integer type);
-
-
-    /**
-     * 创建应用
-     *
-     * @param advertiserId
-     * @param accessToken
-     * @return
-     */
-    Map<String, Object> appCreate(Long advertiserId, String accessToken, JSONObject requestJson);
-
-
-    /**
      * 获取应用列表
      *
      * @param advertiserId
@@ -278,16 +244,6 @@ public interface IKuaishouInterfaceService {
 
 
     /**
-     * 创建 url应用
-     *
-     * @param accountId
-     * @param accessToken
-     * @param apkJson
-     * @return
-     */
-    Map<String, Object> urlAppCreate(Long accountId, String accessToken, JSONObject apkJson);
-
-    /**
      * 快手 广告主信息
      *
      * @param accountId

+ 0 - 18
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouAppCreateServiceImpl.java

@@ -1,18 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service.impl;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppCreate;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouAppCreateMapper;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAppCreateService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: 创建应用
- * @Author: jeecg-boot
- * @Date: 2019-07-26
- * @Version: V1.0
- */
-@Service
-public class KuaiShouAppCreateServiceImpl extends ServiceImpl<KuaiShouAppCreateMapper, KuaiShouAppCreate> implements IKuaiShouAppCreateService {
-
-}

+ 0 - 32
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouCampaignCreateServiceImpl.java

@@ -1,32 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service.impl;
-
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignCreate;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouCampaignCreateMapper;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCampaignCreateService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: 快手-创建广告计划
- * @Author: jeecg-boot
- * @Date: 2019-07-23
- * @Version: V1.0
- */
-@Service
-public class KuaiShouCampaignCreateServiceImpl extends ServiceImpl<KuaiShouCampaignCreateMapper, KuaiShouCampaignCreate> implements IKuaiShouCampaignCreateService {
-    @Autowired
-    private KuaiShouCampaignCreateMapper campaignCreateMapper;
-
-    @Override
-    public KuaiShouCampaignCreate selectCampaignByCampaignId(String campaignId) {
-        QueryWrapper<KuaiShouCampaignCreate> wrapper = new QueryWrapper<>();
-        wrapper.eq("campaign_id", campaignId);
-        wrapper.orderByDesc("create_time");
-        wrapper.last("limit 1");
-        KuaiShouCampaignCreate campaignCreate = campaignCreateMapper.selectOne(wrapper);
-        return campaignCreate;
-    }
-}

+ 0 - 113
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouCreateAppTemplateServiceImpl.java

@@ -1,113 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service.impl;
-
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppList;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreateAppTemplate;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouAppListMapper;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouCreateAppTemplateMapper;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreateAppTemplateService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @Description: 创建应用
- * @Author: jeecg-boot
- * @Date: 2019-08-06
- * @Version: V1.0
- */
-@Service
-public class KuaiShouCreateAppTemplateServiceImpl extends ServiceImpl<KuaiShouCreateAppTemplateMapper, KuaiShouCreateAppTemplate> implements IKuaiShouCreateAppTemplateService {
-
-    @Autowired
-    private ICtopOauthTokenService oauthTokenService;
-    @Autowired
-    private IKuaishouInterfaceService interfaceService;
-
-    @Autowired
-    private KuaiShouAppListMapper appListMapper;
-
-    @Override
-    public Map<String, Object> insert(KuaiShouCreateAppTemplate appTemplate) {
-        Map<String, Object> resultMap = new HashMap<>();
-        try {
-            Long accountId = appTemplate.getAccountId();
-            CtopOauthToken cTopOauthToken = oauthTokenService.getOauthTokenByAccountId(String.valueOf(accountId));
-            if (Check.isNull(cTopOauthToken)) {
-                throw new Exception("未获取到token信息");
-            }
-            String accessToken = cTopOauthToken.getAccessToken();
-            String appVersion = appTemplate.getAppVersion();
-            QueryWrapper<KuaiShouAppList> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("app_version", appVersion);
-            queryWrapper.eq("account_id", accountId);
-            queryWrapper.orderByDesc("create_time");
-            queryWrapper.last("limit 1");
-            KuaiShouAppList kuaiShouAppList = appListMapper.selectOne(queryWrapper);
-            if (!Check.isNull(kuaiShouAppList)) {
-                resultMap.put("success", false);
-                resultMap.put("message", "应用标记重复");
-                resultMap.put("code", -1);
-            } else {
-                if (!Check.isNull(appTemplate.getFile())) {
-                    appTemplate.setFile(KuaishouInterfaceConstant.HTTPS_PREFIX + appTemplate.getFile());
-                }
-                if (!Check.isNull(appTemplate.getImageUrl())) {
-                    appTemplate.setImageUrl(KuaishouInterfaceConstant.HTTPS_PREFIX + appTemplate.getImageUrl());
-                }
-
-                JSONObject apkJson = new JSONObject();
-                String platform = appTemplate.getPlatform();
-                apkJson.put("app_name", appTemplate.getAppName());
-                apkJson.put("app_version", appTemplate.getAppVersion());
-                apkJson.put("platform", platform);
-                if (!Check.isNull(appTemplate.getPackageName())) {
-                    apkJson.put("package_name", appTemplate.getPackageName());
-                }
-                if (!Check.isNull(appTemplate.getImageUrl()) && ("1".equals(platform) || "2".equals(platform))) {
-                    Map<String, Object> imageMap = interfaceService.imageUpload(accountId, accessToken, (String) appTemplate.getImageUrl(), 1);
-                    if ((Integer) imageMap.get("code") != 0) {
-                        return imageMap;
-
-                    }
-                    apkJson.put("image_token", imageMap.get("imageToken"));
-                }
-                if ("1".equals(platform) && appTemplate.getUploadType() == 1) {
-                    apkJson.put("file", appTemplate.getFile());
-
-                    Map<String, Object> appMap = interfaceService.appCreate(accountId, accessToken, apkJson);
-                    if ((Integer) appMap.get("code") != 0) {
-                        return appMap;
-
-                    }
-
-                } else {
-                    apkJson.put("url", appTemplate.getUrl());
-                    Map<String, Object> appMap = interfaceService.urlAppCreate(accountId, accessToken, apkJson);
-                    if ((Integer) appMap.get("code") != 0) {
-                        return appMap;
-                    }
-                }
-                resultMap.put("success", true);
-                resultMap.put("message", "创建应用成功");
-                resultMap.put("code", 0);
-            }
-
-        } catch (Exception e) {
-            resultMap.put("success", false);
-            resultMap.put("message", "创建应用失败");
-            resultMap.put("code", -1);
-        }
-        return resultMap;
-
-    }
-}

+ 0 - 576
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouCreateServiceImpl.java

@@ -1,576 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service.impl;
-
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignCreate;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignTemplate;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreateAppTemplate;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateLog;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouCampaignCreateMapper;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouCampaignTemplateMapper;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouCreateAppTemplateMapper;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouGroupCreateLogMapper;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreateService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author yumeng
- * 2019年11月12日10:04:00
- */
-@Slf4j
-@Service
-public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
-    @Autowired
-    private KuaiShouCampaignTemplateMapper campaignTemplateMapper;
-    @Autowired
-    private IKuaishouInterfaceService kuaishouInterfaceService;
-    @Autowired
-    private KuaiShouCreateAppTemplateMapper createAppTemplateMapper;
-    @Autowired
-    private KuaiShouGroupCreateLogMapper groupCreateLogMapper;
-    @Autowired
-    private ICtopOauthTokenService oauthTokenService;
-    @Autowired
-    private KuaiShouCampaignCreateMapper campaignCreateMapper;
-    @Autowired
-    private IKuaiShouVideoService videoService;
-    @Autowired
-    private IKuaiShouImageService imageService;
-
-
-    @Override
-    public Map<String, Object> createGroups(KuaiShouGroupCreateLog groupCreateTemplate) {
-        Map<String, Object> returnMap = new HashMap<>();
-        try {
-            Integer createCount = groupCreateTemplate.getCreateCount();
-            if (Check.isNull(createCount) || createCount == 0) {
-                returnMap.put("code", -1);
-                returnMap.put("success", false);
-                returnMap.put("desc", "迭代次数不能为空或为0");
-                return returnMap;
-            }
-            Long accountId = groupCreateTemplate.getAccountId();
-            if (Check.isNull(accountId)) {
-                returnMap.put("code", -1);
-                returnMap.put("success", false);
-                returnMap.put("message", "请选择快手账号");
-                return returnMap;
-            }
-
-            CtopOauthToken ctopOauthToken = oauthTokenService.getOauthTokenByAccountId(String.valueOf(accountId));
-            if (Check.isNull(ctopOauthToken)) {
-                log.error("未获取到token信息,accountId:{}", accountId);
-                throw new Exception("未获取到token信息");
-            }
-            String accessToken = ctopOauthToken.getAccessToken();
-            // 广告计划模板id
-            Long campaignTemplateId = groupCreateTemplate.getCampaignTemplateId();
-            if (Check.isNull(campaignTemplateId)) {
-                returnMap.put("code", -1);
-                returnMap.put("success", false);
-                returnMap.put("message", "请选择广告计划模板");
-                return returnMap;
-            }
-
-            String redundancy = groupCreateTemplate.getRedundancy();
-            JSONObject redundancyJson = JSONObject.parseObject(redundancy);
-
-            // 广告计划信息
-            KuaiShouCampaignTemplate kuaiShouCampaignTemplate = campaignTemplateMapper.selectById(campaignTemplateId);
-            if (Check.isNull(kuaiShouCampaignTemplate)) {
-                log.error("查询广告计划为空:模板id:{}", campaignTemplateId);
-                throw new Exception("根据模板id查询创意模板信息为空");
-            }
-
-            QueryWrapper<KuaiShouCampaignCreate> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("account_id", accountId);
-            queryWrapper.eq("campaign_name", kuaiShouCampaignTemplate.getCampaignName());
-            queryWrapper.orderByDesc("create_time");
-            queryWrapper.last("limit 1");
-            KuaiShouCampaignCreate campaignCreate = campaignCreateMapper.selectOne(queryWrapper);
-            Long campaignId;
-            if (Check.isNull(campaignCreate) || Check.isNull(campaignCreate.getCampaignId())) {
-                JSONObject campaignJson = new JSONObject();
-                campaignJson.put("campaign_name", kuaiShouCampaignTemplate.getCampaignName());
-                campaignJson.put("type", kuaiShouCampaignTemplate.getType());
-                campaignJson.put("day_budget", kuaiShouCampaignTemplate.getDayBudget());
-                Map<String, Object> campaignMap = kuaishouInterfaceService.campaignCreate(accessToken, accountId, campaignJson);
-                Integer code = (Integer) campaignMap.get("code");
-                if (code != 0) {
-                    return campaignMap;
-                }
-                campaignId = (Long) campaignMap.get("campaign_id");
-            } else {
-                campaignId = campaignCreate.getCampaignId();
-            }
-
-            groupCreateTemplate.setCampaignId(campaignId);
-
-            JSONObject groupJson = new JSONObject();
-            // 计划类型
-            Integer type = kuaiShouCampaignTemplate.getType();
-            if (type == 3 || type == 4 || type == 5) {
-                if (type == 3) {
-                    groupJson.put("url_type", kuaiShouCampaignTemplate.getUrlType());
-                }
-                if (!Check.isNull(redundancyJson.getString("redirectUrl"))) {
-                    groupJson.put("url", redundancyJson.getString("redirectUrl"));
-                } else {
-                    groupJson.put("url", kuaiShouCampaignTemplate.getUrl());
-                }
-            }
-            // app推广
-            if (type == 2) {
-                KuaiShouCreateAppTemplate appTemplate;
-                // 是否重新选择应用进行创建
-                if (!Check.isNull(redundancyJson.getLong("appId"))) {
-                    appTemplate = createAppTemplateMapper.selectById(redundancyJson.getLong("appId"));
-                } else {
-                    appTemplate = createAppTemplateMapper.selectById(kuaiShouCampaignTemplate.getAppId());
-                }
-
-                if (Check.isNull(appTemplate)) {
-                    log.error("快手上传视频未获取到本地app信息,appId:{}", kuaiShouCampaignTemplate.getAppId());
-                    throw new Exception("快手上传视频未获取到本地app信息");
-                }
-                JSONObject apkJson = new JSONObject();
-                String platform = appTemplate.getPlatform();
-                apkJson.put("platform", platform);
-                apkJson.put("app_name", appTemplate.getAppName());
-                apkJson.put("app_version", appTemplate.getAppVersion());
-                if (!Check.isNull(appTemplate.getPackageName())) {
-                    apkJson.put("package_name", appTemplate.getPackageName());
-                }
-                if (!Check.isNull(appTemplate.getImageUrl()) && ("1".equals(platform) || "2".equals(platform))) {
-                    Map<String, Object> imageMap = kuaishouInterfaceService.imageUpload(accountId, accessToken, (String) appTemplate.getImageUrl(), 1);
-                    Integer imageCode = (Integer) imageMap.get("code");
-                    if (imageCode != 0) {
-                        return imageMap;
-                    }
-                    apkJson.put("image_token", imageMap.get("imageToken"));
-                }
-                Map<String, Object> apkMap;
-                if ("1".equals(platform) && appTemplate.getUploadType() == 1) {
-                    apkJson.put("file", appTemplate.getFile());
-                    apkMap = kuaishouInterfaceService.appCreate(accountId, accessToken, apkJson);
-                } else {
-                    apkJson.put("url", appTemplate.getUrl());
-                    apkMap = kuaishouInterfaceService.urlAppCreate(accountId, accessToken, apkJson);
-                }
-                if ((Integer) apkMap.get("code") != 0) {
-                    return apkMap;
-                }
-                groupJson.put("app_id", apkMap.get("appId"));
-            }
-
-            groupJson.put("bid_type", groupCreateTemplate.getBidType());
-            groupJson.put("campaign_id", campaignId);
-            if (!Check.isNull(groupCreateTemplate.getBid())) {
-                groupJson.put("bid", groupCreateTemplate.getBid());
-            }
-            if (!Check.isNull(groupCreateTemplate.getCpaBid())) {
-                groupJson.put("cpa_bid", groupCreateTemplate.getCpaBid());
-            }
-            if (!Check.isNull(groupCreateTemplate.getOcpxActionType())) {
-                groupJson.put("ocpx_action_type", groupCreateTemplate.getOcpxActionType());
-            }
-            if (!Check.isNull(groupCreateTemplate.getDeepConversionType())) {
-                groupJson.put("deep_conversion_type", groupCreateTemplate.getDeepConversionType());
-            }
-            if (!Check.isNull(groupCreateTemplate.getBeginTime())) {
-                groupJson.put("begin_time", groupCreateTemplate.getBeginTime());
-            }
-            if (!Check.isNull(groupCreateTemplate.getEndTime())) {
-                groupJson.put("end_time", groupCreateTemplate.getEndTime());
-            }
-            if (!Check.isNull(groupCreateTemplate.getScheduleTime())) {
-                groupJson.put("schedule_time", groupCreateTemplate.getScheduleTime());
-            }
-            if (!Check.isNull(groupCreateTemplate.getDayBudget())) {
-                groupJson.put("day_budget", groupCreateTemplate.getDayBudget());
-            }
-            if (!Check.isNull(groupCreateTemplate.getShowModel())) {
-                groupJson.put("show_mode", groupCreateTemplate.getShowModel());
-            }
-            if (!Check.isNull(groupCreateTemplate.getSpeed())) {
-                groupJson.put("speed", groupCreateTemplate.getSpeed());
-            }
-            if (!Check.isNull(groupCreateTemplate.getSceneId())) {
-                JSONArray sceneIds = new JSONArray();
-                sceneIds.add(groupCreateTemplate.getSceneId());
-                groupJson.put("scene_id", sceneIds);
-            }
-            if (!Check.isNull(groupCreateTemplate.getUnitType())) {
-                groupJson.put("unit_type", groupCreateTemplate.getUnitType());
-            }
-            if (!Check.isNull(groupCreateTemplate.getDeepConversionType())) {
-                groupJson.put("deep_conversion_type", groupCreateTemplate.getDeepConversionType());
-            }
-            if (!Check.isNull(groupCreateTemplate.getDeepConversionBid()) && groupCreateTemplate.getDeepConversionBid() > 0) {
-                groupJson.put("deep_conversion_bid", groupCreateTemplate.getDeepConversionBid());
-            }
-
-            JSONObject targetJson = new JSONObject();
-            Integer platformOs = redundancyJson.getInteger("platformOs");
-            if (!Check.isNull(platformOs)) {
-                targetJson.put("platform_os", platformOs);
-                if (platformOs == 1) {
-                    targetJson.put("android_osv", redundancyJson.getInteger("androidOsv"));
-                } else if (platformOs == 2) {
-                    targetJson.put("ios_osv", redundancyJson.getInteger("iosOsv"));
-                }
-            }
-
-            groupJson.put("target", targetJson);
-            String unitName = groupCreateTemplate.getUnitName();
-            for (int i = 0; i < createCount; i++) {
-                String name;
-                if (createCount > 1) {
-                    name = unitName + "_" + i;
-                } else {
-                    name = unitName;
-                }
-                groupJson.put("unit_name", name);
-                Map<String, Object> groupMap = kuaishouInterfaceService.adUnitCreate(accessToken, accountId, groupJson, 1);
-                if ((Integer) groupMap.get("code") != 0) {
-                    log.error("创建广告组失败,accountId:{},unitName:{}", accountId, unitName);
-                    return groupMap;
-                }
-                groupCreateTemplate.setUnitId((Long) groupMap.get("unitId"));
-                groupCreateTemplate.setUnitName(name);
-                int y = groupCreateLogMapper.insert(groupCreateTemplate);
-                if (y > 0) {
-                    log.info("创建广告组记录信息入库完成,accountId:{},unitName:{}", accountId, unitName);
-                }
-            }
-            returnMap.put("code", 0);
-            returnMap.put("success", true);
-            returnMap.put("message", "批量创建广告组成功");
-        } catch (Exception e) {
-            e.printStackTrace();
-            returnMap.put("code", -1);
-            returnMap.put("success", false);
-            returnMap.put("message", "批量创建广告组失败");
-        }
-        return returnMap;
-    }
-
-    /**
-     * 批量创建创意
-     *
-     * @param requestJson
-     * @return
-     */
-    @Override
-    public Map<String, Object> createCreative(JSONObject requestJson) {
-        Map<String, Object> returnMap = new HashMap<>();
-        try {
-            if (Check.isNull(requestJson)) {
-                log.error("创建创意入参为空");
-                returnMap.put("code", -1);
-                returnMap.put("success", false);
-                returnMap.put("message", "入参为空");
-                return returnMap;
-            }
-
-            JSONObject createJson = new JSONObject();
-            Long accountId = requestJson.getLong("accountId");
-            if (Check.isNull(accountId)) {
-                log.error("创建创意广告主id为空,accountId:{}", accountId);
-                returnMap.put("code", -1);
-                returnMap.put("success", false);
-                returnMap.put("message", "请选择快手账号");
-                return returnMap;
-            }
-
-            CtopOauthToken cTopOauthToken = oauthTokenService.getOauthTokenByAccountId(String.valueOf(accountId));
-            if (Check.isNull(cTopOauthToken)) {
-                log.error("未获取到token信息,accountId:{}", accountId);
-                throw new Exception("未获取到token信息");
-            }
-            String accessToken = cTopOauthToken.getAccessToken();
-            Long unitId = requestJson.getLong("unitId");
-            if (Check.isNull(unitId)) {
-                log.error("创建创意广告组为空,accountId:{}", accountId);
-                returnMap.put("code", -1);
-                returnMap.put("success", false);
-                returnMap.put("message", "请选择广告组");
-                return returnMap;
-            }
-            createJson.put("unit_id", unitId);
-
-            if (Check.isNull(requestJson.getString("description"))) {
-                log.error("请填写广告语,accountId:{}", accountId);
-                returnMap.put("code", -1);
-                returnMap.put("success", false);
-                returnMap.put("message", "请填写广告语");
-                return returnMap;
-            }
-
-            if (!Check.isNull(requestJson.getString("actionBarText"))) {
-                createJson.put("action_bar_text", requestJson.getString("actionBarText"));
-            }
-
-            // 1 竖版视频 2 横版视频 3 贴片图片
-            Integer creativeMaterialType = requestJson.getInteger("creativeMaterialType");
-            createJson.put("creative_material_type", creativeMaterialType);
-            createJson.put("description", requestJson.getString("description"));
-            String creativeName = requestJson.getString("creativeName");
-            Integer sceneId = requestJson.getInteger("sceneId");
-            // 普通 广告
-            if (sceneId == 2) {
-                JSONObject localVideoJson = new JSONObject();
-                localVideoJson.put("videoType", requestJson.getString("creativeMaterialType"));
-                localVideoJson.put("login_id", requestJson.getString("loginId"));
-                localVideoJson.put("videoUrl", requestJson.getString("videoUrl"));
-                localVideoJson.put("description", requestJson.getString("description"));
-                localVideoJson.put("positionType", requestJson.getString("positionType"));
-                localVideoJson.put("accountId", requestJson.getString("accountId"));
-                // 校验文件是否在本地有留存记录
-                String videoUrl = videoService.localInsert(localVideoJson);
-                if (Check.isNull(videoUrl)) {
-                    log.error("创建创意视频为空,accountId:{}", accountId);
-                    returnMap.put("code", -1);
-                    returnMap.put("success", false);
-                    returnMap.put("message", "请选择上传的视频");
-                    return returnMap;
-                }
-                // 上传视频到快手后台
-                Map<String, Object> videoMap = kuaishouInterfaceService.videoUpload(accountId, accessToken, videoUrl);
-                if ((Integer) videoMap.get("code") != 0) {
-                    log.error("上传视频失败,accountId:{}", accountId);
-                    return videoMap;
-                }
-                createJson.put("photo_id", videoMap.get("photoId"));
-                if (!Check.isNull(requestJson.getString("clickTrackUrl"))) {
-                    createJson.put("click_track_url", requestJson.getString("clickTrackUrl"));
-                }
-                JSONArray imageUrlArr = requestJson.getJSONArray("imageUrl");
-                if (Check.isNull(imageUrlArr)) {
-                    log.error("请选择封面图,accountId:{}", accountId);
-                    returnMap.put("code", -1);
-                    returnMap.put("success", false);
-                    returnMap.put("message", "请选择广告创意封面图");
-                    return returnMap;
-                }
-
-
-                for (int i = 0; i < imageUrlArr.size(); i++) {
-                    String imageUrl = imageUrlArr.get(i).toString();
-                    if (Check.isNull(imageUrl)) {
-                        continue;
-                    }
-                    JSONObject imageJson = new JSONObject();
-                    imageJson.put("loginId", requestJson.getString("loginId"));
-                    imageJson.put("videoUploadType", requestJson.getString("creativeMaterialType"));
-                    imageJson.put("url", imageUrl);
-                    imageJson.put("accountId", accountId);
-                    imageJson.put("positionType", requestJson.getString("positionType"));
-                    String imagePath = imageService.localInsert(imageJson);
-
-                    Map<String, Object> imageMap = kuaishouInterfaceService.imageUpload(accountId, accessToken, imagePath, 2);
-                    if ((Integer) imageMap.get("code") != 0) {
-                        return imageMap;
-                    }
-                    createJson.put("image_token", imageMap.get("imageToken"));
-                    if (imageUrlArr.size() == 1) {
-                        createJson.put("creative_name", creativeName);
-                    } else {
-                        createJson.put("creative_name", creativeName + "_" + i);
-                    }
-                    Map<String, Object> creativeMap = kuaishouInterfaceService.creativeCreate(accessToken, accountId, createJson, 1);
-                    if ((Integer) creativeMap.get("code") != 0) {
-                        return creativeMap;
-                    }
-                }
-
-            } else if (sceneId == 3) {
-                // 后贴片 广告
-                if (!Check.isNull(requestJson.getString("impressionUrl"))) {
-                    createJson.put("impression_url", requestJson.getString("impressionUrl"));
-                }
-
-                if (!Check.isNull(requestJson.getString("adPhotoPlayedT3sUrl"))) {
-                    createJson.put("ad_photo_played_t3s_url", requestJson.getString("adPhotoPlayedT3sUrl"));
-                }
-                if (creativeMaterialType != 3) {
-                    // 后贴片 视频集合
-                    JSONArray haveSinglePicVideoUrlArr = requestJson.getJSONArray("haveSinglePicVideoUrl");
-                    if (Check.isNull(haveSinglePicVideoUrlArr)) {
-                        returnMap.put("code", -1);
-                        returnMap.put("success", false);
-                        returnMap.put("message", "请选择视频素材进行上传素材");
-                        return returnMap;
-                    }
-
-                    for (int i = 0; i < haveSinglePicVideoUrlArr.size(); i++) {
-                        String haveSinglePicVideoUrl = haveSinglePicVideoUrlArr.get(i).toString();
-                        if (Check.isNull(haveSinglePicVideoUrl)) {
-                            continue;
-                        }
-                        JSONObject haveLocalVideoJson = new JSONObject();
-                        haveLocalVideoJson.put("positionType", requestJson.getString("positionType"));
-                        haveLocalVideoJson.put("videoUrl", haveSinglePicVideoUrl);
-                        haveLocalVideoJson.put("accountId", accountId);
-                        haveLocalVideoJson.put("description", requestJson.getString("description"));
-                        haveLocalVideoJson.put("login_id", requestJson.getString("loginId"));
-                        haveLocalVideoJson.put("videoType", requestJson.getString("creativeMaterialType"));
-                        // 校验文件是否在本地有留存记录
-                        String havaVideoUrl = videoService.localInsert(haveLocalVideoJson);
-                        if (Check.isNull(havaVideoUrl)) {
-                            log.error("创建创意视频为空,accountId:{}", accountId);
-                            returnMap.put("code", -1);
-                            returnMap.put("message", "请选择上传的视频");
-                            returnMap.put("success", false);
-                            return returnMap;
-                        }
-
-                        // 上传视频到快手后台
-                        Map<String, Object> videoMap = kuaishouInterfaceService.videoUpload(accountId, accessToken, havaVideoUrl);
-                        if ((Integer) videoMap.get("code") != 0) {
-                            log.error("后贴片素材上传视频失败,accountId:{}", accountId);
-                            return videoMap;
-                        }
-                        createJson.put("photo_id", videoMap.get("photoId"));
-
-                        if (haveSinglePicVideoUrlArr.size() == 1) {
-                            createJson.put("creative_name", creativeName);
-                        } else {
-                            createJson.put("creative_name", creativeName + "_" + i);
-                        }
-                        Map<String, Object> creativeMap = kuaishouInterfaceService.creativeCreate(accessToken, accountId, createJson, 1);
-                        if ((Integer) creativeMap.get("code") != 0) {
-                            log.error("后贴片视频素材批量创建创意失败,accountId:{},creativeName:{}", accountId, creativeName + "_" + i);
-                            return creativeMap;
-                        }
-                    }
-                } else {
-                    // 后贴片图片素材
-                    JSONArray haveSinglePicimagesListArr = requestJson.getJSONArray("haveSinglePicimagesList");
-                    if (Check.isNull(haveSinglePicimagesListArr)) {
-                        returnMap.put("code", -1);
-                        returnMap.put("success", false);
-                        returnMap.put("message", "请选择后贴片图片素材进行上传");
-                        return returnMap;
-                    }
-
-                    for (int i = 0; i < haveSinglePicimagesListArr.size(); i++) {
-                        String imageUrl = haveSinglePicimagesListArr.get(i).toString();
-                        if (Check.isNull(imageUrl)) {
-                            continue;
-                        }
-                        JSONObject imageJson = new JSONObject();
-                        imageJson.put("url", imageUrl);
-                        imageJson.put("accountId", accountId);
-                        imageJson.put("positionType", requestJson.getInteger("positionType"));
-                        imageJson.put("loginId", requestJson.getString("loginId"));
-                        imageJson.put("videoUploadType", requestJson.getString("singlePicTiepianType"));
-                        String imagePath = imageService.localInsert(imageJson);
-                        Map<String, Object> imageMap = kuaishouInterfaceService.imageUpload(accountId, accessToken, imagePath, 3);
-                        if ((Integer) imageMap.get("code") != 0) {
-                            log.error("上传后贴片单张图片素材失败,accountId:{}", accountId);
-                            return imageMap;
-                        }
-                        if (haveSinglePicimagesListArr.size() == 1) {
-                            createJson.put("creative_name", creativeName);
-                        } else {
-                            createJson.put("creative_name", creativeName + "_" + i);
-                        }
-                        JSONArray imageTokens = new JSONArray();
-                        imageTokens.add(imageMap.get("imageToken"));
-                        createJson.put("image_tokens", imageTokens);
-                        Map<String, Object> creativeMap = kuaishouInterfaceService.creativeCreate(accessToken, accountId, createJson, 1);
-                        if ((Integer) creativeMap.get("code") != 0) {
-                            log.error("后贴片素材单张图片批量创建创意失败,accountId:{}", accountId);
-                            return creativeMap;
-                        }
-                    }
-                }
-            }
-            returnMap.put("code", 0);
-            returnMap.put("success", true);
-            returnMap.put("message", "创建创意成功");
-        } catch (Exception e) {
-            returnMap.put("code", -1);
-            returnMap.put("success", false);
-            returnMap.put("message", "批量创建广告创意失败");
-            e.printStackTrace();
-        }
-        return returnMap;
-    }
-
-
-    /**
-     * 三级联动 查询账号 计划 模板信息
-     *
-     * @param loginId
-     * @return
-     */
-    @Override
-    public JSONArray getOptions(String loginId, Long accountId) {
-        JSONArray result = new JSONArray();
-        QueryWrapper<KuaiShouGroupCreateLog> wrapper = new QueryWrapper<>();
-        wrapper.eq("login_id", loginId).eq("account_id", accountId).orderByDesc("create_time");
-        wrapper.groupBy("campaign_id");
-        List<KuaiShouGroupCreateLog> accounts = groupCreateLogMapper.selectList(wrapper);
-        if (!Check.isNull(accounts)) {
-            for (KuaiShouGroupCreateLog groupCreateLog : accounts) {
-                JSONObject optionsJson = new JSONObject();
-                Long campaignId = groupCreateLog.getCampaignId();
-                optionsJson.put("value", campaignId);
-                QueryWrapper<KuaiShouCampaignCreate> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("account_id", accountId).eq("campaign_id", campaignId).orderByDesc("create_time");
-                queryWrapper.last("limit 1");
-                KuaiShouCampaignCreate campaignCreate = campaignCreateMapper.selectOne(queryWrapper);
-                if (Check.isNull(campaignCreate)) {
-                    continue;
-                }
-                optionsJson.put("label", campaignCreate.getCampaignName());
-                optionsJson.put("isLeaf", false);
-                result.add(optionsJson);
-            }
-        }
-        return result;
-    }
-
-    /**
-     * 获取组信息
-     *
-     * @param loginId
-     * @param campaignId
-     * @return
-     */
-    @Override
-    public JSONArray getChildren(String loginId, Long campaignId, Long accountId) {
-        JSONArray result = new JSONArray();
-        QueryWrapper<KuaiShouGroupCreateLog> wrapper = new QueryWrapper<>();
-        wrapper.eq("account_id", accountId);
-        wrapper.eq("campaign_id", campaignId);
-        wrapper.eq("login_id", loginId);
-        wrapper.orderByDesc("create_time");
-        wrapper.groupBy("unit_name");
-        List<KuaiShouGroupCreateLog> accounts = groupCreateLogMapper.selectList(wrapper);
-        if (!Check.isNull(accounts)) {
-            for (KuaiShouGroupCreateLog groupCreateLog : accounts) {
-                JSONObject optionsJson = new JSONObject();
-                optionsJson.put("value", groupCreateLog.getUnitId());
-                optionsJson.put("label", groupCreateLog.getUnitName());
-                result.add(optionsJson);
-            }
-        }
-        return result;
-    }
-}

+ 0 - 18
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouCreativeCreateServiceImpl.java

@@ -1,18 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service.impl;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreativeCreate;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouCreativeCreateMapper;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreativeCreateService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: 快手-创建创意信息
- * @Author: jeecg-boot
- * @Date: 2019-07-24
- * @Version: V1.0
- */
-@Service
-public class KuaiShouCreativeCreateServiceImpl extends ServiceImpl<KuaiShouCreativeCreateMapper, KuaiShouCreativeCreate> implements IKuaiShouCreativeCreateService {
-
-}

+ 0 - 41
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouGroupCreateLogServiceImpl.java

@@ -1,41 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service.impl;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateLog;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouGroupCreateLogMapper;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupCreateLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * @Description: 快手-批量创建广告组
- * @Author: jeecg-boot
- * @Date: 2019-08-09
- * @Version: V1.0
- */
-@Service
-public class KuaiShouGroupCreateLogServiceImpl extends ServiceImpl<KuaiShouGroupCreateLogMapper, KuaiShouGroupCreateLog> implements IKuaiShouGroupCreateLogService {
-
-    @Autowired
-    private KuaiShouGroupCreateLogMapper createLogMapper;
-
-    @Override
-    public Map<String, Object> insert(KuaiShouGroupCreateLog createLog) {
-        Map<String, Object> resultMap = new HashMap<>();
-        try {
-            createLogMapper.insert(createLog);
-            resultMap.put("success", true);
-            resultMap.put("message", "创建广告组成功");
-            resultMap.put("code", 0);
-        } catch (Exception e) {
-            resultMap.put("success", false);
-            resultMap.put("message", "创建广告组失败");
-            resultMap.put("code", -1);
-        }
-        return resultMap;
-    }
-}

+ 0 - 18
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouGroupCreateTargetServiceImpl.java

@@ -1,18 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service.impl;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateTarget;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouGroupCreateTargetMapper;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupCreateTargetService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: 快手-创建广告组定向信息
- * @Author: jeecg-boot
- * @Date: 2019-07-24
- * @Version: V1.0
- */
-@Service
-public class KuaiShouGroupCreateTargetServiceImpl extends ServiceImpl<KuaiShouGroupCreateTargetMapper, KuaiShouGroupCreateTarget> implements IKuaiShouGroupCreateTargetService {
-
-}

+ 0 - 151
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouImageServiceImpl.java

@@ -1,151 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service.impl;
-
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.utils.AesEncryptUtil;
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImage;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouImageMapper;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @Description: 快手-本地图片保存
- * @Author: jeecg-boot
- * @Date: 2019-08-14
- * @Version: V1.0
- */
-@Slf4j
-@Service
-public class KuaiShouImageServiceImpl extends ServiceImpl<KuaiShouImageMapper, KuaiShouImage> implements IKuaiShouImageService {
-
-    @Autowired
-    private KuaiShouImageMapper imageMapper;
-
-    @Autowired
-    private IKuaishouInterfaceService interfaceService;
-    @Autowired
-    private ICtopOauthTokenService oauthTokenService;
-
-    @Override
-    public void insert(JSONObject requestJson) throws Exception {
-        JSONArray imageArr = requestJson.getJSONArray("localImageUrl");
-        Long accountId = requestJson.getLong("accountId");
-        CtopOauthToken cTopOauthToken = oauthTokenService.getOauthTokenByAccountId(String.valueOf(accountId));
-        if (Check.isNull(cTopOauthToken)) {
-            throw new Exception("未获取到token信息");
-        }
-        String accessToken = cTopOauthToken.getAccessToken();
-        if (!Check.isNull(imageArr)) {
-            for (int i = 0; i < imageArr.size(); i++) {
-                KuaiShouImage image = new KuaiShouImage();
-                String imageUrl = imageArr.get(i).toString();
-                String fileName = imageUrl.substring(imageUrl.lastIndexOf("/") + 1);
-                String fileNameStr = null;
-                if (!Check.isNull(fileName)) {
-                    String[] split = fileName.split("-");
-                    fileNameStr = split[0];
-                }
-                image.setImageName(AesEncryptUtil.getUrlDecoderString(fileNameStr));
-                image.setLoginId(requestJson.getString("loginId"));
-                image.setMaterialType(requestJson.getString("materialType"));
-                image.setPositionType(requestJson.getString("positionType"));
-                image.setAccountId(accountId);
-                String imageUrlStr;
-                if (!imageUrl.contains(KuaishouInterfaceConstant.HTTPS_PREFIX)) {
-                    imageUrlStr = KuaishouInterfaceConstant.HTTPS_PREFIX + imageUrl;
-                } else {
-                    imageUrlStr = imageUrl;
-                }
-                image.setLocalUrl(imageUrlStr);
-                imageMapper.insert(image);
-
-                Thread thread = new Thread() {
-                    @Override
-                    public void run() {
-                        log.info("快手开始上传图片,accountId:{}", accountId);
-                        interfaceService.imageUpload(accountId, accessToken, imageUrlStr, 0);
-                    }
-                };
-                thread.start();
-            }
-        }
-
-    }
-
-    @Override
-    public String localInsert(JSONObject imageJson) {
-        String url = imageJson.getString("url");
-        String positionType = imageJson.getString("positionType");
-        String videoUploadType = imageJson.getString("videoUploadType");
-        String loginId = imageJson.getString("loginId");
-        Long accountId = imageJson.getLong("accountId");
-
-        QueryWrapper<KuaiShouImage> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("local_url", url);
-        queryWrapper.eq("account_id", accountId);
-        queryWrapper.eq("position_type", positionType);
-        queryWrapper.eq("material_type", videoUploadType);
-        queryWrapper.eq("login_id", loginId);
-        queryWrapper.orderByDesc("create_time");
-        queryWrapper.last("limit 1");
-        KuaiShouImage imageLocal = imageMapper.selectOne(queryWrapper);
-        if (Check.isNull(imageLocal)) {
-            KuaiShouImage image = new KuaiShouImage();
-            String fileName = url.substring(url.lastIndexOf("/") + 1);
-            String fileNameStr = null;
-            if (!Check.isNull(fileName)) {
-                String[] split = fileName.split("-");
-                fileNameStr = split[0];
-            }
-            image.setLoginId(loginId);
-            image.setImageName(AesEncryptUtil.getUrlDecoderString(fileNameStr));
-            image.setMaterialType(videoUploadType);
-            image.setPositionType(positionType);
-            if (!url.contains("https:")) {
-                String imageUrl = KuaishouInterfaceConstant.HTTPS_PREFIX + url;
-                image.setLocalUrl(imageUrl);
-            } else {
-                image.setLocalUrl(url);
-            }
-            image.setAccountId(accountId);
-
-            imageMapper.insert(image);
-            return image.getLocalUrl().toString();
-        }
-
-        return url;
-    }
-
-    @Override
-    public JSONArray selectImageList(QueryWrapper<KuaiShouImage> queryWrapper) {
-        List<KuaiShouImage> kuaiShouImages = imageMapper.selectList(queryWrapper);
-        JSONArray jsonArray = new JSONArray();
-        if (!Check.isNull(kuaiShouImages)) {
-            for (KuaiShouImage image : kuaiShouImages) {
-                if (!Check.isNull(image)) {
-                    JSONObject json = new JSONObject();
-                    json.put("id", image.getId());
-                    json.put("src", image.getLocalUrl());
-                    json.put("msrc", image.getLocalUrl());
-                    json.put("w", 600);
-                    json.put("h", 400);
-                    json.put("name", image.getImageName());
-                    jsonArray.add(json);
-                }
-            }
-        }
-
-        return jsonArray;
-    }
-}

+ 0 - 18
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouImageUploandServiceImpl.java

@@ -1,18 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service.impl;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageUploand;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouImageUploandMapper;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageUploandService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: 快手-上传图片接口
- * @Author: jeecg-boot
- * @Date: 2019-07-26
- * @Version: V1.0
- */
-@Service
-public class KuaiShouImageUploandServiceImpl extends ServiceImpl<KuaiShouImageUploandMapper, KuaiShouImageUploand> implements IKuaiShouImageUploandService {
-
-}

+ 1 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouMaterialUploadServiceImpl.java

@@ -8,7 +8,6 @@ import cn.com.ctop.common.module.utils.PropertiesUtils;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageGetService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouMaterialUploadService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoGetService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
@@ -40,8 +39,6 @@ public class KuaiShouMaterialUploadServiceImpl implements IKuaiShouMaterialUploa
     @Autowired
     private IKuaiShouImageGetService iKuaiShouImageGetService;
     @Autowired
-    private IKuaiShouVideoGetService kuaiShouVideoGetService;
-    @Autowired
     private IKuaishouInterfaceService kuaishouInterfaceService;
 
     /**
@@ -80,7 +77,7 @@ public class KuaiShouMaterialUploadServiceImpl implements IKuaiShouMaterialUploa
                         returnJson.put("signature", signature);
                         returnJson.put("message", "上传成功");
                         try {
-                            Thread.sleep(1 * 1000L);
+                            Thread.sleep(1 * 500L);
                             kuaishouInterfaceService.getVideoInfo(accessToken, accountId, photoId);
                         } catch (InterruptedException e) {
                             e.printStackTrace();
@@ -166,7 +163,6 @@ public class KuaiShouMaterialUploadServiceImpl implements IKuaiShouMaterialUploa
         } catch (Exception e) {
             e.printStackTrace();
             return null;
-
         }
 
         return null;

+ 0 - 129
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouVideoServiceImpl.java

@@ -1,129 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service.impl;
-
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.utils.AesEncryptUtil;
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideo;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouVideoMapper;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: 快手-本地图片保存
- * @Author: jeecg-boot
- * @Date: 2019-08-14
- * @Version: V1.0
- */
-@Slf4j
-@Service
-public class KuaiShouVideoServiceImpl extends ServiceImpl<KuaiShouVideoMapper, KuaiShouVideo> implements IKuaiShouVideoService {
-    @Autowired
-    private KuaiShouVideoMapper kuaiShouVideoMapper;
-    @Autowired
-    private IKuaishouInterfaceService interfaceService;
-    @Autowired
-    private ICtopOauthTokenService oauthTokenService;
-
-    @Override
-    public void insert(JSONObject requestJson) throws Exception {
-        if (Check.isNull(requestJson)) {
-            throw new Exception("传递参数不能为空");
-        }
-        Long accountId = requestJson.getLong("accountId");
-        CtopOauthToken cTopOauthToken = oauthTokenService.getOauthTokenByAccountId(String.valueOf(accountId));
-        if (Check.isNull(cTopOauthToken)) {
-            throw new Exception("未获取到token信息");
-        }
-        String accessToken = cTopOauthToken.getAccessToken();
-        JSONArray localArr = requestJson.getJSONArray("localUrl");
-        if (!Check.isNull(localArr)) {
-            for (int i = 0; i < localArr.size(); i++) {
-                KuaiShouVideo video = new KuaiShouVideo();
-                video.setVideoDesc(requestJson.getString("videoDesc"));
-                String url = localArr.get(i).toString();
-                String fileName = url.substring(url.lastIndexOf("/") + 1);
-                String fileNameStr = null;
-                if (!Check.isNull(fileName)) {
-                    String[] split = fileName.split("-");
-                    fileNameStr = split[0];
-                }
-                video.setLoginId(requestJson.getString("loginId"));
-                video.setAccountId(accountId);
-                video.setVideoName(AesEncryptUtil.getUrlDecoderString(fileNameStr));
-                String urlStr;
-                if (!url.contains(KuaishouInterfaceConstant.HTTPS_PREFIX)) {
-                    urlStr = KuaishouInterfaceConstant.HTTPS_PREFIX + url;
-                } else {
-                    urlStr = url;
-                }
-                video.setLocalUrl(urlStr);
-                video.setMaterialType(requestJson.getString("materialType"));
-                video.setPositionType(requestJson.getString("positionType"));
-                kuaiShouVideoMapper.insert(video);
-                // 多线程上传文件
-                Thread thread = new Thread() {
-                    @Override
-                    public void run() {
-                        log.info("快手开始上传视频,accountId:{}", accountId);
-                        interfaceService.videoUpload(accountId, accessToken, urlStr);
-                    }
-                };
-                thread.start();
-            }
-        }
-
-    }
-
-    @Override
-    public String localInsert(JSONObject requestJson) throws Exception {
-        String loginId = requestJson.getString("login_id");
-        String videoUrl = requestJson.getString("videoUrl");
-        Long accountId = requestJson.getLong("accountId");
-        QueryWrapper<KuaiShouVideo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("login_id", loginId);
-        queryWrapper.eq("local_url", videoUrl);
-        queryWrapper.eq("account_id", accountId);
-        queryWrapper.orderByDesc("create_time");
-        queryWrapper.last("limit 1");
-        KuaiShouVideo localVideo = kuaiShouVideoMapper.selectOne(queryWrapper);
-        if (Check.isNull(localVideo)) {
-            if (!Check.isNull(videoUrl)) {
-                KuaiShouVideo video = new KuaiShouVideo();
-                video.setVideoDesc(requestJson.getString("description"));
-                String fileName = videoUrl.substring(videoUrl.lastIndexOf("/") + 1);
-                String fileNameStr = null;
-                if (!Check.isNull(fileName)) {
-                    String[] split = fileName.split("-");
-                    fileNameStr = split[0];
-                }
-
-                if (!videoUrl.contains(KuaishouInterfaceConstant.HTTPS_PREFIX)) {
-                    String url = KuaishouInterfaceConstant.HTTPS_PREFIX + videoUrl;
-                    video.setLocalUrl(url);
-                } else {
-                    video.setLocalUrl(videoUrl);
-                }
-
-                video.setLoginId(loginId);
-                video.setMaterialType(requestJson.getString("videoType"));
-                video.setAccountId(accountId);
-                video.setPositionType(requestJson.getString("positionType"));
-                video.setVideoName(AesEncryptUtil.getUrlDecoderString(fileNameStr));
-                kuaiShouVideoMapper.insert(video);
-                return video.getLocalUrl().toString();
-            }
-        }
-
-        return videoUrl;
-    }
-
-}

+ 0 - 18
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouVideoUploadServiceImpl.java

@@ -1,18 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.service.impl;
-
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoUpload;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouVideoUploadMapper;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoUploadService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: 快手-视频上传
- * @Author: jeecg-boot
- * @Date: 2019-07-26
- * @Version: V1.0
- */
-@Service
-public class KuaiShouVideoUploadServiceImpl extends ServiceImpl<KuaiShouVideoUploadMapper, KuaiShouVideoUpload> implements IKuaiShouVideoUploadService {
-
-}

+ 1 - 392
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -1,10 +1,8 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.enums.MaterialEnum;
-import cn.com.ctop.common.module.mapper.MaterialInfoMapper;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.*;
 import cn.com.ctop.kuaishou.modules.batch.entity.*;
@@ -73,18 +71,10 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
     @Autowired
     private KuaiShouConversionTypesMapper conversionTypesMapper;
     @Autowired
-    private KuaiShouVideoUploadMapper videoUploadMapper;
-    @Autowired
-    private KuaiShouVideoMapper kuaiShouVideoMapper;
-    @Autowired
     private KuaiShouRegionListChildrenMapper regionListChildrenMapper;
     @Autowired
     private KuaiShouRegionListParentMapper regionListParentMapper;
     @Autowired
-    private KuaiShouImageUploandMapper imageUploandMapper;
-    @Autowired
-    private KuaiShouAppCreateMapper appCreateMapper;
-    @Autowired
     private KuaiShouAppListMapper appListMapper;
     @Autowired
     private IKuaishouReportHourlyAccountService hourlyAccountService;
@@ -93,8 +83,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
     @Autowired
     private IKuaiShouImageGetService iKuaiShouImageGetService;
     @Autowired
-    private MaterialInfoMapper materialInfoMapper;
-    @Autowired
     private KuaiShouTargetingTagsMapper targetingTagsMapper;
     @Autowired
     private KuaishouReportDailyAccountMapper dailyAccountMapper;
@@ -103,11 +91,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
     @Autowired
     private IKuaishouReportDailyCampaignService dailyCampaignService;
     @Autowired
-    private IKuaishouReportDailyGroupService dailyGroupService;
-
-    @Autowired
     private KuaishouReportDailyGroupMapper dailyGroupMapper;
-
     @Autowired
     private IKuaishouReportHourlyGroupService hourlyGroupService;
     @Autowired
@@ -1803,10 +1787,8 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             requestJson.put("secret", PropertiesUtils.getConfig("kuaishou_third_secret"));
         }
 
-
         Map<String, String> headers = new HashMap<>();
         headers.put("Content-Type", " application/json");
-
         KuaishouResultToken kuaiShouResult = null;
         try {
             String result = HttpUtils.kuaiShouhttpPostRequest(url, requestJson.toJSONString(), headers);
@@ -2120,114 +2102,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
     }
 
 
-    @Override
-    public Map<String, Object> videoUpload(Long advertiserId, String accessToken, String videoUrl) {
-        Map<String, Object> returnMap = new HashMap<>();
-        try {
-            QueryWrapper<KuaiShouVideoUpload> wrapper = new QueryWrapper<>();
-            wrapper.eq("account_id", advertiserId).eq("sava_path", videoUrl).orderByDesc("create_time");
-            wrapper.last("limit 1");
-            KuaiShouVideoUpload videoUpload = videoUploadMapper.selectOne(wrapper);
-            if (!Check.isNull(videoUpload)) {
-                returnMap.put("code", 0);
-                returnMap.put("message", "视频已上传文件");
-                returnMap.put("success", true);
-                returnMap.put("photoId", videoUpload.getPhotoId());
-                return returnMap;
-            }
-            String localUrl = LoadFileUtil.downLoadFromUrl(videoUrl, PropertiesUtils.getValue("kuaishou_config", "video_sava_path"));
-            if (Check.isNull(localUrl)) {
-                log.error("下载文件到本地文件夹失败,filePath:{},accountId:{}", videoUrl, advertiserId);
-                throw new Exception("下载文件到本地失败");
-            }
-
-            QueryWrapper<MaterialInfo> materialInfoQueryWrapper = new QueryWrapper<>();
-            materialInfoQueryWrapper.eq("url", videoUrl);
-            materialInfoQueryWrapper.eq("status", 1);
-            materialInfoQueryWrapper.orderByDesc("create_time");
-            materialInfoQueryWrapper.last("limit 1");
-            MaterialInfo materialInfo = materialInfoMapper.selectOne(materialInfoQueryWrapper);
-            String signature;
-            if (Check.isNull(materialInfo) || Check.isNull(materialInfo.getCode())) {
-                signature = LoadFileUtil.getMD5(localUrl);
-            } else {
-                signature = materialInfo.getCode();
-            }
-            Long startTime = System.currentTimeMillis();
-            String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.VIDEO_UPLOAD;
-            JSONObject requestJson = new JSONObject();
-            requestJson.put("advertiser_id", advertiserId);
-            requestJson.put("signature", signature);
-            Map<String, String> headerMap = new HashMap<>();
-            headerMap.put("Access-Token", accessToken);
-            headerMap.put("Content-Type", "multipart/form-data");
-            String result = exceptInfoForRestTemplate(url, requestJson, headerMap, localUrl);
-            JSONObject resultJson = JSONObject.parseObject(result);
-            if (!Check.isNull(result)) {
-                Integer code = resultJson.getInteger("code");
-                if (code == 0) {
-                    JSONObject dataJson = resultJson.getJSONObject("data");
-                    if (!Check.isNull(dataJson)) {
-                        KuaiShouVideoUpload kuaiShouVideoUpload = new KuaiShouVideoUpload();
-                        String photoId = dataJson.getString("photo_id");
-                        kuaiShouVideoUpload.setPhotoId(photoId);
-                        kuaiShouVideoUpload.setAccountId(advertiserId);
-                        kuaiShouVideoUpload.setSavaPath(videoUrl);
-                        kuaiShouVideoUpload.setSignature(dataJson.getString("signature"));
-                        kuaiShouVideoUpload.setSize(null);
-                        kuaiShouVideoUpload.setType(null);
-                        kuaiShouVideoUpload.setUploadTime(DateUtils.timeStamp2Date(System.currentTimeMillis()));
-                        Map<String, Object> deleteMap = new HashMap<>();
-                        deleteMap.put("photo_id", photoId);
-                        deleteMap.put("account_id", advertiserId);
-                        videoUploadMapper.deleteByMap(deleteMap);
-                        int i = videoUploadMapper.insert(kuaiShouVideoUpload);
-                        if (i > 0) {
-                            log.info("上传快手视频完成");
-                        }
-
-                        KuaiShouVideo video = new KuaiShouVideo();
-                        video.setStatus(1);
-                        QueryWrapper<KuaiShouVideo> queryWrapper = new QueryWrapper<>();
-                        queryWrapper.eq("account_id", advertiserId);
-                        queryWrapper.eq("local_url", videoUrl);
-                        int y = kuaiShouVideoMapper.update(video, queryWrapper);
-                        if (y > 0) {
-                            log.info("更新快手视频状态成功.accountId:{},上传耗时:{} ms", advertiserId, System.currentTimeMillis() - startTime);
-                        }
-
-                        returnMap.put("code", 0);
-                        returnMap.put("message", "视频已上传文件");
-                        returnMap.put("success", true);
-                        returnMap.put("photoId", photoId);
-                        return returnMap;
-                    }
-                } else {
-                    log.error("快手上传视频返回信息异常 ,advertiserId:{},异常信息:{}", advertiserId, resultJson);
-                    returnMap.put("code", -1);
-                    returnMap.put("message", resultJson.getString("message"));
-                    returnMap.put("success", false);
-                    return returnMap;
-                }
-            } else {
-                log.error("快手上传视频返回信息为空,advertiserId:{}", advertiserId);
-                returnMap.put("code", -1);
-                returnMap.put("message", "视频上传失败");
-                returnMap.put("success", false);
-                return returnMap;
-            }
-        } catch (Exception e) {
-            log.error("上传视频失败,advertiser_id:{}", advertiserId);
-            e.printStackTrace();
-            returnMap.put("code", -1);
-            returnMap.put("message", "上传视频异常");
-            returnMap.put("desc", "Interface exception");
-            returnMap.put("success", false);
-            return returnMap;
-        }
-        return null;
-    }
-
     /**
      * 获取视频信息
      *
@@ -2397,271 +2271,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
         }
     }
 
-    /**
-     * 图片上传
-     *
-     * @param advertiserId
-     * @param accessToken
-     * @param filePath
-     * @param type
-     */
-    @Override
-    public Map<String, Object> imageUpload(Long advertiserId, String accessToken, String filePath, Integer type) {
-        Map<String, Object> returnMap = new HashMap<>();
-        try {
-            QueryWrapper<KuaiShouImageUploand> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("account_id", advertiserId).eq("sava_path", filePath).orderByDesc("create_time");
-            queryWrapper.last("limit 1");
-            KuaiShouImageUploand kuaiShouImageUploand = imageUploandMapper.selectOne(queryWrapper);
-            if (!Check.isNull(kuaiShouImageUploand)) {
-                returnMap.put("code", 0);
-                returnMap.put("message", "图片已上传文件已上传");
-                returnMap.put("success", true);
-                returnMap.put("imageToken", kuaiShouImageUploand.getImageToken());
-                return returnMap;
-            }
-            String localUrl = LoadFileUtil.downLoadFromUrl(filePath, PropertiesUtils.getValue("kuaishou_config", "image_sava_path"));
-            if (Check.isNull(localUrl)) {
-                log.error("下载文件到本地文件夹失败,filePath:{},accountId:{}", filePath, advertiserId);
-                throw new Exception("下载文件到本地失败");
-            }
-            String signature = LoadFileUtil.getMD5(localUrl);
-            Long startTime = System.currentTimeMillis();
-            String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.IMAGE_UPLOAD;
-            JSONObject requestJson = new JSONObject();
-            requestJson.put("advertiser_id", advertiserId);
-            requestJson.put("signature", signature);
-            requestJson.put("type", type);
-            requestJson.put("upload_type", 1);
-            Map<String, String> headerMap = new HashMap<String, String>();
-            headerMap.put("Content-Type", "multipart/form-data");
-            headerMap.put("Access-Token", accessToken);
-            String result = exceptInfoForRestTemplate(url, requestJson, headerMap, localUrl);
-            JSONObject resultJson = JSONObject.parseObject(result);
-            if (!Check.isNull(result)) {
-                Integer code = resultJson.getInteger("code");
-                if (code == 0) {
-                    JSONObject dataJson = resultJson.getJSONObject("data");
-                    if (!Check.isNull(dataJson)) {
-                        KuaiShouImageUploand imageUploand = new KuaiShouImageUploand();
-                        imageUploand.setAccountId(advertiserId);
-                        imageUploand.setSavaPath(filePath);
-                        imageUploand.setUploadTime(new Date().toString());
-                        imageUploand.setUrl(dataJson.getString("url"));
-                        imageUploand.setImageToken(dataJson.getString("image_token"));
-                        imageUploand.setHeight(dataJson.getLong("height"));
-                        imageUploand.setSize(dataJson.getLong("size"));
-                        imageUploand.setFormat(dataJson.getString("format"));
-                        imageUploand.setWidth(dataJson.getLong("width"));
-                        int i = imageUploandMapper.insert(imageUploand);
-                        if (i > 0) {
-                            log.info("快手-图片上传成功,共耗时:{} ms", System.currentTimeMillis() - startTime);
-                        }
-                        returnMap.put("code", 0);
-                        returnMap.put("desc", "上传图片完成");
-                        returnMap.put("imageToken", dataJson.getString("image_token"));
-                        returnMap.put("success", true);
-                        return returnMap;
-                    }
-
-                } else {
-                    log.error("快手上传图片返回信息异常 ,advertiserId:{},异常信息:{}", advertiserId, resultJson);
-                    returnMap.put("code", -1);
-                    returnMap.put("desc", "error");
-                    returnMap.put("message", resultJson.getString("message"));
-                    returnMap.put("success", false);
-                }
-            } else {
-                log.error("快手上传图片返回信息为空,advertiserId:{}", advertiserId);
-                returnMap.put("code", -1);
-                returnMap.put("desc", "error");
-                returnMap.put("message", "上传图片失败失败");
-                returnMap.put("success", false);
-            }
-            LoadFileUtil.delFile(localUrl);
-
-        } catch (Exception e) {
-            log.error("上传图片失败,advertiser_id:{}", advertiserId);
-            returnMap.put("code", -1);
-            returnMap.put("message", "上传图片异常");
-            returnMap.put("desc", "Interface exception");
-            returnMap.put("success", false);
-            e.printStackTrace();
-        }
-        return returnMap;
-    }
-
-    /**
-     * 创建应用
-     *
-     * @param advertiserId
-     * @param accessToken
-     * @param requestJson
-     */
-    @Override
-    public Map<String, Object> appCreate(Long advertiserId, String accessToken, JSONObject requestJson) {
-        log.info("快手创建file应用");
-        Map<String, Object> returnMap = new HashMap<>();
-        try {
-            String filePath = requestJson.getString("file");
-
-            QueryWrapper<KuaiShouAppCreate> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("account_id", advertiserId).eq("sava_path", filePath).orderByDesc("create_time");
-            queryWrapper.last("limit 1");
-            KuaiShouAppCreate kuaiShouAppCreate = appCreateMapper.selectOne(queryWrapper);
-            if (!Check.isNull(kuaiShouAppCreate)) {
-                log.info("file应用已经存在");
-                returnMap.put("code", 0);
-                returnMap.put("message", "文件已上传");
-                returnMap.put("success", true);
-                returnMap.put("appId", kuaiShouAppCreate.getAppId());
-                return returnMap;
-            }
-            String localUrl = LoadFileUtil.downLoadFromUrl(filePath, PropertiesUtils.getValue("kuaishou_config", "apk_sava_path"));
-            if (Check.isNull(localUrl)) {
-                log.error("下载文件到本地文件夹失败,filePath:{},accountId:{}", filePath, advertiserId);
-                throw new Exception("下载文件到本地失败");
-            }
-            requestJson.put("advertiser_id", advertiserId);
-            String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.APP_CREATE;
-            Map<String, String> header = new HashMap<String, String>();
-            header.put("Content-Type", "multipart/form-data");
-            header.put("Access-Token", accessToken);
-            Long startTime = System.currentTimeMillis();
-            String result = exceptInfoForRestTemplate(url, requestJson, header, localUrl);
-            JSONObject resultJson = JSONObject.parseObject(result);
-            if (!Check.isNull(result)) {
-                Integer code = resultJson.getInteger("code");
-                if (code == 0) {
-                    JSONObject dataJson = resultJson.getJSONObject("data");
-                    if (!Check.isNull(dataJson)) {
-                        requestJson.put("url", dataJson.getString("url"));
-                        requestJson.put("app_id", dataJson.getLong("app_id"));
-                        this.insertAppList(advertiserId, requestJson);
-                        log.info("应用创建成功,耗时:{} s", (System.currentTimeMillis() - startTime) / 1000);
-                        returnMap.put("appId", dataJson.getLong("app_id"));
-                        returnMap.put("success", true);
-                        returnMap.put("code", 0);
-                        returnMap.put("message", "success");
-                    }
-
-                } else {
-                    log.error("快手创建应用返回信息异常 ,advertiserId:{},异常信息:{}", advertiserId, resultJson);
-                    returnMap.put("code", -1);
-                    returnMap.put("message", resultJson.getString("message"));
-                    returnMap.put("desc", "Interface exception");
-                    returnMap.put("success", false);
-                }
-            } else {
-                log.error("快手创建应用返回信息为空,advertiserId:{}", advertiserId);
-                returnMap.put("code", -1);
-                returnMap.put("message", "上传apk文件失败");
-                returnMap.put("desc", "Interface exception");
-                returnMap.put("success", false);
-            }
-            LoadFileUtil.delFile(localUrl);
-
-        } catch (Exception e) {
-            log.error("创建应用失败,advertiser_id:{}", advertiserId);
-            returnMap.put("code", -1);
-            returnMap.put("message", "上传apk文件错误");
-            returnMap.put("desc", "Interface exception");
-            returnMap.put("success", false);
-            e.printStackTrace();
-        }
-        return returnMap;
-    }
-
-    @Override
-    public Map<String, Object> urlAppCreate(Long accountId, String accessToken, JSONObject apkJson) {
-        log.info("快手创建url应用");
-        Map<String, Object> returnMap = new HashMap<>();
-        try {
-            String appUrl = apkJson.getString("url");
-            String appVersion = apkJson.getString("app_version");
-            String appName = apkJson.getString("app_name");
-            QueryWrapper<KuaiShouAppCreate> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("account_id", accountId).eq("url", appUrl).eq("app_version", appVersion).eq("app_name", appName).orderByDesc("create_time");
-            queryWrapper.last("limit 1");
-            KuaiShouAppCreate kuaiShouAppCreate = appCreateMapper.selectOne(queryWrapper);
-            if (!Check.isNull(kuaiShouAppCreate)) {
-                log.info("url应用已经存在");
-                returnMap.put("code", 0);
-                returnMap.put("message", "文件已上传");
-                returnMap.put("success", true);
-                returnMap.put("appId", kuaiShouAppCreate.getAppId());
-                return returnMap;
-            }
-            String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.APP_CREATE;
-            Map<String, String> headers = new HashMap<String, String>();
-            headers.put("Access-Token", accessToken);
-            headers.put("Content-Type", "multipart/form-data");
-            apkJson.put("advertiser_id", accountId + "");
-            String result = exceptInfoForRestTemplate(url, apkJson, headers, null);
-            JSONObject resultJson = JSONObject.parseObject(result);
-            if (!Check.isNull(result)) {
-                Integer code = resultJson.getInteger("code");
-                if (code == 0) {
-                    JSONObject dataJson = resultJson.getJSONObject("data");
-                    if (!Check.isNull(dataJson)) {
-                        apkJson.put("url", dataJson.getString("url"));
-                        apkJson.put("app_id", dataJson.getLong("app_id"));
-                        this.insertAppList(accountId, apkJson);
-
-                        returnMap.put("code", 0);
-                        returnMap.put("message", "success");
-                        returnMap.put("appId", dataJson.getLong("app_id"));
-                        returnMap.put("success", true);
-                    }
-                } else {
-                    log.error("快手创建应用返回信息异常 ,advertiserId:{},异常信息:{}", accountId, resultJson);
-                    returnMap.put("code", -1);
-                    returnMap.put("message", resultJson.getString("message"));
-                    returnMap.put("success", false);
-                }
-            } else {
-                log.error("快手创建应用返回信息为空,advertiserId:{}", accountId);
-                returnMap.put("code", -1);
-                returnMap.put("message", "apk文件url上传异常");
-                returnMap.put("success", false);
-            }
-        } catch (Exception e) {
-            log.error("创建应用失败,advertiser_id:{}", accountId);
-            returnMap.put("code", -1);
-            returnMap.put("message", "应用url创建应用异常");
-            e.printStackTrace();
-        }
-        return returnMap;
-    }
-
-
-    /**
-     * 添加 应用信息
-     */
-    private void insertAppList(Long accountId, JSONObject dataJson) {
-
-        Map<String, Object> deleteMap = new HashMap<>();
-        deleteMap.put("account_id", accountId);
-        deleteMap.put("app_version", dataJson.getString("app_version"));
-        appListMapper.deleteByMap(deleteMap);
-        KuaiShouAppList appList = new KuaiShouAppList();
-        appList.setAccountId(accountId);
-        appList.setUrl(dataJson.getString("url"));
-        appList.setPlatform(dataJson.getInteger("platform"));
-        appList.setAppVersion(dataJson.getString("app_version"));
-        appList.setAppName(dataJson.getString("app_name"));
-        appList.setImageToken(dataJson.getString("image_token"));
-        appList.setPackageName(dataJson.getString("package_name"));
-        appList.setAppId(dataJson.getLong("app_id"));
-        appList.setAppIconUrl(dataJson.getString("app_icon_url"));
-        appList.setReturnTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm"));
-        int i = appListMapper.insert(appList);
-        if (i > 0) {
-            log.info("同步应用成功");
-        }
-
-    }
-
 
     /**
      * 获取快手广告租信息
@@ -3559,7 +3168,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
      */
     @Override
     public void getAppList(Long advertiserId, String accessToken) {
-        Integer pageSize = 50;
+        Integer pageSize = 500;
         Integer page = 1;
         getAppList2ByPage(advertiserId, accessToken, page, pageSize);
     }

+ 0 - 7
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/material/mapper/KuaishouAccessTokenMapper.java

@@ -1,7 +0,0 @@
-package cn.com.ctop.kuaishou.modules.material.mapper;
-
-import cn.com.ctop.kuaishou.modules.material.entity.KuaishouAccessToken;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-public interface KuaishouAccessTokenMapper extends BaseMapper<KuaishouAccessToken> {
-}

+ 0 - 7
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/material/service/IKuaishouAccessTokenService.java

@@ -1,7 +0,0 @@
-package cn.com.ctop.kuaishou.modules.material.service;
-
-import cn.com.ctop.kuaishou.modules.material.entity.KuaishouAccessToken;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-public interface IKuaishouAccessTokenService extends IService<KuaishouAccessToken> {
-}

+ 0 - 11
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/material/service/impl/KuaishouAccessTokenServiceImpl.java

@@ -1,11 +0,0 @@
-package cn.com.ctop.kuaishou.modules.material.service.impl;
-
-import cn.com.ctop.kuaishou.modules.material.entity.KuaishouAccessToken;
-import cn.com.ctop.kuaishou.modules.material.mapper.KuaishouAccessTokenMapper;
-import cn.com.ctop.kuaishou.modules.material.service.IKuaishouAccessTokenService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service
-public class KuaishouAccessTokenServiceImpl extends ServiceImpl<KuaishouAccessTokenMapper, KuaishouAccessToken> implements IKuaishouAccessTokenService {
-}

+ 0 - 164
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KuaiShouCleanMaterialReportController.java

@@ -1,164 +0,0 @@
-package cn.com.ctop.kuaishou.modules.report.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.common.module.entity.KuaiShouCleanMaterialReport;
-import cn.com.ctop.common.module.service.IKuaiShouCleanMaterialReportService;
-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.system.query.QueryGenerator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-
-/**
- * 快手素材清洗数据
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-02-24
- */
-@Slf4j
-@Api(tags = "快手素材清洗数据")
-@RestController
-@RequestMapping("/ctop/kuaiShouCleanMaterialReport")
-public class KuaiShouCleanMaterialReportController {
-    @Autowired
-    private IKuaiShouCleanMaterialReportService kuaiShouCleanMaterialReportService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param kuaiShouCleanMaterialReport
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "快手素材清洗数据-分页列表查询")
-    @ApiOperation(value = "快手素材清洗数据-分页列表查询", notes = "快手素材清洗数据-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<KuaiShouCleanMaterialReport>> queryPageList(KuaiShouCleanMaterialReport kuaiShouCleanMaterialReport,
-                                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                    HttpServletRequest req) {
-        Result<IPage<KuaiShouCleanMaterialReport>> result = new Result<>();
-        QueryWrapper<KuaiShouCleanMaterialReport> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCleanMaterialReport, req.getParameterMap());
-        Page<KuaiShouCleanMaterialReport> page = new Page<>(pageNo, pageSize);
-        IPage<KuaiShouCleanMaterialReport> pageList = kuaiShouCleanMaterialReportService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param kuaiShouCleanMaterialReport
-     * @return
-     */
-    @AutoLog(value = "快手素材清洗数据-添加")
-    @ApiOperation(value = "快手素材清洗数据-添加", notes = "快手素材清洗数据-添加")
-    @PostMapping(value = "/add")
-    public Result<KuaiShouCleanMaterialReport> add(@RequestBody KuaiShouCleanMaterialReport kuaiShouCleanMaterialReport) {
-        Result<KuaiShouCleanMaterialReport> result = new Result<>();
-        try {
-            kuaiShouCleanMaterialReportService.save(kuaiShouCleanMaterialReport);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param kuaiShouCleanMaterialReport
-     * @return
-     */
-    @AutoLog(value = "快手素材清洗数据-编辑")
-    @ApiOperation(value = "快手素材清洗数据-编辑", notes = "快手素材清洗数据-编辑")
-    @PutMapping(value = "/edit")
-    public Result<KuaiShouCleanMaterialReport> edit(@RequestBody KuaiShouCleanMaterialReport kuaiShouCleanMaterialReport) {
-        Result<KuaiShouCleanMaterialReport> result = new Result<>();
-        KuaiShouCleanMaterialReport kuaiShouCleanMaterialReportEntity = kuaiShouCleanMaterialReportService.getById(kuaiShouCleanMaterialReport.getId());
-        if (kuaiShouCleanMaterialReportEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = kuaiShouCleanMaterialReportService.updateById(kuaiShouCleanMaterialReport);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "快手素材清洗数据-通过id删除")
-    @ApiOperation(value = "快手素材清洗数据-通过id删除", notes = "快手素材清洗数据-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<Object> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            kuaiShouCleanMaterialReportService.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<KuaiShouCleanMaterialReport> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<KuaiShouCleanMaterialReport> result = new Result<>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.kuaiShouCleanMaterialReportService.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<KuaiShouCleanMaterialReport> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<KuaiShouCleanMaterialReport> result = new Result<>();
-        KuaiShouCleanMaterialReport kuaiShouCleanMaterialReport = kuaiShouCleanMaterialReportService.getById(id);
-        if (kuaiShouCleanMaterialReport == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(kuaiShouCleanMaterialReport);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-}

+ 0 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/KuaishouReportDailyCreativeMapper.java

@@ -1,6 +1,5 @@
 package cn.com.ctop.kuaishou.modules.report.mapper;
 
-import cn.com.ctop.common.module.entity.KuaiShouCleanMaterialReport;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyCreative;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -17,8 +16,6 @@ public interface KuaishouReportDailyCreativeMapper extends BaseMapper<KuaishouRe
 
     List<String> getSignatureList();
 
-    KuaiShouCleanMaterialReport calculationMaterialReport(@Param("signature") String signature);
-
     void loadProgramCreativeDailyReport(@Param("accountId") Long accountId, @Param("localPath") String localPath);
 
     List<JSONObject> checkZombieProject(@Param("date") String date);

+ 0 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaiShouDailyAgentMapper.xml

@@ -87,7 +87,6 @@
         industry as industry, <!-- 一级行业 -->
         second_industry as secondIndustry, <!-- 二级行业 -->
         charge_day_on_day_percent as chargeDayOnDayPercent, <!-- 消耗环比 -->
-        -- advertiser_create_time as advertiserCreateTime, <!-- 广告主创建时间 -->
         charged_campaign_count as costCampaignCount, <!-- 有消费计划数 -->
         total_balance_in_yuan as balance, <!-- 总余额 -->
         total_charged_in_yuan as cost, <!-- 总消耗 -->

+ 0 - 17
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyCreativeMapper.xml

@@ -265,23 +265,6 @@
       WHERE signature !=''
     </select>
 
-    <select id="calculationMaterialReport"
-            resultType="cn.com.ctop.common.module.entity.KuaiShouCleanMaterialReport">
-        select
-        signature id,
-        sum(charge) charge,
-        sum(photo_show) photoShow,
-        sum(photo_click) photoClick,
-        sum(aclick) aclick,
-        sum(bclick) bclick,
-        sum(activation) activation,
-        sum(form_count) formCount
-        from ctop_kuaishou_report_daily_creative
-        where
-        signature = #{signature}
-    </select>
-
-
     <select id="checkZombieProject" resultType="com.alibaba.fastjson.JSONObject">
       SELECT * FROM
 		(SELECT

+ 0 - 6
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IKuaishouReportDailyCreativeService.java

@@ -8,10 +8,4 @@ import java.util.List;
 public interface IKuaishouReportDailyCreativeService extends IService<KuaishouReportDailyCreative> {
     List<String> getSignature();
 
-    /**
-     * 计算快手素材报表
-     *
-     * @param signature
-     */
-    void calculationReport(String signature);
 }

+ 2 - 15
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyCreativeServiceImpl.java

@@ -1,8 +1,5 @@
 package cn.com.ctop.kuaishou.modules.report.service.impl;
 
-import cn.com.ctop.common.module.entity.KuaiShouCleanMaterialReport;
-import cn.com.ctop.common.module.service.IKuaiShouCleanMaterialReportService;
-import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyCreative;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyCreativeMapper;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyCreativeService;
@@ -16,23 +13,13 @@ import java.util.List;
 public class KuaishouReportDailyCreativeServiceImpl extends ServiceImpl<KuaishouReportDailyCreativeMapper, KuaishouReportDailyCreative> implements IKuaishouReportDailyCreativeService {
     @Autowired
     private KuaishouReportDailyCreativeMapper kuaishouReportDailyCreativeMapper;
-    @Autowired
-    private IKuaiShouCleanMaterialReportService cleanMaterialReportService;
+
 
     @Override
     public List<String> getSignature() {
         return kuaishouReportDailyCreativeMapper.getSignatureList();
     }
 
-    @Override
-    public void calculationReport(String signature) {
-        if (Check.isNull(signature)) {
-            return;
-        }
-        KuaiShouCleanMaterialReport calculationMaterialReport = kuaishouReportDailyCreativeMapper.calculationMaterialReport(signature);
-        if (!Check.isNull(calculationMaterialReport)) {
-            cleanMaterialReportService.saveOrUpdate(calculationMaterialReport);
-        }
-    }
+
 
 }

+ 35 - 46
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/BytedanceAccountReportMapper.xml

@@ -226,77 +226,77 @@
     </select>
 
     <sql id="selectSql">
-        ifnull(sum(a.show_num),0)                          as showMaterial,                   -- 展现数据-展示数
-        ifnull(sum(a.click),0)                             as clickMaterial,                  -- 点击数
-        ifnull(sum(a.convert_num),0)                       as convertMaterial,                -- 转化数据-转化数
-        ifnull(sum(a.cost),0)                              as cost,                           -- 消耗
-        ifnull(sum(a.active),0)                            as active,                         -- 应用下载-激活
-        ifnull(sum(a.download_finish),0)                   as downloadFinish,                 -- 应用下载-安卓下载完成
-        ifnull(sum(a.download_start),0)                    as downloadStart,                  -- 应用下载-安卓下载开始
-		ifnull(sum(a.click_install),0)                     as clickInstall,                   -- 应用下载-点击安装数
-		ifnull(sum(a.install_finish),0)                    as installFinish,                  -- 应用下载-安卓安装完成
-		ifnull(sum(a.register),0)                          as register,                       -- 应用下载-注册
-        ifnull(sum(a.pay_count),0)                         as payCount,                       -- 应用下载-付费数
-		ifnull(sum(a.form),0)                              as form,                           --  表单提交数
-		ifnull(sum(a.total_play),0)                        as totalPlay,                      -- 视频-总播放
-        ifnull(sum(a.valid_play),0)                        as validPlay,                      -- 视频-有效播放
-        ifnull(sum(a.wifi_play),0)                         as wifiPlay,                       -- 视频-wifi播放
-        ifnull(sum(a.play25_feed_break),0)                 as play25FeedBreak,                -- 视频-播放25%进度总数
-        ifnull(sum(a.play50_feed_break),0)                 as play50FeedBreak,                -- 视频-播放50%进度总数
-        ifnull(sum(a.play75_feed_break),0)                 as play75FeedBreak,                -- 视频-播放75%进度总数
-        ifnull(sum(a.play100_feed_break),0)                as play100FeedBreak,               -- 视频-播放100%进度总数
-		ifnull(sum(a.share),0)                             as shareMaterial,                  -- 互动数据-分享数
-		ifnull(sum(a.like_num),0)                          as likeMaterial,                   -- 互动数据-点赞数
+        ifnull(sum(a.show_num),0)                          as showMaterial,
+        ifnull(sum(a.click),0)                             as clickMaterial,
+        ifnull(sum(a.convert_num),0)                       as convertMaterial,
+        ifnull(sum(a.cost),0)                              as cost,
+        ifnull(sum(a.active),0)                            as active,
+        ifnull(sum(a.download_finish),0)                   as downloadFinish,
+        ifnull(sum(a.download_start),0)                    as downloadStart,
+		ifnull(sum(a.click_install),0)                     as clickInstall,
+		ifnull(sum(a.install_finish),0)                    as installFinish,
+		ifnull(sum(a.register),0)                          as register,
+        ifnull(sum(a.pay_count),0)                         as payCount,
+		ifnull(sum(a.form),0)                              as form,
+		ifnull(sum(a.total_play),0)                        as totalPlay,
+        ifnull(sum(a.valid_play),0)                        as validPlay,
+        ifnull(sum(a.wifi_play),0)                         as wifiPlay,
+        ifnull(sum(a.play25_feed_break),0)                 as play25FeedBreak,
+        ifnull(sum(a.play50_feed_break),0)                 as play50FeedBreak,
+        ifnull(sum(a.play75_feed_break),0)                 as play75FeedBreak,
+        ifnull(sum(a.play100_feed_break),0)                as play100FeedBreak,
+		ifnull(sum(a.share),0)                             as shareMaterial,
+		ifnull(sum(a.like_num),0)                          as likeMaterial,
 		case
         when sum(a.total_play) != 0 and sum(a.total_play) is not null and sum(a.play25_feed_break) is not null
         then round(sum(a.play25_feed_break) / sum(a.total_play),2)
-        else 0 end                               as play25FeedBreakRate,            -- 25%进度播放率
+        else 0 end                               as play25FeedBreakRate,
 		case
         when sum(a.click) != 0 and sum(a.click) is not null and sum(a.convert_num) is not null
         then round(sum(a.convert_num) / sum(a.click),2)
-        else 0 end                               as convertRate,                    -- 转化率  转化数/点击数*100% !
+        else 0 end                               as convertRate,
         case
         when sum(a.convert_num) != 0 and sum(a.convert_num) is not null and sum(a.cost) is not null
         then round(sum(a.cost)/sum(a.convert_num),2)
-        else 0 end as convertCost, --  转化数据-转化成本=总花费/转化数
-		ifnull(sum(a.follow),0)                            as follow,                         -- 互动数据-新增关注数
-        ifnull(sum(a.next_day_open),0)                     as nextDayOpen,                    -- 次留数
+        else 0 end as convertCost,
+		ifnull(sum(a.follow),0)                            as follow,
+        ifnull(sum(a.next_day_open),0)                     as nextDayOpen,
         case
         when sum(a.active) != 0 and sum(a.next_day_open) is not null and sum(a.active) is not null
         then round(sum(a.next_day_open) / sum(a.active),2)
-        else 0 end                               as nextDayOpenRate,                -- 次留率 = 次留数/激活数
+        else 0 end                               as nextDayOpenRate,
         case
         when sum(a.next_day_open) != 0 and sum(a.next_day_open) is not null and sum(a.cost) is not null
         then round(sum(a.cost) / sum(a.next_day_open),2)
-        else 0 end                               as nextDayOpenCost,                -- 次留成本 = 消耗/次留数
+        else 0 end                               as nextDayOpenCost,
 		case
         when sum(a.click) != 0 and sum(a.click) is not null and sum(a.cost) is not null
         then round(sum(a.cost) / sum(a.click),2)
-        else 0 end                               as cpc,                            -- 平均点击单价
+        else 0 end                               as cpc,
         case
         when sum(a.show_num) != 0 and sum(a.show_num) is not null and sum(a.click) is not null
         then round(sum(a.click) / sum(a.show_num),2)
-        else 0 end                               as ctr,                            -- 展现数据-点击率   广告被点击的次数占展示次数的百分比。计算方法:点击数/展示数*100%
+        else 0 end                               as ctr,
         case
         when sum(a.show_num) != 0 and sum(a.cost) is not null and sum(a.show_num) is not null
         then round(sum(a.cost) / sum(a.show_num) * 1000,2)
-        else 0 end                               as cpm,                            -- 平均千次展现费用  广告平均每一千次展现所付出的费用,计算公式是:总花费/展示数*1000。
+        else 0 end                               as cpm,
 		case
         when sum(a.active) != 0 and sum(a.cost) is not null and sum(a.active) is not null
         then round(sum(a.cost) / sum(a.active),2)
-        else 0 end                               as activeCost,                     -- 应用下载广告数据-激活成本  计算方式:总花费/激活数。
+        else 0 end                               as activeCost,
 		case
         when sum(a.click) != 0 and sum(a.active) is not null and sum(a.click) is not null
         then round(sum(a.active) / sum(a.click),2)
-        else 0 end                               as activeRate,                     -- 应用下载广告数据-激活率   计算方式:激活数/点击数*100%
+        else 0 end                               as activeRate,
         case
         when sum(a.active) != 0 and sum(a.register) is not null and sum(a.active) is not null
         then round(sum(a.register) / sum(a.active),2)
-        else 0 end                               as activeRegisterRate,             -- 应用下载广告数据-注册率   注册用户占激活用户的比例
+        else 0 end                               as activeRegisterRate,
         case
         when sum(a.register) != 0 and sum(a.cost) is not null and sum(a.register) is not null
         then round(sum(a.cost) / sum(a.register),2)
-        else 0 end                               as activeRegisterCost               -- 应用下载广告数据-注册成本  总花费/注册数,当天数据可能会有波动,次日早8点后稳定。
+        else 0 end                               as activeRegisterCost
     </sql>
 
     <select id="getBytedanceAccountInfoByProjectId"
@@ -411,11 +411,6 @@
     <select id="queryProjectInfoByAdmin" resultType="long">
         select
         id as projectId
-        -- project_name as projectName,
-        -- advertiser_id as advertiserId,
-        -- advertiser_name as advertiserName,
-        -- responsible_name as responsibleName,
-        -- media_id as mediaId
         from
         ctop_project
         where
@@ -429,12 +424,6 @@
     <select id="getSaleProjects" resultType="long">
         select
         distinct a.id as projectId
-        -- a.project_name as projectName,
-        -- a.advertiser_id as advertiserId,
-        -- a.advertiser_name as advertiserName,
-        -- a.media_id as mediaId,
-        -- a.sale_id as saleId,
-        -- b.realname as saleName
         from
         ctop_project a
         left join sys_user b on a.sale_id = b.id

+ 53 - 56
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/BytedanceReportMapper.xml

@@ -202,174 +202,171 @@
 
     <select id="videoInfoListWeek" resultType="cn.com.ctop.toutiao.modules.report.entity.ByteDanceVideoReportDaily">
         select
-        --  a.material_id as materialId,
-        --         a.account_id as accountId,
-        --         b.auth_name as authName,
         a.project_id                             as projectId,
         a.project_name                           as projectName,
         a.advertiser_id                          as advertiserId,
         a.advertiser_name                        as advertiserName,
         a.stat_datetime                          as statDatetime,
-        sum(a.cost)                              as cost,                           -- 消耗
+        sum(a.cost)                              as cost,
         a.signature                              as signature,
         a.video_url                              as videoUrl,
         '-'                                      as materialDesc,
         (select info.url from ctop_material_info info where info.code = a.signature limit 1)                                    as url,
         1                                        as appType,
-        sum(a.click)                             as clickMaterial,                  -- 点击数
+        sum(a.click)                             as clickMaterial,
 
         case
         when sum(a.total_play) != 0
         then sum(a.play25_feed_break) / sum(a.total_play)
-        else 0 end                           as play25FeedBreakRate,            -- 25%进度播放率
+        else 0 end                           as play25FeedBreakRate,
 
         case
         when sum(a.total_play) != 0
         then sum(a.play_over) / sum(a.total_play)
-        else 0 end                           as playOverRate,                   -- 整体完播率
+        else 0 end                           as playOverRate,
 
         case
         when sum(a.click) != 0
         then sum(a.convert_material) / sum(a.click)
-        else 0 end                           as convertRate,                    -- 转化率  转化数/点击数*100% !
-        sum(a.active)                            as active,                         -- 应用下载-激活
-        sum(a.download_finish)                   as downloadFinish,                 -- 应用下载-安卓下载完成
-        sum(a.download_start)                    as downloadStart,                  -- 应用下载-安卓下载开始
-        sum(a.install_finish)                    as installFinish,                  -- 应用下载-安卓安装完成
-        sum(a.register)                          as register,                       -- 应用下载-注册
-        sum(a.pay_count)                         as payCount,                       -- 应用下载-付费数
-        sum(a.form)                              as form,                           --  表单提交数
-        sum(a.total_play)                        as totalPlay,                      -- 视频-总播放
-        sum(a.valid_play)                        as validPlay,                      -- 视频-有效播放
-        sum(a.wifi_play)                         as wifiPlay,                       -- 视频-wifi播放
-        sum(a.play25_feed_break)                 as play25FeedBreak,                -- 视频-播放25%进度总数
-        sum(a.play50_feed_break)                 as play50FeedBreak,                -- 视频-播放50%进度总数
-        sum(a.play75_feed_break)                 as play75FeedBreak,                -- 视频-播放75%进度总数
-        sum(a.play100_feed_break)                as play100FeedBreak,               -- 视频-播放100%进度总数
-        sum(a.share_material)                    as shareMaterial,                  -- 互动数据-分享数
-        sum(a.follow)                            as follow,                         -- 互动数据-新增关注数
-        sum(a.next_day_open)                     as nextDayOpen,                    -- 次留数
+        else 0 end                           as convertRate,
+        sum(a.active)                            as active,
+        sum(a.download_finish)                   as downloadFinish,
+        sum(a.download_start)                    as downloadStart,
+        sum(a.install_finish)                    as installFinish,
+        sum(a.register)                          as register,
+        sum(a.pay_count)                         as payCount,
+        sum(a.form)                              as form,
+        sum(a.total_play)                        as totalPlay,
+        sum(a.valid_play)                        as validPlay,
+        sum(a.wifi_play)                         as wifiPlay,
+        sum(a.play25_feed_break)                 as play25FeedBreak,
+        sum(a.play50_feed_break)                 as play50FeedBreak,
+        sum(a.play75_feed_break)                 as play75FeedBreak,
+        sum(a.play100_feed_break)                as play100FeedBreak,
+        sum(a.share_material)                    as shareMaterial,
+        sum(a.follow)                            as follow,
+        sum(a.next_day_open)                     as nextDayOpen,
         case
         when sum(a.active) != 0
         then sum(a.next_day_open) / sum(a.active)
-        else 0 end                           as nextDayOpenRate,                -- 次留率 = 次留数/激活数
+        else 0 end                           as nextDayOpenRate,
 
         case
         when sum(a.next_day_open) != 0
         then sum(a.cost) / sum(a.next_day_open)
-        else 0 end                           as nextDayOpenCost,                -- 次留成本 = 消耗/次留数
+        else 0 end                           as nextDayOpenCost,
 
-        sum(a.active_pay_amount)                 as activePayAmount,                -- 应用下载广告数据-付费次数
+        sum(a.active_pay_amount)                 as activePayAmount,
 
         case
         when sum(a.valid_play) != 0
         then sum(a.cost) / sum(a.valid_play)
-        else 0 end                              validPlayCost,                  -- 视频数据-有效播放成本  计算公式:总花费/有效播放数,当天数据可能会有波动,次日早8点后稳定。
-        sum(a.convert_material)                  as convertMaterial,                -- 转化数据-转化数
+        else 0 end                              validPlayCost,
+        sum(a.convert_material)                  as convertMaterial,
 
         case
         when sum(a.active_pay_amount) != 0
         then sum(a.cost) / sum(a.active_pay_amount)
-        else 0 end                           as activePayCost,                  -- 应用下载广告数据-付费成本 = 消耗/付费次数
+        else 0 end                           as activePayCost,
 
         case
         when sum(a.click) != 0
         then sum(a.cost) / sum(a.click)
-        else 0 end                           as cpc,                            -- 平均点击单价
-        sum(a.play_over_rate)                    as playOverRate,                   -- 视频数据-播完率
+        else 0 end                           as cpc,
+        sum(a.play_over_rate)                    as playOverRate,
 
         case
         when sum(a.show_material) != 0
         then sum(a.click) / sum(a.show_material)
-        else 0 end                           as ctr,                            -- 展现数据-点击率   广告被点击的次数占展示次数的百分比。计算方法:点击数/展示数*100%
+        else 0 end                           as ctr,
 
         case
         when sum(a.show_material) != 0
         then sum(a.cost) / sum(a.show_material) * 1000
-        else 0 end                              cpm,                            -- 平均千次展现费用  广告平均每一千次展现所付出的费用,计算公式是:总花费/展示数*1000。
-        sum(a.wifi_play_rate)                    as wifiPlayRate,                   -- 视频数据-WiFi播放占比
-        sum(a.like_material)                     as likeMaterial,                   -- 互动数据-点赞数
+        else 0 end                              cpm,
+        sum(a.wifi_play_rate)                    as wifiPlayRate,
+        sum(a.like_material)                     as likeMaterial,
 
 
         case
         when sum(a.active) != 0
         then sum(a.cost) / sum(a.active)
-        else 0 end                              activeCost,                     -- 应用下载广告数据-激活成本  计算方式:总花费/激活数。
+        else 0 end                              activeCost,
 
         case
         when sum(a.game_addiction) != 0
         then sum(a.cost) / sum(a.game_addiction)
-        else 0 end                           as gameAddictionCost,              -- 应用下载广告数据-关键行为成本  广告主为每个有APP内关键行为的用户所付出的成本,计算公式是总花费/关键行为数。当天数据可能会有波动,次日早8点后稳定。
-        sum(a.game_addiction)                    as gameAddiction,                  -- 应用下载广告数据-关键行为数
+        else 0 end                           as gameAddictionCost,
+        sum(a.game_addiction)                    as gameAddiction,
 
         case
         when sum(a.click) != 0
         then sum(a.active) / sum(a.click)
-        else 0 end                           as activeRate,                     -- 应用下载广告数据-激活率   计算方式:激活数/点击数*100%
+        else 0 end                           as activeRate,
 
 
         case
         when sum(a.active) != 0
         then sum(a.game_addiction) / sum(a.active)
-        else 0 end                            as  gameAddictionRate,              -- 应用下载广告数据-关键行为率  关键行为用户占激活用户的比例
+        else 0 end                            as  gameAddictionRate,
 
         case
         when sum(a.active) != 0
         then sum(a.register) / sum(a.active)
-        else 0 end                           as activeRegisterRate,             -- 应用下载广告数据-注册率   注册用户占激活用户的比例
+        else 0 end                           as activeRegisterRate,
 
 
         case
         when sum(a.download_finish) != 0
         then sum(a.cost) / sum(a.download_finish)
-        else 0 end                           as downloadFinishCost,             -- 应用下载广告数据-安卓下载完成成本 计算方式:总花费/安卓下载完成数。
+        else 0 end                           as downloadFinishCost,
 
 
         case
         when sum(a.register) != 0
         then sum(a.cost) / sum(a.register)
-        else 0 end                           as activeRegisterCost,             -- 应用下载广告数据-注册成本  总花费/注册数,当天数据可能会有波动,次日早8点后稳定。
-        sum(a.show_material)                     as showMaterial,                   -- 展现数据-展示数
+        else 0 end                           as activeRegisterCost,
+        sum(a.show_material)                     as showMaterial,
 
 
         case
         when sum(a.download_start) != 0
         then sum(a.download_finish) / sum(a.download_start)
-        else 0 end                           as downloadFinishRate,             -- 应用下载广告数据-安卓下载完成率  计算方式:安卓下载完成数/安卓下载开始数
+        else 0 end                           as downloadFinishRate,
 
         case
         when sum(a.download_finish) != 0
         then sum(a.install_finish) / sum(a.download_finish)
-        else 0 end                           as installFinishRate,              -- 应用下载广告数据-安卓安装完成率  计算方式:安卓安装完成数/安卓下载完成数
-        sum(a.play_over)                         as playOver,                       -- 完播数
+        else 0 end                           as installFinishRate,
+        sum(a.play_over)                         as playOver,
 
         case
         when sum(a.download_start) != 0
         then sum(a.cost) / sum(a.download_start)
-        else 0 end                           as downloadStartCost,              -- 应用下载广告数据-安卓下载开始成本  计算方法:总花费/安卓下载开始数。
+        else 0 end                           as downloadStartCost,
 
         case
         when sum(a.show_material) != 0
         then sum(a.valid_play) / sum(a.show_material)
-        else 0 end                           as validPlayRate,                  -- 视频数据-有效播放率  有效播放数/展示数
+        else 0 end                           as validPlayRate,
         case
         when sum(a.valid_play) != 0
         then sum(a.average_play_time_per_play*a.valid_play)/sum(a.valid_play)
-        else 0 end as averagePlayTimePerPlay,         -- 视频数据-平均单次播放时长
+        else 0 end as averagePlayTimePerPlay,
         case
         when sum(a.convert_material) != 0
         then sum(a.cost) / sum(a.convert_material)
-        else 0 end                           as convertCost,                    --  转化数据-转化成本=总花费/转化数
+        else 0 end                           as convertCost,
 
         case
         when sum(a.install_finish) != 0
         then sum(a.cost) / sum(a.install_finish)
-        else 0 end                           as installFinishCost,              --  应用下载广告数据-安卓安装完成成本  计算方式:总花费/安卓安装完成数
+        else 0 end                           as installFinishCost,
 
         case
         when sum(a.click) != 0
         then sum(a.download_start) / sum(a.click)
-        else 0 end                           as downloadStartRate               --  应用下载广告数据-安卓下载开始率  计算方法:安卓下载开始数/点击数
+        else 0 end                           as downloadStartRate
 
         from ctop_bytedance_video_report_daily a
         left join (select material_id,clip_id,shot_id,plan_id,plane_id from ctop_material_ascription group by material_id) f on a.signature = f.material_id
@@ -382,7 +379,7 @@
 
         and f.material_id is not null
 
-        <choose>   <!-- 编导、剪辑、拍摄、平面只能查看自己本职工作制作的视频,设计组长和管理员能查看所有的-->
+        <choose>
             <when test="role == 'plan'">
                 and f.plan = #{userId}
             </when>