瀏覽代碼

xxl-job-bytedance代码初始化

syh 5 年之前
父節點
當前提交
c2c57b2b0e
共有 100 個文件被更改,包括 328 次插入7140 次删除
  1. 0 16
      jeecg-boot-module-system/pom.xml
  2. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/JeecgApplication.java
  3. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdvertiserController.java
  4. 0 83
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountAuthController.java
  5. 0 83
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountLoginController.java
  6. 0 294
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertiserPostController.java
  7. 0 41
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCleanMaterialReportController.java
  8. 3 191
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceTemplateController.java
  9. 0 164
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceFundDailyController.java
  10. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  11. 4 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialImageInfoController.java
  12. 3 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java
  13. 1 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java
  14. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java
  15. 0 764
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java
  16. 4 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TransferAccountController.java
  17. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UReportFileBindUserController.java
  18. 1 85
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java
  19. 22 109
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoMergeTaskController.java
  20. 0 84
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoWatermarkTaskController.java
  21. 22 108
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoWatermarkTemplateController.java
  22. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/ByteDanceHourlyAccountWarningLoadJob.java
  23. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedanceAdvertiserDailyReportLoadJob.java
  24. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedanceAdvertiserDataLoadJob.java
  25. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedanceAdvertiserHourlyReportLoadJob.java
  26. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedanceCreativeDailyReportLoadJob.java
  27. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedanceCreativeHourlyReportLoadJob.java
  28. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedanceMaterialsLoadJob.java
  29. 7 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedancePlanDailyReportLoadJob.java
  30. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedancePlanHourlyReportLoadJob.java
  31. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedancePlanLoadJob.java
  32. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedancePlanRealTimeLoadJob.java
  33. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedanceSameDayCreativeLoadJob.java
  34. 0 36
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/EffiVideoJob.java
  35. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/ToutiaoMaterialsLoadJob.java
  36. 0 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/ICreateInternalService.java
  37. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/BidWarningServiceImpl.java
  38. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CpaBidWarningServiceImpl.java
  39. 0 498
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CreateInternalServiceImpl.java
  40. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CreativeTitleServiceImpl.java
  41. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectMemberServiceImpl.java
  42. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/excelutil/KuaishouChannelRegInfoExcelListener.java
  43. 0 11
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/fegin/LogService.java
  44. 0 162
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/industry/vue/IndustryList.vue
  45. 0 128
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/industry/vue/modules/IndustryModal.vue
  46. 0 135
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/industry/vue/modules/IndustryModal__Style#Drawer.vue
  47. 0 780
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/PerformanceController2.java
  48. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
  49. 15 20
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysLogController.java
  50. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
  51. 7 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
  52. 0 26
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/EffiRateComparator.java
  53. 0 82
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysRole.java
  54. 0 28
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java
  55. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
  56. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
  57. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java
  58. 0 141
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IPerformanceService2.java
  59. 0 22
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java
  60. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
  61. 0 2783
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/PerformanceServiceImpl2.java
  62. 0 27
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java
  63. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java
  64. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
  65. 1 40
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  66. 2 2
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/SysRole.java
  67. 0 2
      module-common/src/main/java/cn/com/ctop/common/module/mapper/MaterialInfoMapper.java
  68. 27 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/SysRoleMapper.java
  69. 0 17
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialInfoMapper.xml
  70. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml
  71. 0 2
      module-common/src/main/java/cn/com/ctop/common/module/service/IMaterialInfoService.java
  72. 18 0
      module-common/src/main/java/cn/com/ctop/common/module/service/ISysRoleService.java
  73. 2 2
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/BindAccountAuthServiceImpl.java
  74. 9 34
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java
  75. 27 0
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/SysRoleServiceImpl.java
  76. 73 16
      module-common/src/main/java/cn/com/ctop/common/module/utils/LoadFileUtil.java
  77. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/excelutil/SpringUtils.java
  78. 1 1
      module-report/src/main/java/cn/com/ctop/bytedance/vo/ByteDanceAdvertiserReportDTO.java
  79. 1 1
      module-report/src/main/java/cn/com/ctop/bytedance/vo/DailyAccountReportVO.java
  80. 1 1
      module-report/src/main/java/cn/com/ctop/bytedance/vo/DailyGroupReportVO.java
  81. 1 1
      module-report/src/main/java/cn/com/ctop/bytedance/vo/DailyReportVO.java
  82. 1 1
      module-report/src/main/java/cn/com/ctop/bytedance/vo/ReportVO.java
  83. 1 1
      module-report/src/main/java/cn/com/ctop/bytedance/vo/StatisticCampaignVo.java
  84. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysDepartUsersVO.java
  85. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysUserRoleVO.java
  86. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserVo.java
  87. 1 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/UserDto.java
  88. 0 10
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/dataeye/service/impl/DataeyeCompanyServiceImpl.java
  89. 2 6
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouDailyReportTaskServiceImpl.java
  90. 1 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouHistoryReportTaskServiceImpl.java
  91. 2 2
      module-report/src/main/java/cn/com/ctop/bytedance/controller/AccountReportController.java
  92. 5 5
      module-report/src/main/java/cn/com/ctop/bytedance/controller/DailyReportController.java
  93. 2 2
      module-report/src/main/java/cn/com/ctop/bytedance/controller/KuaiShouYiCheReportController.java
  94. 2 2
      module-report/src/main/java/cn/com/ctop/bytedance/controller/MaterialReportController.java
  95. 1 1
      module-report/src/main/java/cn/com/ctop/bytedance/entity/CustomerPlanStatisticInfo.java
  96. 1 1
      module-report/src/main/java/cn/com/ctop/bytedance/entity/PlatformCampaignStatisticInfo.java
  97. 2 2
      module-report/src/main/java/cn/com/ctop/bytedance/mapper/AccountReportMapper.java
  98. 2 2
      module-report/src/main/java/cn/com/ctop/bytedance/mapper/CustomerPlanStatisticInfoMapper.java
  99. 3 3
      module-report/src/main/java/cn/com/ctop/bytedance/mapper/DailyReportMapper.java
  100. 0 0
      module-report/src/main/java/cn/com/ctop/bytedance/mapper/KuaiShouYiCheReportMapper.java

+ 0 - 16
jeecg-boot-module-system/pom.xml

@@ -41,16 +41,6 @@
     </repositories>
 
     <dependencies>
-        <!--<dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>-->
-
         <!-- rabbitmq 依赖jar包-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -123,12 +113,6 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>cn.com.ctop</groupId>
-            <artifactId>module-report</artifactId>
-            <version>2.0.2</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
             <groupId>com.bstek.ureport</groupId>
             <artifactId>ureport2-console</artifactId>
             <version>2.2.9</version>

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

@@ -1,7 +1,7 @@
 package org.jeecg;
 
+import cn.com.ctop.common.module.utils.SpringUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.jeecg.modules.excelutil.SpringUtils;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;

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

@@ -1,12 +1,12 @@
 package org.jeecg.modules.ctop.controller;
 
-import cn.com.ctop.bytedance.mapper.MaterialReportMapper;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
 import cn.com.ctop.common.module.utils.StringUtils;
+import cn.com.ctop.kuaishou.modules.report.mapper.MaterialReportMapper;
 import com.alibaba.excel.EasyExcelFactory;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.metadata.Sheet;

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

@@ -4,7 +4,6 @@ import cn.com.ctop.common.module.entity.BindAccountAuth;
 import cn.com.ctop.common.module.service.IBindAccountAuthService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.StringUtils;
-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;
@@ -15,26 +14,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
 
 import 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: 账号绑定-授权
@@ -220,72 +205,4 @@ public class BindAccountAuthController {
         }
         return result;
     }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<BindAccountAuth> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                BindAccountAuth bindAccountAuth = JSON.parseObject(deString, BindAccountAuth.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(bindAccountAuth, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<BindAccountAuth> pageList = bindAccountAuthService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "账号绑定-授权列表");
-        mv.addObject(NormalExcelConstants.CLASS, BindAccountAuth.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<BindAccountAuth> listBindAccountAuths = ExcelImportUtil.importExcel(file.getInputStream(), BindAccountAuth.class, params);
-                bindAccountAuthService.saveBatch(listBindAccountAuths);
-                return Result.ok("文件导入成功!数据行数:" + listBindAccountAuths.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 - 83
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountLoginController.java

@@ -6,7 +6,6 @@ import cn.com.ctop.common.module.mapper.UserAllocationMapper;
 import cn.com.ctop.common.module.service.IBindAccountLoginService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.StringUtils;
-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;
@@ -19,29 +18,15 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.service.ICreateInternalService;
-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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 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.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -257,72 +242,4 @@ public class BindAccountLoginController {
         }
         return result;
     }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<BindAccountLogin> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                BindAccountLogin bindAccountLogin = JSON.parseObject(deString, BindAccountLogin.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(bindAccountLogin, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<BindAccountLogin> pageList = bindAccountLoginService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "账号绑定-登陆列表");
-        mv.addObject(NormalExcelConstants.CLASS, BindAccountLogin.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<BindAccountLogin> listBindAccountLogins = ExcelImportUtil.importExcel(file.getInputStream(), BindAccountLogin.class, params);
-                bindAccountLoginService.saveBatch(listBindAccountLogins);
-                return Result.ok("文件导入成功!数据行数:" + listBindAccountLogins.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 - 294
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertiserPostController.java

@@ -1,294 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.service.IFileInfoService;
-import cn.com.ctop.common.module.utils.CtopAdConstant;
-import cn.com.ctop.common.module.utils.ResultMapUtils;
-import cn.com.ctop.common.module.utils.StatusCode;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import cn.com.ctop.toutiao.entity.ByteDanceCustomAudience;
-import cn.com.ctop.toutiao.entity.ByteDanceUserOrientationTemplate;
-import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
-import cn.com.ctop.toutiao.service.IByteDanceCreativeService;
-import cn.com.ctop.toutiao.service.IByteDanceCustomAudienceService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-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.modules.system.entity.SysDictItem;
-import org.jeecg.modules.system.service.ISysDictItemService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.text.ParseException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 头条广告主相关 2019年7月10日14:13:04
- *
- * @author 宋英豪
- */
-@Slf4j
-@RestController
-@RequestMapping("toutiao")
-public class ByteDanceAdvertiserPostController {
-    @Autowired
-    private IByteDanceAdvertiserDataService advertiserDataService;
-    @Autowired
-    private IByteDanceCreativeService creativeService;
-    @Autowired
-    private IFileInfoService fileInfoService;
-    @Autowired
-    private IByteDanceCustomAudienceService audienceService;
-    @Autowired
-    private ISysDictItemService sysDictItemService;
-
-    /**
-     * 1:获取广告主信息
-     *
-     * @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/info")
-    public Map<String, Object> advertiserInfo(String accountId) {
-        return advertiserDataService.getAdvertiserInfo(accountId);
-    }
-
-    /**
-     * 2:获取广告主广告计划信息
-     * @param accountId 本平台广告主id
-     */
-   /* @RequestMapping("/advertiser/plan/get")
-    public Map<String, Object> advertiserPlan(String accountId, String ids) {
-        return advertiserDataService.getAdvertiserPlan(accountId, ids, null);
-    }*/
-
-    /**
-     * 3:修改广告计划信息状态
-     * @param accountId 本平台广告主id
-     */
-    /*@RequestMapping("/advertiser/plan/update/status")
-    public Map<String, Object> advertiserPlanUpdateStatus(String accountId, String adIds, String optStatus) {
-        return advertiserDataService.advertiserPlanUpdateStatus(accountId, adIds, optStatus);
-    }*/
-
-    /**
-     * 3:修改广告计划信息
-     *
-     * @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/ad/update")
-    public Map<String, Object> advertiserAdUpdate(String accountId, Long adId, String optStatus) {
-        ByteDanceUserOrientationTemplate template = new ByteDanceUserOrientationTemplate();
-        return advertiserDataService.advertiserAdUpdate(accountId, adId, template);
-    }
-
-
-    /**
-     * 4:修改广告计划信息状态
-     * @param accountId 本平台广告主id
-     */
-   /* @RequestMapping("/advertiser/plan/update/bid")
-    public Map<String, Object> advertiserPlanUpdateBid(String accountId, String adIds, String bids) {
-        return advertiserDataService.advertiserPlanUpdateBid(accountId, adIds, bids);
-    }*/
-
-    /**
-     * 5:修改广告计划信息状态
-     * @param accountId 本平台广告主id
-     */
-    /*@RequestMapping("/advertiser/plan/update/budget")
-    public Map<String, Object> advertiserPlanUpdateBudget(String accountId, String adIds, String budgets) {
-        return advertiserDataService.advertiserPlanUpdateBudget(accountId, adIds, budgets);
-    }*/
-
-    /**
-     * 6:获取广告主广告预算信息
-     *
-     * @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/budget/get/")
-    public Map<String, Object> advertiserBudget(String accountId) {
-        return advertiserDataService.getAdvertiserBudget(accountId);
-    }
-
-    /**
-     * 7:获取广告主广告组信息
-     *
-     * @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/campaign/get")
-    public Map<String, Object> advertiserCampaign(String accountId, String ids) {
-        return advertiserDataService.getAdvertiserCampaign(accountId, ids, null);
-    }
-
-    /**
-     * 7:获取广告主广告组信息
-     *
-     * @param accountId 本平台广告主id
-     */
-    @GetMapping("/advertiser/campaign/list")
-    public Map<String, Object> advertiserCampaignList(String accountId) {
-        return advertiserDataService.getAdvertiserCampaignList(accountId);
-    }
-
-    /**
-     * 8:获取广告主广告创意信息
-     *
-     * @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/creative/get")
-    public Map<String, Object> getAdvertiserCreative(String accountId, String ids) {
-        return creativeService.getAdvertiserCreative(accountId, ids, null);
-    }
-
-    /**
-     * 9:修改广告创意信息状态
-     *
-     * @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/update/status/")
-    public Map<String, Object> advertiserCreativeUpdateStatus(String accountId, String creativeIds, String optStatus) {
-        return creativeService.advertiserCreativeUpdateStatus(accountId, creativeIds, optStatus);
-    }
-
-    /**
-     * 10:获取广告主广告创意素材信息
-     *
-     * @param accountId   本平台广告主id
-     * @param creativeIds 广告创意id
-     */
-    @RequestMapping("/advertiser/creative/material/read")
-    public Map<String, Object> advertiserCreativeMaterial(String accountId, String creativeIds) {
-        return advertiserDataService.getAdvertiserCreativeMaterial(accountId, creativeIds);
-    }
-
-    /**
-     * 12:广告组更新状态信息 @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/campaign/update/status")
-    public Map<String, Object> advertiserCampaignUpdateStatus(String accountId, String campaignIds, String optStatus) {
-        return advertiserDataService.advertiserCampaignUpdateStatus(accountId, campaignIds, optStatus);
-    }
-
-    /**
-     * 13:广告组更新信息 @param accountId 本平台广告主id
-     */
-    @RequestMapping("/advertiser/campaign/update")
-    public Map<String, Object> advertiserCampaignUpdate(String accountId, Long campaignId, String budgetMode, Integer budget, String campaignName) {
-        return advertiserDataService.advertiserCampaignUpdate(accountId, campaignId, budgetMode, budget, campaignName);
-    }
-
-    /**
-     * 14:获取人群包信息
-     */
-    @RequestMapping("/advertiser/custom/audience/select")
-    public Map<String, Object> customAudienceSelect(String accountId) {
-        return advertiserDataService.advertiserCustomAudienceSelect(accountId);
-    }
-
-    /**
-     * 14:获取流量包数据
-     */
-    @RequestMapping("/advertiser/custom/package/get")
-    public Map<String, Object> flowPackageGet(String accountId) {
-        return advertiserDataService.flowPackageGet(accountId);
-    }
-
-
-    /**
-     * 15:上传视频信息
-     *
-     * @param accountId 本平台广告主id
-     * @
-     */
-    @RequestMapping("/advertiser/video/add")
-    public Map<String, Object> advertiserVideoAdd(String accountId, String videoUrl) {
-        return fileInfoService.uploadVideoToBytedance(accountId, videoUrl);
-    }
-
-    /**
-     * 15:上传图片信息
-     *
-     * @param accountId 本平台广告主id
-     * @
-     */
-    @RequestMapping("/advertiser/image/add")
-    public Map<String, Object> advertiserImageAdd(String accountId, String imageUrl) {
-        return fileInfoService.uploadImageToBytedance(accountId, imageUrl);
-    }
-
-    /**
-     * @param audience
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     * @功能:查询字典数据
-     */
-    @RequestMapping(value = "/audience/list", method = RequestMethod.GET)
-    public Result<IPage<ByteDanceCustomAudience>> audiencePageList(ByteDanceCustomAudience audience, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                   @RequestParam(name = "pageSize", defaultValue = "100") Integer pageSize, HttpServletRequest req) {
-        Result<IPage<ByteDanceCustomAudience>> result = new Result<>();
-        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        audience.setAdvertiserId(user.getId());
-        QueryWrapper<ByteDanceCustomAudience> queryWrapper = QueryGenerator.initQueryWrapper(audience, req.getParameterMap());
-        queryWrapper.orderByAsc("sort_order");
-        Page<ByteDanceCustomAudience> page = new Page<>(pageNo, pageSize);
-        IPage<ByteDanceCustomAudience> pageList = audienceService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * @param sysDictItem
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     * @功能:查询字典数据
-     */
-    @RequestMapping(value = "dictitem/list", method = RequestMethod.GET)
-    public Result<IPage<SysDictItem>> dictitemPageList(SysDictItem sysDictItem, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                       @RequestParam(name = "pageSize", defaultValue = "100") Integer pageSize, HttpServletRequest req) {
-        Result<IPage<SysDictItem>> result = new Result<>();
-        QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
-        queryWrapper.orderByAsc("sort_order");
-        Page<SysDictItem> page = new Page<>(pageNo, pageSize);
-        IPage<SysDictItem> pageList = sysDictItemService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-
-    @GetMapping("loadSingleData")
-    public Map<String, Object> loadSingleData(Long accountId) {
-        Map<String, Object> result = new HashMap<>();
-        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId + "");
-        if (null != token && token.getMediaId() == CtopAdConstant.PLATFORM_TYPE_KUAISHOU) {
-            try {
-                kuaishouInterfaceService.loadKuaishouDataSingle(token);
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-        } else {
-            log.info("token异常");
-        }
-        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS.getCode());
-        return result;
-    }
-
-
-    @Autowired
-    private ICtopOauthTokenService tokenService;
-    @Autowired
-    private IKuaishouInterfaceService kuaishouInterfaceService;
-}

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

@@ -13,25 +13,19 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.ByteDanceCleanMaterialReport;
 import org.jeecg.modules.ctop.service.IByteDanceCleanMaterialReportService;
-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;
 
 /**
  * 头条-数据清洗
@@ -210,39 +204,4 @@ public class ByteDanceCleanMaterialReportController {
         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<ByteDanceCleanMaterialReport> listByteDanceCleanMaterialReports = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceCleanMaterialReport.class, params);
-                byteDanceCleanMaterialReportService.saveBatch(listByteDanceCleanMaterialReports);
-                return Result.ok("文件导入成功!数据行数:" + listByteDanceCleanMaterialReports.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("文件导入失败!");
-    }
-
 }

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

@@ -6,8 +6,9 @@ import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.service.IBindAccountLoginService;
 import cn.com.ctop.common.module.service.IFileInfoService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
-import cn.com.ctop.toutiao.entity.*;
-import cn.com.ctop.toutiao.service.*;
+import cn.com.ctop.toutiao.modules.material.entity.ByteDanceAdvertisePlan;
+import cn.com.ctop.toutiao.modules.material.entity.ByteDanceCampaign;
+import cn.com.ctop.toutiao.modules.material.service.*;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -36,89 +37,11 @@ public class ByteDanceTemplateController {
     @Autowired
     private IUserAllocationService userAllocationService;
     @Autowired
-    private IBytedanceUrlInfoService urlInfoService;
-    @Autowired
     private IFileInfoService fileInfoService;
     @Autowired
     private IByteDanceAdvertisePlanService planService;
     @Autowired
     private IByteDanceCampaignService campaignService;
-    @Autowired
-    private IByteDanceUserOrientationTemplateService orientationTemplateService;
-    @Autowired
-    private IByteDanceCampaignTemplateService campaignTemplateService;
-    @Autowired
-    private IByteDanceBudgetTemplateService budgetTemplateService;
-    @Autowired
-    private IBytedanceDeliveryTargetTemplateService deliveryTargetTemplateService;
-    @Autowired
-    private IBytedanceAdvertisePlanTemplateService advertisePlanTemplateService;
-
-    /**
-     * 广告组模板
-     *
-     * @param template 广告组模板信息
-     * @return map
-     */
-    @PostMapping("campaign/insert")
-    public Map<String, Object> campaignTemplateInsert(@RequestBody ByteDanceCampaignTemplate template) {
-        return campaignTemplateService.insertTemplate(template);
-    }
-
-    /**
-     * 智能封面
-     *
-     * @param accountId 广告主id
-     * @param videoId 视频id
-     * @return map
-     */
-    @GetMapping("cover/suggest")
-    public Map<String, Object> suggestCover(String accountId, String videoId) {
-        return campaignTemplateService.getSuggestCover(accountId, videoId);
-    }
-
-    /**
-     * 预算与出价模板
-     *
-     * @param template 预算与出价模板信息
-     * @return map
-     */
-    @PostMapping("budget/insert")
-    public Map<String, Object> budgetTemplateInsert(@RequestBody ByteDanceBudgetTemplate template) {
-        return budgetTemplateService.insertTemplate(template);
-    }
-
-    /**
-     * 投放目标
-     *
-     * @param template 投放目标信息
-     * @return map
-     */
-    @PostMapping("deliverytarget/insert")
-    public Map<String, Object> diliverytargetTemplateInsert(@RequestBody BytedanceDeliveryTargetTemplate template) {
-        return deliveryTargetTemplateService.insertTemplate(template);
-    }
-
-    /**
-     * 获取投放目标信息
-     *
-     * @param targetId 投放目标id
-     * @return map
-     */
-    @GetMapping("deliveryTarget/get")
-    public Map<String, Object> diliverytargetTemplateGet(Long targetId) {
-        return deliveryTargetTemplateService.get(targetId);
-    }
-
-    /**
-     * 广告创意创建
-     * @param template 广告创意信息
-     * @return map
-     */
-    @PostMapping("creative/insert")
-    public Map<String, Object> creativeInsert(@RequestBody JSONObject template) {
-        return creativeService.insertBatch(template);
-    }
 
     /**
      * 获取快手授权用户信息列表
@@ -172,76 +95,6 @@ public class ByteDanceTemplateController {
         return result;
     }
 
-    /**
-     * 用户定向
-     *
-     * @param template
-     * @param req
-     * @return
-     */
-    @PostMapping("userorentation/insert")
-    public Map<String, Object> userOrentationTemplateInsert(@RequestBody JSONObject template, HttpServletRequest req) {
-        return orientationTemplateService.insertTemplate(template);
-    }
-
-    /**
-     * 链接信息
-     *
-     * @param urlInfo
-     * @param req
-     * @return
-     */
-    @PostMapping("link/insert")
-    public Map<String, Object> linkInsert(@RequestBody BytedanceUrlInfo urlInfo, HttpServletRequest req) {
-        return urlInfoService.insertLink(urlInfo);
-    }
-
-    /**
-     * 广告计划模板
-     * 方法废弃
-     *
-     * @param template
-     * @param req
-     * @return
-     */
-    @PostMapping("advertiserplan/insert")
-    public Map<String, Object> advertiserplanTemplateInsert(@RequestBody BytedanceAdvertisePlanTemplate template, String accountId, HttpServletRequest req) {
-        return advertisePlanTemplateService.insertTemplate(template, accountId);
-    }
-
-    /**
-     * 用户定向模板列表
-     *
-     * @param template
-     * @param req
-     * @return
-     */
-    @PostMapping("userorentation/list")
-    public Result<IPage<ByteDanceUserOrientationTemplate>> userOrentationTemplateList(ByteDanceUserOrientationTemplate template, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
-        return orientationTemplateService.getList(template, pageNo, pageSize, req);
-    }
-
-    /**
-     * 预算与出价模板
-     *
-     * @param template
-     * @param req
-     * @return
-     */
-    @PostMapping("budget/list")
-    public Result<IPage<ByteDanceBudgetTemplate>> budgetTemplateList(ByteDanceBudgetTemplate template, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
-        return budgetTemplateService.getList(template, pageNo, pageSize, req);
-    }
-
-    /**
-     * 广告组模板
-     *
-     * @return
-     */
-    @PostMapping("campaign/list")
-    public Result<IPage<ByteDanceCampaignTemplate>> campaignTemplateList(ByteDanceCampaignTemplate template, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
-        return campaignTemplateService.getList(template, pageNo, pageSize, req);
-    }
 
     /**
      * @param pageNo
@@ -263,35 +116,6 @@ public class ByteDanceTemplateController {
         return result;
     }
 
-    /**
-     * @param accountId
-     * @return 查询计划可用转化id
-     */
-    @GetMapping(value = "convert/list")
-    public Map<String, Object> convertPageList(Long accountId, Long targetId) {
-        return planService.getAdConvertList(accountId, targetId);
-    }
-
-    /**
-     * @param accountId
-     * @param urlId     链接id
-     * @return 查询计划可用转化id
-     */
-    @GetMapping(value = "convert/list/url")
-    public Map<String, Object> convertListByUrlId(Long accountId, Long urlId) {
-        return planService.getAdConvertListByUrlId(accountId, urlId);
-    }
-
-    /**
-     * @param bindAccountId 绑定账号id
-     * @param urlId         链接id
-     * @return 查询计划可用转化id
-     */
-    @GetMapping(value = "convert/list/url/ng")
-    public Map<String, Object> convertListByBindAccountId(Long bindAccountId, Long urlId) {
-        return planService.getAdConvertListByUrlIdAndBindId(bindAccountId, urlId);
-    }
-
     @Autowired
     private ISysCategoryService sysCategoryService;
 
@@ -324,18 +148,6 @@ public class ByteDanceTemplateController {
         return result;
     }
 
-    /**
-     * 投放目标
-     *
-     * @param template
-     * @param req
-     * @return
-     */
-    @PostMapping("deliverytarget/list")
-    public Result<IPage<BytedanceDeliveryTargetTemplate>> diliverytargetTemplateList(BytedanceDeliveryTargetTemplate template, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
-        return deliveryTargetTemplateService.getList(template, pageNo, pageSize, req);
-    }
-
     @PostMapping("video/upload")
     public Map<String, Object> videoUpload(MultipartFile file) {
         return new HashMap<>();

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

@@ -1,164 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.ctop.entity.BytedanceFundDaily;
-import org.jeecg.modules.ctop.service.IBytedanceFundDailyService;
-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-04-08
- */
-@Slf4j
-@Api(tags = "账号日流水信息")
-@RestController
-@RequestMapping("/ctop/bytedanceFundDaily")
-public class BytedanceFundDailyController {
-    @Autowired
-    private IBytedanceFundDailyService bytedanceFundDailyService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param bytedanceFundDaily
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "账号日流水信息-分页列表查询")
-    @ApiOperation(value = "账号日流水信息-分页列表查询", notes = "账号日流水信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<BytedanceFundDaily>> queryPageList(BytedanceFundDaily bytedanceFundDaily,
-                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                           HttpServletRequest req) {
-        Result<IPage<BytedanceFundDaily>> result = new Result<IPage<BytedanceFundDaily>>();
-        QueryWrapper<BytedanceFundDaily> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceFundDaily, req.getParameterMap());
-        Page<BytedanceFundDaily> page = new Page<BytedanceFundDaily>(pageNo, pageSize);
-        IPage<BytedanceFundDaily> pageList = bytedanceFundDailyService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param bytedanceFundDaily
-     * @return
-     */
-    @AutoLog(value = "账号日流水信息-添加")
-    @ApiOperation(value = "账号日流水信息-添加", notes = "账号日流水信息-添加")
-    @PostMapping(value = "/add")
-    public Result<BytedanceFundDaily> add(@RequestBody BytedanceFundDaily bytedanceFundDaily) {
-        Result<BytedanceFundDaily> result = new Result<BytedanceFundDaily>();
-        try {
-            bytedanceFundDailyService.save(bytedanceFundDaily);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param bytedanceFundDaily
-     * @return
-     */
-    @AutoLog(value = "账号日流水信息-编辑")
-    @ApiOperation(value = "账号日流水信息-编辑", notes = "账号日流水信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<BytedanceFundDaily> edit(@RequestBody BytedanceFundDaily bytedanceFundDaily) {
-        Result<BytedanceFundDaily> result = new Result<BytedanceFundDaily>();
-        BytedanceFundDaily bytedanceFundDailyEntity = bytedanceFundDailyService.getById(bytedanceFundDaily.getId());
-        if (bytedanceFundDailyEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = bytedanceFundDailyService.updateById(bytedanceFundDaily);
-            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 {
-            bytedanceFundDailyService.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<BytedanceFundDaily> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<BytedanceFundDaily> result = new Result<BytedanceFundDaily>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.bytedanceFundDailyService.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<BytedanceFundDaily> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<BytedanceFundDaily> result = new Result<BytedanceFundDaily>();
-        BytedanceFundDaily bytedanceFundDaily = bytedanceFundDailyService.getById(id);
-        if (bytedanceFundDaily == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(bytedanceFundDaily);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-}

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

@@ -1,6 +1,5 @@
 package org.jeecg.modules.ctop.controller;
 
-import cn.com.ctop.bytedance.service.IReportService;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.UserAllocationMapper;
@@ -10,7 +9,8 @@ import cn.com.ctop.common.module.utils.*;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.material.entity.KuaishouAccessToken;
 import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResultToken;
-import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
+import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
+import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang.StringUtils;

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.ctop.controller;
 import cn.com.ctop.common.module.entity.MaterialImageInfo;
 import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.common.module.mapper.MaterialInfoMapper;
+import cn.com.ctop.common.module.mapper.SysRoleMapper;
 import cn.com.ctop.common.module.service.IMaterialImageInfoService;
 import cn.com.ctop.common.module.service.IMaterialInfoService;
 import cn.com.ctop.common.module.utils.Check;
@@ -61,6 +62,8 @@ public class MaterialImageInfoController {
     @Autowired
     private IMaterialInfoService materialInfoService;
     @Autowired
+    private SysRoleMapper sysRoleMapper;
+    @Autowired
     private MaterialInfoMapper materialInfoMapper;
     @Autowired
     private IProjectMemberService memberService;
@@ -79,7 +82,7 @@ public class MaterialImageInfoController {
         Object createTime = materialImageInfo.getCreateTime();
         materialImageInfo.setCreateTime(null);
         if (!Check.isNull(materialImageInfo.getUserId())) {
-            String roleCode = materialInfoService.getRoleCodeByUserId(materialImageInfo.getUserId());
+            String roleCode = sysRoleMapper.getRoleCodeByUserId(materialImageInfo.getUserId());
             if ("admin".equals(roleCode) || "operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "operationAssistant".equals(roleCode) || "touTiaoOperationManager".equals(roleCode) || "sale".equals(roleCode) || "saleDirector".equals(roleCode)) {
                 materialImageInfo.setUserId(null);
                 queryWrapper = QueryGenerator.initQueryWrapper(materialImageInfo, req.getParameterMap());

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

@@ -62,6 +62,8 @@ public class MaterialInfoController {
     @Autowired
     private IMaterialInfoService materialInfoService;
     @Autowired
+    private ISysRoleService sysRoleService;
+    @Autowired
     private IMaterialAscriptionService materialAscriptionService;
     @Autowired
     private IMaterialParameterService materialParameterService;
@@ -176,7 +178,7 @@ public class MaterialInfoController {
         Object createTime = materialInfo.getCreateTime();
         materialInfo.setCreateTime(null);
         if (!Check.isNull(materialInfo.getUserId())) {
-            String roleCode = materialInfoService.getRoleCodeByUserId(materialInfo.getUserId());
+            String roleCode = sysRoleService.getRoleCodeByUserId(materialInfo.getUserId());
             if ("admin".equals(roleCode) || "operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "operationAssistant".equals(roleCode) || "touTiaoOperationManager".equals(roleCode) || "sale".equals(roleCode) || "saleDirector".equals(roleCode)) {
                 materialInfo.setUserId(null);
                 queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());

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

@@ -1,10 +1,9 @@
 package org.jeecg.modules.ctop.controller;
 
-
-import cn.com.ctop.bytedance.mapper.MaterialReportMapper;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.kuaishou.modules.report.mapper.MaterialReportMapper;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

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

@@ -1,7 +1,7 @@
 package org.jeecg.modules.ctop.controller;
 
-import cn.com.ctop.bytedance.mapper.MaterialReportMapper;
 import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.kuaishou.modules.report.mapper.MaterialReportMapper;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

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

@@ -1,764 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import cn.com.ctop.bytedance.entity.BytedancePlanDailyReport;
-import cn.com.ctop.bytedance.service.IBytedancePlanDailyReportService;
-import cn.com.ctop.bytedance.service.IBytedancePlanHourlyReportService;
-import cn.com.ctop.bytedance.service.IReportService;
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.entity.UserAllocation;
-import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
-import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.service.IUserAllocationService;
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.common.module.utils.CtopAdConstant;
-import cn.com.ctop.common.module.utils.ResultMapUtils;
-import cn.com.ctop.common.module.utils.StatusCode;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCampaignService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouDailyReportTaskService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouHistoryReportTaskService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
-import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.ctop.service.ICleanMaterialService;
-import org.jeecg.modules.ctop.service.ICreateInternalService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import static org.jeecg.common.util.DateUtils.getAnotherDay;
-
-/**
- * @author jeecg-boot
- */
-@RestController
-@RequestMapping("/test")
-@Slf4j
-public class TestController {
-    @Autowired
-    private ICreateInternalService createInternalService;
-    @Autowired
-    private IKuaishouWebInterfaceService kuaishouWebInterfaceService;
-
-    @Autowired
-    private CtopOauthTokenMapper oauthTokenMapper;
-    @Autowired
-    private IKuaiShouHistoryReportTaskService historyReportTaskService;
-
-    @PostMapping(value = "/create")
-    public Map<String, Object> authorization(@RequestBody JSONObject jsonObject) {
-        return createInternalService.createInternal(jsonObject);
-    }
-
-    @GetMapping(value = "/t")
-    public String test() {
-        Result<String> result = new Result<String>();
-        try {
-            String requestId = UUID.randomUUID().toString();
-            String img = kuaishouWebInterfaceService.qrLogin(requestId);
-            if (img != null) {
-                result.setSuccess(true);
-                result.setResult(img);
-            } else {
-                result.setSuccess(false);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result.setSuccess(false);
-        }
-        return "success";
-    }
-
-
-    @Autowired
-    private CtopOauthTokenMapper tokenMapper;
-    @Autowired
-    private IKuaishouInterfaceService kuaishouInterfaceService;
-
-
-    @GetMapping(value = "/createTask")
-    public String createTask(Long accountId) {
-        Result<String> result = new Result<String>();
-        try {
-            QueryWrapper<CtopOauthToken> oauthTokenQueryWrapper = new QueryWrapper<>();
-            oauthTokenQueryWrapper.eq("media_id", 2);
-            oauthTokenQueryWrapper.eq("account_id", accountId);
-            oauthTokenQueryWrapper.last("limit 1");
-            CtopOauthToken token = oauthTokenMapper.selectOne(oauthTokenQueryWrapper);
-            String endDateStr = DateUtils.getDate("yyyy-MM-dd");
-            String startDate = DateUtils.addMonth(endDateStr, -6);
-            historyReportTaskService.createTask(token.getAccountId(), token.getAccessToken(), startDate, endDateStr, CtopAdConstant.KUAISHOU_LOAD_JOB_TYPE_HISTORY);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            result.setSuccess(false);
-        }
-        return "success";
-    }
-
-
-    @GetMapping(value = "/getHistoryData")
-    public String getHistoryData() {
-        Result<String> result = new Result<String>();
-        try {
-            String endDateStr = DateUtils.getDate("yyyy-MM-dd");
-            String startDate = DateUtils.addMonth(endDateStr, -6);
-            QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
-            tokenQueryWrapper.eq("media_id", 2);
-            List<CtopOauthToken> ctopOauthTokens = oauthTokenMapper.selectList(tokenQueryWrapper);
-            if (!Check.isNull(ctopOauthTokens)) {
-                for (CtopOauthToken token : ctopOauthTokens) {
-                    historyReportTaskService.createTask(token.getAccountId(), token.getAccessToken(), startDate, endDateStr, CtopAdConstant.KUAISHOU_LOAD_JOB_TYPE_HISTORY);
-                }
-
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result.setSuccess(false);
-        }
-        return "success";
-    }
-
-
-    @GetMapping(value = "/getTaskList")
-    public String getTaskList() {
-        Result<String> result = new Result<String>();
-        try {
-            String endDateStr = DateUtils.getDate("yyyy-MM-dd");
-            String startDate = DateUtils.addMonth(endDateStr, -6);
-            QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
-            tokenQueryWrapper.eq("media_id", 2);
-            historyReportTaskService.getTaskList();
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            result.setSuccess(false);
-        }
-        return "success";
-    }
-
-    @GetMapping(value = "/getGroupData")
-    public String getGroupData() {
-
-
-        Date endDate = new Date();
-        QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
-        tokenQueryWrapper.eq("media_id", 2);
-        List<CtopOauthToken> ctopOauthTokens = tokenMapper.selectList(tokenQueryWrapper);
-        for (CtopOauthToken token : ctopOauthTokens) {
-
-
-            for (int i = 0; i < 7; i++) {
-                Date getStartDate = DateUtils.addDay(endDate, -i);
-                //3:获取广告组信息数据
-                kuaishouInterfaceService.getAdvertiserGroupReportHourly(token, getStartDate, getStartDate);
-            }
-            for (int i = 0; i < 6; i++) {
-                Date getStartDate = new Date();
-                Date getEndDate = new Date();
-                if (i == 0) {
-                    getStartDate = DateUtils.addDay(endDate, -175 + i * 30);
-                    getEndDate = DateUtils.addDay(endDate, -150 + i * 30);
-                } else {
-                    getStartDate = DateUtils.addDay(endDate, -180 + i * 30);
-                    getEndDate = DateUtils.addDay(endDate, -150 + i * 30);
-                }
-                //3:获取广告组信息数据
-                kuaishouInterfaceService.getAdvertiserGroupReportDaily(token, getStartDate, getEndDate);
-            }
-        }
-        return "Success";
-    }
-
-    static ExecutorService executorService = Executors.newFixedThreadPool(10);
-
-
-    @GetMapping(value = "/gerCreative")
-    public void gerCreative() {
-        QueryWrapper<CtopOauthToken> oauthTokenQueryWrapper = new QueryWrapper<>();
-        oauthTokenQueryWrapper.eq("media_id", 2);
-        List<CtopOauthToken> ctopOauthTokens = oauthTokenMapper.selectList(oauthTokenQueryWrapper);
-        for (CtopOauthToken token : ctopOauthTokens) {
-            executorService.submit(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        kuaishouInterfaceService.getCreativeList(token, null, null);
-                        //  kuaishouInterfaceService.getVideoList2(token, null, null,1);
-                        //3: 获取图片信息数据
-                        // kuaishouInterfaceService.getImageList2(token, null, null,1);
-                        Thread.sleep(1 * 200);
-                        //  kuaishouInterfaceService.getAppList(token.getAccountId(), token.getAccessToken());
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            });
-        }
-
-    }
-
-    @GetMapping("checkFile")
-    public Map<String, Object> checkFile() {
-        String nowDate = DateUtils.getDate("yyyy-MM-dd");
-        String statDate = getAnotherDay("yyyy-MM-dd", nowDate, -1);
-        //  查询快手token
-        List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_KUAISHOU);
-        if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取快手数据异常:未获取到可用的token");
-        }
-        for (CtopOauthToken token : tokens) {
-            dailyReportTaskService.getTaskList(token.getAccountId(), token.getAccessToken(), statDate);
-        }
-        Map<String, Object> result = new HashMap<>();
-        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
-        return result;
-    }
-
-    @Autowired
-    private IKuaiShouDailyReportTaskService dailyReportTaskService;
-
-
-    @Autowired
-    private IKuaiShouCampaignService campaignService;
-
-
-    @GetMapping("loadBytedanceHistoryData")
-    public Map<String, Object> loadBytedanceHistoryData() {
-        Map<String, Object> result = new HashMap<>();
-        //1:查询所有头条的token数据
-        List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
-        if (null != tokens && tokens.size() > 0) {
-            tokens.forEach(token -> {
-                //拉取往期数据
-                executorService.submit(new Runnable() {
-                    @Override
-                    public void run() {
-                        reportService.loadBytedanceHistoryData(token);
-                    }
-                });
-            });
-        }
-        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
-        return result;
-    }
-
-
-    @Autowired
-    private IUserAllocationService userAllocationService;
-
-
-    public static void main(String[] args) throws ParseException {
-        String date = DateUtils.getDate("yyyy-MM-dd");
-        String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", date, -1);
-    }
-
-
-    @GetMapping(value = "/getPlanAndGroupByAccount")
-    public void getPlanAndGroupByAccount(Long accountId) {
-        QueryWrapper<CtopOauthToken> oauthTokenQueryWrapper = new QueryWrapper<>();
-        oauthTokenQueryWrapper.eq("media_id", 2);
-        oauthTokenQueryWrapper.eq("account_id", accountId);
-        oauthTokenQueryWrapper.last("limit 1");
-        CtopOauthToken token = oauthTokenMapper.selectOne(oauthTokenQueryWrapper);
-        try {
-            kuaishouInterfaceService.getCampaignList(token, null, null);
-            //1:获取全量广告组数据
-            kuaishouInterfaceService.getGroupList(token, null, null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-
-    }
-
-
-    @GetMapping(value = "/getCreativeByAccount")
-    public void gerCreative(Long accountId) {
-        QueryWrapper<CtopOauthToken> oauthTokenQueryWrapper = new QueryWrapper<>();
-        oauthTokenQueryWrapper.eq("media_id", 2);
-        oauthTokenQueryWrapper.eq("account_id", accountId);
-        oauthTokenQueryWrapper.last("limit 1");
-        CtopOauthToken token = oauthTokenMapper.selectOne(oauthTokenQueryWrapper);
-
-        try {
-            kuaishouInterfaceService.getCreativeList(token, null, null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-
-    }
-
-
-    @Autowired
-    private IBytedancePlanDailyReportService planDailyReportService;
-    @Autowired
-    private ICtopOauthTokenService tokenService;
-
-    @GetMapping("loadBytedanceData")
-    public Map<String, Object> formatZybData(String date) {
-        Map<String, Object> result = new HashMap<>();
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        Date getDate = null;
-        try {
-            getDate = simpleDateFormat.parse(date);
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        //1:查询当日数据
-        QueryWrapper<UserAllocation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("project_id", 215);
-        List<UserAllocation> allocations = userAllocationService.list(queryWrapper);
-        if (null == allocations || allocations.size() <= 0) {
-            log.info("定时获取头条数据异常:获取用户信息失败");
-        }
-        Date finalGetDate = getDate;
-
-        allocations.forEach(allocation -> {
-            //3:获取广告计划信息数据
-            CtopOauthToken token = oauthTokenMapper.selectByAccountId(allocation.getAccountId());
-            reportService.getAdvertiserPlanReport(token, finalGetDate, finalGetDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
-        });
-
-        //清洗关于作业帮数据
-        //1:查询作业帮相关的用户数据
-        allocations.forEach(allocation -> {
-            //根据accountId和时间,查询相关的日报表信息
-            QueryWrapper<BytedancePlanDailyReport> reportQueryWrapper = new QueryWrapper<>();
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-            String dateString = dateFormat.format(finalGetDate) + " 00:00:00";
-            queryWrapper.eq("advertiser_id", allocation.getAccountId())
-                    .eq("stat_datetime", dateString)
-            ;
-            List<BytedancePlanDailyReport> bytedancePlanDailyReports = planDailyReportService.list(reportQueryWrapper);
-            if (null != bytedancePlanDailyReports && bytedancePlanDailyReports.size() > 0) {
-                bytedancePlanDailyReports.forEach(report -> {
-                    String adName = report.getAdName();
-                    String[] tags = adName.split("-");
-                    report.setAdsense(tags[1]);
-                    report.setPlanCode(tags[2]);
-                    String materialName = tags[3];
-                    report.setMaterialName(materialName);
-                    if (materialName.contains("其他")) {
-                        report.setMaterialType("其他");
-                    } else if (materialName.contains("图片轮播")) {
-                        report.setMaterialType("图片轮播");
-                    } else if (materialName.contains("大字报")) {
-                        report.setMaterialType("大字报");
-                    } else if (materialName.contains("文字动画")) {
-                        report.setMaterialType("文字动画");
-                    } else if (materialName.contains("采访形式")) {
-                        report.setMaterialType("采访形式");
-                    } else if (materialName.contains("剧情")) {
-                        report.setMaterialType("剧情");
-                    } else if (materialName.contains("口播")) {
-                        report.setMaterialType("口播");
-                    } else {
-                        report.setMaterialType("其他");
-                    }
-                    planDailyReportService.updateById(report);
-                });
-            }
-        });
-        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
-        return result;
-    }
-
-    @Autowired
-    private IByteDanceAdvertiserDataService advertiserDataService;
-
-    @GetMapping("getBytedanceData")
-    public Map<String, Object> getBytedanceData() {
-        Map<String, Object> result = new HashMap<>();
-        //1:查询当日数据
-        List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
-        if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取头条数据异常:为获取到可用的token");
-        }
-        tokens.forEach(token -> {
-            advertiserDataService.getMaterialList(token);
-        });
-        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
-        return result;
-    }
-
-    @GetMapping("formatZybData")
-    public Map<String, Object> formatZybData() {
-        //清洗关于作业帮数据
-        //1:查询作业帮相关的用户数据
-        QueryWrapper<UserAllocation> wrapper = new QueryWrapper<>();
-        wrapper.eq("project_id", 215);
-        List<UserAllocation> allocations = userAllocationService.list(wrapper);
-        if (null != allocations && allocations.size() > 0) {
-            allocations.forEach(allocation -> {
-                //根据accountId和时间,查询相关的日报表信息
-                QueryWrapper<BytedancePlanDailyReport> queryWrapper = new QueryWrapper<>();
-                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-//                String dateString = dateFormat.format(getDate)+" 00:00:00";
-                queryWrapper.eq("advertiser_id", allocation.getAccountId())
-//                        .eq("stat_datetime",dateString)
-                ;
-                List<BytedancePlanDailyReport> bytedancePlanDailyReports = planDailyReportService.list(queryWrapper);
-                if (null != bytedancePlanDailyReports && bytedancePlanDailyReports.size() > 0) {
-                    bytedancePlanDailyReports.forEach(report -> {
-                        String adName = report.getAdName();
-                        String[] tags = adName.split("-");
-                        report.setAdsense(tags[1]);
-                        report.setPlanCode(tags[2]);
-                        String materialName = tags[3];
-                        report.setMaterialName(materialName);
-                        if (materialName.contains("其他")) {
-                            report.setMaterialType("其他");
-                        } else if (materialName.contains("图片轮播")) {
-                            report.setMaterialType("图片轮播");
-                        } else if (materialName.contains("大字报")) {
-                            report.setMaterialType("大字报");
-                        } else if (materialName.contains("文字动画")) {
-                            report.setMaterialType("文字动画");
-                        } else if (materialName.contains("采访形式")) {
-                            report.setMaterialType("采访形式");
-                        } else if (materialName.contains("剧情")) {
-                            report.setMaterialType("剧情");
-                        } else if (materialName.contains("口播")) {
-                            report.setMaterialType("口播");
-                        } else {
-                            report.setMaterialType("其他");
-                        }
-                        planDailyReportService.updateById(report);
-                    });
-                }
-            });
-        }
-        Map<String, Object> result = new HashMap<>();
-        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
-        return result;
-    }
-
-    @Autowired
-    private IReportService reportService;
-
-    @GetMapping("bytedanceHourReport")
-    public Map<String, Object> bytedanceHourReport() {
-        Map<String, Object> result = new HashMap<>();
-        log.info("头条时报数据获取开始");
-        Date getDate = new Date();
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH");
-        String hour = simpleDateFormat.format(getDate);
-        if (null != hour && "00".equals(hour)) {
-            getDate = DateUtils.addDay(getDate, -1);
-        }
-        //1:查询当日数据
-        List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
-        if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取头条小时数据异常:未获取到可用的token");
-            ResultMapUtils.setResultMap(result, StatusCode.COMMON_PARAM_ERROR);
-            return result;
-        }
-        executorService = Executors.newFixedThreadPool(4);
-        Date finalGetDate = getDate;
-        tokens.forEach(token -> {
-            executorService.submit(new Runnable() {
-                @Override
-                public void run() {
-                    reportService.getAdvertiserReport(token, finalGetDate, finalGetDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_HOURLY);
-                }
-            });
-        });
-        log.info("头条时报数据获取结束");
-        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
-        return result;
-    }
-
-    //线程计数器
-    static CountDownLatch countDownLatch = null;
-
-    @GetMapping("getHourLyYddData")
-    public Map<String, Object> getData() {
-        log.info("头条时报数据获取开始");
-        Date getDate = new Date();
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH");
-        String hour = simpleDateFormat.format(getDate);
-        if (null != hour && "00".equals(hour)) {
-            getDate = DateUtils.addDay(getDate, -1);
-        }
-        //1:查询当日计划时报数据
-        List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
-        Date finalGetDate = getDate;
-        executorService = Executors.newFixedThreadPool(10);
-        countDownLatch = new CountDownLatch(tokens.size());
-        tokens.forEach(token -> {
-            //1:获取当日广告计划数据
-            executorService.submit(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        reportService.getAdvertiserPlanReport(token, finalGetDate, finalGetDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_HOURLY);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    } finally {
-                        countDownLatch.countDown();
-                    }
-                }
-            });
-        });
-        try {
-            countDownLatch.await();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        log.info("头条计划时报数据获取完成");
-        Map<String, Object> result = new HashMap<>();
-        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
-        return result;
-    }
-
-    @GetMapping("formatYzData")
-    public Map<String, Object> formatYzData() {
-        Map<String, Object> result = new HashMap<>();
-        planDailyReportService.cleanYzData(151);
-        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
-        return result;
-    }
-
-    @Autowired
-    private IBytedancePlanHourlyReportService planHourlyReportService;
-
-    @GetMapping("loadCreativeData")
-    public Map<String, Object> loadCreaticeData() {
-        Map<String, Object> result = new HashMap<>();
-        List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
-        log.info("头条创意素材数据开始获取");
-        //查询当日数据
-        if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取头条数据异常:wei获取到可用的token");
-            ResultMapUtils.setResultMap(result, StatusCode.COMMON_SERVER_ERROR);
-            return result;
-        }
-        executorService = Executors.newFixedThreadPool(20);
-        countDownLatch = new CountDownLatch(tokens.size());
-        tokens.forEach(token -> {
-            executorService.submit(new Runnable() {
-                @Override
-                public void run() {
-                    // 获取广告创意信息数据
-                    try {
-                        advertiserDataService.getAdvertiserCreative(token, null);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    } finally {
-                        countDownLatch.countDown();
-                    }
-                }
-            });
-        });
-        try {
-            countDownLatch.await();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        log.info("头条创意素材数据获取完成");
-        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
-        return result;
-    }
-
-    @GetMapping("loadCreaticeReportData")
-    public Map<String, Object> loadCreaticeReportData() {
-        Map<String, Object> result = new HashMap<>();
-        List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
-        for (int i = 51; i < 180; i++) {
-            Date getDate = DateUtils.addDay(new Date(), -i);
-            log.info(DateUtils.formatDate(getDate) + "头条创意日报数据开始获取");
-            //查询当日数据
-            if (null == tokens || tokens.size() <= 0) {
-                log.info("定时获取头条数据异常:为获取到可用的token");
-                continue;
-            }
-            executorService = Executors.newFixedThreadPool(10);
-            countDownLatch = new CountDownLatch(tokens.size());
-            tokens.forEach(token -> {
-                executorService.submit(new Runnable() {
-                    @Override
-                    public void run() {
-                        //获取广告创意日报信息数据
-                        try {
-                            reportService.getAdvertiserCreativeReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        } finally {
-                            countDownLatch.countDown();
-                        }
-                    }
-                });
-            });
-            try {
-                countDownLatch.await();
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            log.info(DateUtils.formatDate(getDate) + "头条创意日报数据获取完成");
-        }
-        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
-        return result;
-    }
-
-    @GetMapping("loadVideoData")
-    public Map<String, Object> loadVideoData() {
-        log.info("素材数据获取开始");
-        //1:查询当日计划时报数据
-        List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
-        executorService = Executors.newFixedThreadPool(10);
-        countDownLatch = new CountDownLatch(tokens.size());
-        tokens.forEach(token -> {
-            //1:获取当日广告计划数据
-            executorService.submit(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        advertiserDataService.getMaterialList(token);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    } finally {
-                        countDownLatch.countDown();
-                    }
-                }
-            });
-        });
-        try {
-            countDownLatch.await();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        log.info("头条素材数据获取完成");
-        Map<String, Object> result = new HashMap<>();
-        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
-        return result;
-    }
-
-
-    @Autowired
-    private ICleanMaterialService cleanMaterialService;
-
-    @GetMapping("testReport")
-    public void testReport() {
-        List<String> signatureList = cleanMaterialService.getSignature();
-        if (Check.isNull(signatureList)) {
-            log.error("素材数据获取为空");
-            return;
-        }
-        executorService = Executors.newFixedThreadPool(5);
-        for (int i = 0; i < signatureList.size(); i++) {
-            String signature = signatureList.get(i);
-            executorService.submit(new Runnable() {
-                @Override
-                public void run() {
-                    cleanMaterialService.calculationReport(signature);
-                }
-            });
-        }
-
-
-    }
-
-    @GetMapping(value = "/AccountReportByAccount")
-    public void AccountReportByAccount(Long accountId, String startDateStr, String endDateStr) {
-        QueryWrapper<CtopOauthToken> oauthTokenQueryWrapper = new QueryWrapper<>();
-        oauthTokenQueryWrapper.eq("media_id", 2);
-        oauthTokenQueryWrapper.eq("account_id", accountId);
-        oauthTokenQueryWrapper.last("limit 1");
-        CtopOauthToken token = oauthTokenMapper.selectOne(oauthTokenQueryWrapper);
-        executorService.submit(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                    Date startDate = null;
-                    Date endDate = null;
-                    try {
-                        startDate = simpleDateFormat.parse(startDateStr);
-                        endDate = simpleDateFormat.parse(endDateStr);
-                    } catch (ParseException e) {
-                        e.printStackTrace();
-                    }
-                    kuaishouInterfaceService.getAdvertiserReportDaily(token, startDate, endDate);
-
-                    Thread.sleep(1 * 200);
-                    //  kuaishouInterfaceService.getAppList(token.getAccountId(), token.getAccessToken());
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        });
-    }
-
-
-    @GetMapping(value = "/getAllCreativeList")
-    public void getAllCreativeList() {
-
-        try {
-
-
-            QueryWrapper<CtopOauthToken> oauthTokenQueryWrapper = new QueryWrapper<>();
-            oauthTokenQueryWrapper.eq("media_id", 2);
-            List<CtopOauthToken> ctopOauthTokens = oauthTokenMapper.selectList(oauthTokenQueryWrapper);
-
-            if (!Check.isNull(ctopOauthTokens)) {
-                for (CtopOauthToken token : ctopOauthTokens) {
-                    executorService.submit(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (!Check.isNull(token)) {
-                                log.info("获取创意,账号id:{}", token.getAccountId());
-                                kuaishouInterfaceService.getCreativeList(token, null, null);
-                            }
-                        }
-                    });
-
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-
-    @GetMapping(value = "/getAllGroupList")
-    public void getAllGroupList() {
-
-        try {
-
-            QueryWrapper<CtopOauthToken> oauthTokenQueryWrapper = new QueryWrapper<>();
-            oauthTokenQueryWrapper.eq("media_id", 2);
-            List<CtopOauthToken> ctopOauthTokens = oauthTokenMapper.selectList(oauthTokenQueryWrapper);
-            if (!Check.isNull(ctopOauthTokens)) {
-                for (CtopOauthToken token : ctopOauthTokens) {
-                    executorService.submit(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (!Check.isNull(token)) {
-                                log.info("获取组,账号id:{}", token.getAccountId());
-                                kuaishouInterfaceService.getGroupList(token, null, null);
-                            }
-                        }
-                    });
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-
-}

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

@@ -4,6 +4,7 @@ import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.MailLogMapper;
 import cn.com.ctop.common.module.service.IMailLogService;
 import cn.com.ctop.common.module.service.IMaterialInfoService;
+import cn.com.ctop.common.module.service.ISysRoleService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.Check;
 import com.alibaba.fastjson.JSON;
@@ -64,6 +65,8 @@ public class TransferAccountController {
     @Autowired
     private MailLogMapper mailLogMapper;
     @Autowired
+    private ISysRoleService sysRoleService;
+    @Autowired
     private IProjectMemberService projectMemberService;
 
     @Autowired
@@ -172,7 +175,7 @@ public class TransferAccountController {
                 ProjectMember projectMember = projectMemberService.getOne(projectMemberQueryWrapper);
                 if (Check.isNull(projectMember)) {
                     ProjectMember addProjectMember = new ProjectMember();
-                    String roleCode = materialInfoService.getRoleCodeByUserId(transferAccountEntity.getAssignee());
+                    String roleCode = sysRoleService.getRoleCodeByUserId(transferAccountEntity.getAssignee());
                     addProjectMember.setRoleCode(roleCode);
                     addProjectMember.setUserId(transferAccountEntity.getAssignee());
                     addProjectMember.setUserName(userName);

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

@@ -1,8 +1,8 @@
 package org.jeecg.modules.ctop.controller;
 
-import cn.com.ctop.bytedance.service.IBytedancePlanDailyReportService;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
+import cn.com.ctop.toutiao.modules.report.service.IBytedancePlanDailyReportService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

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

@@ -1,12 +1,11 @@
 package org.jeecg.modules.ctop.controller;
 
-import cn.com.ctop.bytedance.mapper.MaterialReportMapper;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.UserAllocationMapper;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.StringUtils;
-import com.alibaba.fastjson.JSON;
+import cn.com.ctop.kuaishou.modules.report.mapper.MaterialReportMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,31 +17,17 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.Project;
 import org.jeecg.modules.ctop.entity.ProjectMember;
 import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecg.modules.ctop.service.IProjectService;
-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;
 
 /**
  * 用户分配
@@ -371,73 +356,4 @@ public class UserAllocationController {
         }
         return result;
     }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<UserAllocation> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                UserAllocation userAllocation = JSON.parseObject(deString, UserAllocation.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(userAllocation, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<UserAllocation> pageList = userAllocationService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "用户分配列表");
-        mv.addObject(NormalExcelConstants.CLASS, UserAllocation.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<UserAllocation> listUserAllocations = ExcelImportUtil.importExcel(file.getInputStream(), UserAllocation.class, params);
-                userAllocationService.saveBatch(listUserAllocations);
-                return Result.ok("文件导入成功!数据行数:" + listUserAllocations.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("文件导入失败!");
-    }
-
 }

+ 22 - 109
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoMergeTaskController.java

@@ -1,40 +1,21 @@
 package org.jeecg.modules.ctop.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import cn.com.ctop.common.module.entity.VideoMergeTask;
 import cn.com.ctop.common.module.service.IVideoMergeTaskService;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
-import java.util.Date;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
  /**
  * 视频合成任务
@@ -49,8 +30,8 @@ import io.swagger.annotations.ApiOperation;
 public class VideoMergeTaskController {
 	@Autowired
 	private IVideoMergeTaskService videoMergeTaskService;
-	
-	/**
+
+     /**
 	  * 分页列表查询
 	 * @param videoMergeTask
 	 * @param pageNo
@@ -73,8 +54,8 @@ public class VideoMergeTaskController {
 		result.setResult(pageList);
 		return result;
 	}
-	
-	/**
+
+     /**
 	  *   添加
 	 * @param videoMergeTask
 	 * @return
@@ -93,8 +74,8 @@ public class VideoMergeTaskController {
 		}
 		return result;
 	}
-	
-	/**
+
+     /**
 	  *  编辑
 	 * @param videoMergeTask
 	 * @return
@@ -113,11 +94,11 @@ public class VideoMergeTaskController {
 				result.success("修改成功!");
 			}
 		}
-		
-		return result;
+
+        return result;
 	}
-	
-	/**
+
+     /**
 	  *   通过id删除
 	 * @param id
 	 * @return
@@ -134,8 +115,8 @@ public class VideoMergeTaskController {
 		}
 		return Result.ok("删除成功!");
 	}
-	
-	/**
+
+     /**
 	  *  批量删除
 	 * @param ids
 	 * @return
@@ -153,8 +134,8 @@ public class VideoMergeTaskController {
 		}
 		return result;
 	}
-	
-	/**
+
+     /**
 	  * 通过id查询
 	 * @param id
 	 * @return
@@ -173,72 +154,4 @@ public class VideoMergeTaskController {
 		}
 		return result;
 	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<VideoMergeTask> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              VideoMergeTask videoMergeTask = JSON.parseObject(deString, VideoMergeTask.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(videoMergeTask, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<VideoMergeTask> pageList = videoMergeTaskService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "视频合成任务列表");
-      mv.addObject(NormalExcelConstants.CLASS, VideoMergeTask.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<VideoMergeTask> listVideoMergeTasks = ExcelImportUtil.importExcel(file.getInputStream(), VideoMergeTask.class, params);
-              videoMergeTaskService.saveBatch(listVideoMergeTasks);
-              return Result.ok("文件导入成功!数据行数:" + listVideoMergeTasks.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 - 84
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoWatermarkTaskController.java

@@ -2,7 +2,6 @@ package org.jeecg.modules.ctop.controller;
 
 import cn.com.ctop.common.module.entity.VideoWatermarkTask;
 import cn.com.ctop.common.module.service.IVideoWatermarkTaskService;
-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;
@@ -12,26 +11,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
 
 import 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;
 
  /**
  * 水印任务表
@@ -170,72 +154,4 @@ public class VideoWatermarkTaskController {
 		}
 		return result;
 	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<VideoWatermarkTask> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              VideoWatermarkTask videoWatermarkTask = JSON.parseObject(deString, VideoWatermarkTask.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(videoWatermarkTask, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<VideoWatermarkTask> pageList = videoWatermarkTaskService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "水印任务表列表");
-      mv.addObject(NormalExcelConstants.CLASS, VideoWatermarkTask.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<VideoWatermarkTask> listVideoWatermarkTasks = ExcelImportUtil.importExcel(file.getInputStream(), VideoWatermarkTask.class, params);
-              videoWatermarkTaskService.saveBatch(listVideoWatermarkTasks);
-              return Result.ok("文件导入成功!数据行数:" + listVideoWatermarkTasks.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("文件导入失败!");
-  }
-
 }

+ 22 - 108
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoWatermarkTemplateController.java

@@ -1,39 +1,21 @@
 package org.jeecg.modules.ctop.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
 import cn.com.ctop.common.module.entity.VideoWatermarkTemplate;
 import cn.com.ctop.common.module.service.IVideoWatermarkTemplateService;
-import java.util.Date;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
  /**
  * 水印模板
@@ -48,8 +30,8 @@ import io.swagger.annotations.ApiOperation;
 public class VideoWatermarkTemplateController {
 	@Autowired
 	private IVideoWatermarkTemplateService videoWatermarkTemplateService;
-	
-	/**
+
+     /**
 	  * 分页列表查询
 	 * @param videoWatermarkTemplate
 	 * @param pageNo
@@ -72,8 +54,8 @@ public class VideoWatermarkTemplateController {
 		result.setResult(pageList);
 		return result;
 	}
-	
-	/**
+
+     /**
 	  *   添加
 	 * @param videoWatermarkTemplate
 	 * @return
@@ -92,8 +74,8 @@ public class VideoWatermarkTemplateController {
 		}
 		return result;
 	}
-	
-	/**
+
+     /**
 	  *  编辑
 	 * @param videoWatermarkTemplate
 	 * @return
@@ -112,11 +94,11 @@ public class VideoWatermarkTemplateController {
 				result.success("修改成功!");
 			}
 		}
-		
-		return result;
+
+        return result;
 	}
-	
-	/**
+
+     /**
 	  *   通过id删除
 	 * @param id
 	 * @return
@@ -133,8 +115,8 @@ public class VideoWatermarkTemplateController {
 		}
 		return Result.ok("删除成功!");
 	}
-	
-	/**
+
+     /**
 	  *  批量删除
 	 * @param ids
 	 * @return
@@ -152,8 +134,8 @@ public class VideoWatermarkTemplateController {
 		}
 		return result;
 	}
-	
-	/**
+
+     /**
 	  * 通过id查询
 	 * @param id
 	 * @return
@@ -172,72 +154,4 @@ public class VideoWatermarkTemplateController {
 		}
 		return result;
 	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<VideoWatermarkTemplate> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              VideoWatermarkTemplate videoWatermarkTemplate = JSON.parseObject(deString, VideoWatermarkTemplate.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(videoWatermarkTemplate, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<VideoWatermarkTemplate> pageList = videoWatermarkTemplateService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "水印模板列表");
-      mv.addObject(NormalExcelConstants.CLASS, VideoWatermarkTemplate.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<VideoWatermarkTemplate> listVideoWatermarkTemplates = ExcelImportUtil.importExcel(file.getInputStream(), VideoWatermarkTemplate.class, params);
-              videoWatermarkTemplateService.saveBatch(listVideoWatermarkTemplates);
-              return Result.ok("文件导入成功!数据行数:" + listVideoWatermarkTemplates.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("文件导入失败!");
-  }
-
 }

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/ByteDanceHourlyAccountWarningLoadJob.java

@@ -1,9 +1,9 @@
 package org.jeecg.modules.ctop.job;
 
-import cn.com.ctop.bytedance.service.IByteDanceHourlyAccountWarningService;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
+import cn.com.ctop.toutiao.modules.report.service.IByteDanceHourlyAccountWarningService;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.quartz.Job;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedanceAdvertiserDailyReportLoadJob.java

@@ -1,9 +1,9 @@
 package org.jeecg.modules.ctop.job;
 
-import cn.com.ctop.bytedance.service.IReportService;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
+import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.quartz.Job;

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

@@ -3,8 +3,8 @@ package org.jeecg.modules.ctop.job;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
-import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
-import cn.com.ctop.toutiao.service.IByteDanceCreativeService;
+import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
+import cn.com.ctop.toutiao.modules.material.service.IByteDanceCreativeService;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedanceAdvertiserHourlyReportLoadJob.java

@@ -1,9 +1,9 @@
 package org.jeecg.modules.ctop.job;
 
-import cn.com.ctop.bytedance.service.IReportService;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
+import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.quartz.Job;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedanceCreativeDailyReportLoadJob.java

@@ -1,9 +1,9 @@
 package org.jeecg.modules.ctop.job;
 
-import cn.com.ctop.bytedance.service.IReportService;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
+import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.quartz.Job;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedanceCreativeHourlyReportLoadJob.java

@@ -1,9 +1,9 @@
 package org.jeecg.modules.ctop.job;
 
-import cn.com.ctop.bytedance.service.IReportService;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
+import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.quartz.Job;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedanceMaterialsLoadJob.java

@@ -3,7 +3,7 @@ package org.jeecg.modules.ctop.job;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
-import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
+import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;

+ 7 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedancePlanDailyReportLoadJob.java

@@ -1,13 +1,13 @@
 package org.jeecg.modules.ctop.job;
 
-import cn.com.ctop.bytedance.entity.BytedancePlanDailyReport;
-import cn.com.ctop.bytedance.service.IBytedancePlanDailyReportService;
-import cn.com.ctop.bytedance.service.IReportService;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
+import cn.com.ctop.toutiao.modules.report.entity.BytedancePlanDailyReport;
+import cn.com.ctop.toutiao.modules.report.service.IBytedancePlanDailyReportService;
+import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
@@ -22,6 +22,7 @@ import java.util.List;
 
 /**
  * 头条计划日报数据任务
+ * @author 宋英豪
  */
 @Slf4j
 public class BytedancePlanDailyReportLoadJob implements Job {
@@ -31,6 +32,9 @@ public class BytedancePlanDailyReportLoadJob implements Job {
     private IReportService reportService;
     @Autowired
     private IUserAllocationService userAllocationService;
+    @Autowired
+    private IBytedancePlanDailyReportService planDailyReportService;
+
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
@@ -101,7 +105,4 @@ public class BytedancePlanDailyReportLoadJob implements Job {
             });
         }
     }
-
-    @Autowired
-    private IBytedancePlanDailyReportService planDailyReportService;
 }

+ 5 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedancePlanHourlyReportLoadJob.java

@@ -1,10 +1,10 @@
 package org.jeecg.modules.ctop.job;
 
-import cn.com.ctop.bytedance.service.IBytedancePlanDailyReportService;
-import cn.com.ctop.bytedance.service.IReportService;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
+import cn.com.ctop.toutiao.modules.report.service.IBytedancePlanDailyReportService;
+import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.quartz.Job;
@@ -28,10 +28,13 @@ public class BytedancePlanHourlyReportLoadJob implements Job {
     private ICtopOauthTokenService tokenService;
     @Autowired
     private IReportService reportService;
+    @Autowired
+    private IBytedancePlanDailyReportService planDailyReportService;
     static ExecutorService executorService = null;
     //线程计数器
     static CountDownLatch countDownLatch = null;
 
+
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         log.info("头条时报数据获取开始");
@@ -75,7 +78,4 @@ public class BytedancePlanHourlyReportLoadJob implements Job {
         log.info("头条计划时报数据获取完成");
         executorService.shutdown();
     }
-
-    @Autowired
-    private IBytedancePlanDailyReportService planDailyReportService;
 }

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

@@ -3,8 +3,8 @@ package org.jeecg.modules.ctop.job;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
-import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
-import cn.com.ctop.toutiao.service.IByteDanceCreativeService;
+import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
+import cn.com.ctop.toutiao.modules.material.service.IByteDanceCreativeService;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedancePlanRealTimeLoadJob.java

@@ -3,7 +3,7 @@ package org.jeecg.modules.ctop.job;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
-import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
+import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.quartz.Job;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedanceSameDayCreativeLoadJob.java

@@ -3,7 +3,7 @@ package org.jeecg.modules.ctop.job;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
-import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
+import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.quartz.Job;

+ 0 - 36
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/EffiVideoJob.java

@@ -1,36 +0,0 @@
-package org.jeecg.modules.ctop.job;
-
-
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.system.service.IPerformanceService2;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@Slf4j
-public class EffiVideoJob implements Job {
-    @Autowired
-    private IPerformanceService2 performanceService;
-
-    /**
-     * 获取有效视频以及对应人的定时任务
-     *
-     * @param jobExecutionContext
-     * @throws JobExecutionException
-     */
-    @Override
-    public void execute(JobExecutionContext jobExecutionContext) {
-        //有效视频定时任务,默认跑前一天的
-        DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        String calcDate = sdf.format(DateUtils.addDay(new Date(), -1));
-        log.info("有效视频定时任务开始执行,有效视频所属时间为" + calcDate);
-        performanceService.efficientVideoTask(sdf.format(DateUtils.addDay(new Date(), -1)));
-        log.info("有效视频定时任务结束");
-    }
-}

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

@@ -1,9 +1,9 @@
 package org.jeecg.modules.ctop.job;
 
-import cn.com.ctop.bytedance.service.IBytedanceReportService;
+
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
+import cn.com.ctop.toutiao.modules.report.service.IBytedanceReportService;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.quartz.Job;

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

@@ -1,11 +1,8 @@
 package org.jeecg.modules.ctop.service;
 
-import com.alibaba.fastjson.JSONObject;
-
 import java.util.Map;
 
 public interface ICreateInternalService {
-    Map<String, Object> createInternal(JSONObject requestJson);
 
     Map<String, Object> checkAccountPassword(String account, String password);
 

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

@@ -9,7 +9,7 @@ import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.CorpWexinUtils;
 import cn.com.ctop.common.module.utils.SendMailUtil;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouGroupMapper;
-import cn.com.ctop.toutiao.service.IByteDanceAdvertisePlanService;
+import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertisePlanService;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;

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

@@ -9,7 +9,7 @@ import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.CorpWexinUtils;
 import cn.com.ctop.common.module.utils.SendMailUtil;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouGroupMapper;
-import cn.com.ctop.toutiao.service.IByteDanceAdvertisePlanService;
+import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertisePlanService;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,29 +1,14 @@
 package org.jeecg.modules.ctop.service.impl;
 
 import cn.com.ctop.common.module.entity.BindAccountLogin;
-import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.mapper.BindAccountLoginMapper;
-import cn.com.ctop.common.module.service.IBindAccountLoginService;
-import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.service.IFileInfoService;
 import cn.com.ctop.common.module.utils.*;
 import cn.com.ctop.crawler.modules.core.util.FateadmHttpUtil;
 import cn.com.ctop.crawler.modules.core.util.FateadmUtil;
-import cn.com.ctop.toutiao.entity.ByteDanceUserOrientationTemplate;
-import cn.com.ctop.toutiao.entity.BytedanceCreativeLaunchTemplate;
-import cn.com.ctop.toutiao.entity.BytedanceUrlInfo;
-import cn.com.ctop.toutiao.mapper.ByteDanceUserOrientationTemplateMapper;
-import cn.com.ctop.toutiao.mapper.BytedanceCreativeLaunchTemplateMapper;
-import cn.com.ctop.toutiao.mapper.BytedanceUrlInfoMapper;
-import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
-import cn.com.ctop.toutiao.service.IByteDanceCreativeService;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.impl.client.BasicCookieStore;
 import org.apache.http.impl.cookie.BasicClientCookie;
 import org.jeecg.modules.ctop.service.ICreateInternalService;
 import org.openqa.selenium.By;
@@ -47,13 +32,8 @@ public class CreateInternalServiceImpl implements ICreateInternalService {
     @Value("${jeecg.path.chrome-driver}")
     private String chromeDriver;
     @Autowired
-    private IBindAccountLoginService bindAccountLoginService;
-    @Autowired
     private BindAccountLoginMapper bindAccountLoginMapper;
 
-    @Autowired
-    private BytedanceUrlInfoMapper urlInfoMapper;
-
     @Override
     public Map<String, Object> bindLogin(String advertiserId, String accountName, String password, String loginType, String userId, String advertiserName) {
 
@@ -206,482 +186,4 @@ public class CreateInternalServiceImpl implements ICreateInternalService {
         }
         return resultMap;
     }
-
-    @Override
-    public Map<String, Object> createInternal(JSONObject requestJson) {
-        Map<String, Object> resultMap = new HashMap<>();
-        //1:获取用户名密码
-        Long accountId = requestJson.getLong("accountId");
-        Long userOrientationId = requestJson.getLong("userOrientationId");
-        String campaignId = requestJson.getString("campaignId");
-        BindAccountLogin bindAccountLogin = bindAccountLoginService.selectByAccountId(accountId + "");
-        if (null == bindAccountLogin) {
-            ResultMapUtils.setResultMap(resultMap, StatusCode.ACCOUNT_HAS_NOT_EXIST.getCode());
-            return resultMap;
-        }
-        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId + "");
-        if (null == token) {
-            ResultMapUtils.setResultMap(resultMap, StatusCode.ACCOUNT_HAS_NOT_EXIST.getCode());
-            return resultMap;
-        }
-        JSONObject wordsObject = fileInfoService.getCreativeWord(token, token.getAccountId());
-        String url = "https://ad.oceanengine.com/pages/login/index.html";
-        System.getProperties().setProperty("webdriver.chrome.driver", chromeDriver);
-        ChromeOptions chromeOptions = new ChromeOptions();
-        chromeOptions.addArguments("--headless");
-        chromeOptions.addArguments("--no-sandbox");
-        chromeOptions.addArguments("--window-size=1920,1080");
-        chromeOptions.addArguments("--user-agent=" + HttpUtils2.USER_AGENT);
-        chromeOptions.setAcceptInsecureCerts(true);
-        WebDriver webDriver = new ChromeDriver(chromeOptions);
-        try {
-            HttpUtils2.cookieStore = new BasicCookieStore();
-            webDriver.manage().deleteAllCookies();
-            //获取登录页面
-            webDriver.get(url);
-            for (Cookie cookie : webDriver.manage().getCookies()) {
-                BasicClientCookie ck = new BasicClientCookie(cookie.getName(), cookie.getValue());
-                ck.setDomain("ad.oceanengine.com");
-                ck.setExpiryDate(cookie.getExpiry());
-                ck.setPath(cookie.getPath());
-                HttpUtils2.cookieStore.addCookie(ck);
-            }
-            Map<String, String> header = new HashMap<String, String>();
-            header.put("Accept", "*/*");
-            header.put("Connection", "keep-alive");
-            header.put("Host", "sso.toutiao.com");
-            header.put("Content-Type", "application/x-www-form-urlencoded");
-            header.put("Origin", "https://ad.oceanengine.com");
-            header.put("Referer", "https://ad.oceanengine.com/pages/login/index.html");
-            Map<String, Object> param = new HashMap<>();
-            param.put("mobile", "");
-            param.put("code", "");
-            param.put("account", bindAccountLogin.getAccountName());
-            param.put("password", bindAccountLogin.getPassword());
-            param.put("captcha", "hqde");
-            param.put("is_30_days_no_login", "false");
-            param.put("service", "https://ad.oceanengine.com");
-            String res = HttpUtils2.httpPostParamRequest("https://sso.toutiao.com/account_login/", param, header);
-
-            ObjectMapper mapper = new ObjectMapper();
-            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-            JsonNode jsonNode = mapper.readTree(res);
-            Integer errorCode = jsonNode.get("error_code").asInt();
-            //用户名或者密码错误
-            if (null != errorCode && errorCode == 1009) {
-                ResultMapUtils.setResultMap(resultMap, StatusCode.USERNAME_OR_PASSWORD_ERROR.getCode());
-                return resultMap;
-            }
-            String orderId = null;
-            while (errorCode != 0) {
-                FateadmUtil fateadmUtil = new FateadmUtil();
-                fateadmUtil.init();
-                if (orderId != null) {
-                    fateadmUtil.Justice(orderId);
-                }
-                String captcha = jsonNode.get("captcha").asText();
-                Base64.Decoder decoder = Base64.getDecoder();
-                FateadmHttpUtil.HttpResp resp = fateadmUtil.Predict("30400", decoder.decode(captcha));
-                param.put("captcha", resp.pred_resl);
-                orderId = resp.req_id;
-                res = HttpUtils2.httpPostParamRequest("https://sso.toutiao.com/account_login/", param, header);
-                jsonNode = mapper.readTree(res);
-                errorCode = jsonNode.get("error_code").asInt();
-            }
-            if (errorCode == 0) {
-                String csrftoken = "";
-                List<org.apache.http.cookie.Cookie> cookies = HttpUtils2.cookieStore.getCookies();
-                for (org.apache.http.cookie.Cookie ck : cookies) {
-                    Cookie cookie = new Cookie(ck.getName(), ck.getValue(), "." + ck.getDomain(), ck.getPath(), ck.getExpiryDate());
-                    webDriver.manage().addCookie(cookie);
-                }
-                //登录成功 进入推广页面
-                webDriver.get("https://ad.oceanengine.com/pages/promotion.html#/ad");
-                Thread.sleep(3000);
-                String templateName = requestJson.getString("templateName");
-                String uuid = UUID.randomUUID().toString();
-
-                //创建广告组页面
-                webDriver.get("https://ad.oceanengine.com/pages/campaign/create.html");
-                Map<String, Object> campaignParam = new HashMap<>();
-                campaignParam.put("campaign_id", "");
-                campaignParam.put("campaign_name", templateName + "-广告组-" + uuid.substring(1, 7));
-                campaignParam.put("landing_type", 3);
-                campaignParam.put("campaign_type", 1);
-                Map<String, Object> budgetMap = new HashMap<>();
-                budgetMap.put("budget", 0);
-                budgetMap.put("budget_mode", -1);
-                campaignParam.put("budget", budgetMap);
-                for (Cookie cookie : webDriver.manage().getCookies()) {
-                    if ("csrftoken".equals(cookie.getName())) {
-                        csrftoken = cookie.getValue();
-                    }
-                    BasicClientCookie ck = new BasicClientCookie(cookie.getName(), cookie.getValue());
-                    ck.setDomain("ad.oceanengine.com");
-                    ck.setExpiryDate(cookie.getExpiry());
-                    ck.setPath(cookie.getPath());
-                    HttpUtils2.cookieStore.addCookie(ck);
-                }
-
-                header.put("Accept", "application/json, text/javascript, */*; q=0.01");
-                header.put("Connection", "keep-alive");
-                header.put("Host", "ad.oceanengine.com");
-                header.put("Content-Type", "application/json");
-                header.put("Origin", "https://ad.oceanengine.com");
-                header.put("X-CSRFToken", csrftoken);
-                header.put("X-Requested-With", "XMLHttpRequest");
-                header.put("Referer", "https://ad.oceanengine.com/pages/promotion.html");
-                // 创建广告组返回信息
-                if (null == campaignId || "".equals(campaignId.trim())) {
-                    res = HttpUtils2.httpPostRequest("https://ad.oceanengine.com/overture/campaign/create/", campaignParam, header);
-                    JsonNode node = mapper.readTree(res);
-                    campaignId = node.get("data").get("campaign_id").asText();
-                }
-
-                Integer itratorNum = requestJson.getInteger("itratorNum");
-                JSONObject data = new JSONObject();
-                if (null != itratorNum && itratorNum > 0) {
-                    //循环创建广告计划
-                    for (int i = 0; i < itratorNum; i++) {
-                        //广告组id
-                        String url2 = "https://ad.oceanengine.com/pages/ad/create.html?campaign_id=" + campaignId + "&landing_type=3&temp_id=ADvQb";
-                        webDriver.get(url2);
-
-                        header.put("Referer", url2);
-                        for (Cookie cookie : webDriver.manage().getCookies()) {
-                            if ("csrftoken".equals(cookie.getName())) {
-                                csrftoken = cookie.getValue();
-                            }
-                            BasicClientCookie ck = new BasicClientCookie(cookie.getName(), cookie.getValue());
-                            ck.setDomain("ad.oceanengine.com");
-                            ck.setExpiryDate(cookie.getExpiry());
-                            ck.setPath(cookie.getPath());
-                            HttpUtils2.cookieStore.addCookie(ck);
-                        }
-                        header.put("X-CSRFToken", csrftoken);
-                        Map<String, Object> audienceParam = new HashMap<>();
-                        audienceParam.put("location_type", 4);
-                        audienceParam.put("aweme_account_fans", 0);
-                        String tokenStr = HttpUtils2.httpPostRequest("https://ad.oceanengine.com/api/v1/hl/ad/audience/estimate/", audienceParam, header);
-                        JsonNode tokenNode = mapper.readTree(tokenStr);
-                        Map<String, Object> planParam = new HashMap<>();
-                        //模板名称
-                        planParam.put("name", templateName + "-广告计划-" + uuid.substring(1, 7) + i);
-                        Integer deliveryRange = requestJson.getInteger("deliveryRange");
-                        //投放形式
-                        planParam.put("delivery_range", deliveryRange);
-                        if (deliveryRange == 2) {
-                            //投放形式 1:激励视频 2:原生
-                            planParam.put("union_video_type", requestJson.getInteger("deliveryForm"));
-                        }
-                        planParam.put("projectid", "");
-                        Integer downloadType = requestJson.getInteger("downloadType");
-                        //下载方式  1:下载包 2:h5
-                        planParam.put("download_type", downloadType);
-                        Long urlId = requestJson.getLong("urlId");
-                        BytedanceUrlInfo urlInfo = urlInfoMapper.selectById(urlId);
-                        if (downloadType == 1) {
-                            planParam.put("download_url", urlInfo.getUrl());
-                            planParam.put("package", urlInfo.getPackageName());
-                        }
-                        if (downloadType == 2) {
-                            // 落地页链接
-                            planParam.put("external_url", urlInfo.getUrl());
-                        }
-                        //广告类别  5 内广
-                        planParam.put("classify", 5);
-                        planParam.put("projectid", "");
-                        planParam.put("localGeolocation", new ArrayList<String>());
-                        //应用直达链接
-                        planParam.put("open_url", "");
-                        planParam.put("style_type", 0);
-                        //受众位置类型
-                        planParam.put("location_type", 4);
-                        // 过滤已安装,当推广目标为安卓应用下载时可填,0表示不过滤,1表示过滤,默认为不过滤
-                        planParam.put("hide_if_exists", 0);
-                        //兴趣分类
-                        planParam.put("interest_tag_mode", 0);
-                        planParam.put("token", tokenNode.get("data").get("token").asText());
-                        //头条预估数据
-                        planParam.put("toutiao", 100000005);
-                        //抖音预估数据
-                        planParam.put("aweme", 150000005);
-                        //西瓜预估数据
-                        planParam.put("video_app", 40000005);
-                        //火山预估数据
-                        planParam.put("hotsoon", 40000005);
-                        //账号粉丝相似人群
-                        planParam.put("aweme_account_fans", 0);
-                        // 智能放量????
-                        planParam.put("auto_extend_enabled", 0);
-                        // 广告预算类型  0 日预算  1 总预算
-                        planParam.put("budget_mode", requestJson.getIntValue("budgetPriceMode"));
-                        //广告预算
-                        planParam.put("budget", requestJson.getIntValue("budgetPrice"));
-                        int scheduleType = requestJson.getIntValue("dateQuantum");
-                        //广告投放时间类型   默认1 1:不限  2:按时间???
-                        planParam.put("schedule_type", scheduleType);
-                        if (scheduleType == 2) {
-                            //广告投放起始时间
-                            planParam.put("start_time", requestJson.getString("startDate"));
-                            //广告投放结束时间
-                            planParam.put("end_time", requestJson.getString("endDate"));
-                        }
-                        //投放时段
-                        planParam.put("week_schedule", new ArrayList<String>());
-                        //投放时段
-                        planParam.put("week_time", new ArrayList<ArrayList<Integer>>());
-                        int pricing = requestJson.getIntValue("pricing");
-                        //计划出价类型  9 按展示付费  7 按点击付费 8 按转化付费
-                        planParam.put("pricing", pricing);
-                        //出价为OCPC时,计划处于哪个阶段??
-                        planParam.put("cpa_phrase", 2);
-                        planParam.put("is_union_slot", "");
-                        //过滤已转化用户类型字段,只有转化为目标时可填 优化目标为转化才展示
-                        planParam.put("hide_if_converted", 1);
-                        //投放速度/投放方式使用字段
-                        planParam.put("flow_control_mode", requestJson.getIntValue("flowControlMode"));
-                        if (pricing == 9) {
-                            planParam.put("cpa_bid", requestJson.getIntValue("convertPrice"));
-                        } else {
-                            planParam.put("bid", requestJson.getIntValue("convertPrice"));
-                        }
-                        //自动出价类型,OCPM支持
-                        planParam.put("smart_bid_type", requestJson.getIntValue("bidType"));
-                        //是否调整自动出价   允许值: "0", "1"  默认值: 0
-                        planParam.put("adjust_cpa", 0);
-                        planParam.put("app_bid_ratio", new Object());
-                        planParam.put("campaign_id", campaignId);
-                        if ("IOS".equals(urlInfo.getType())) {
-                            //app 类型 201 应用推广 安卓 201 应用推广 ios
-                            planParam.put("app_type", 202);
-                        } else if ("android".equals(urlInfo.getType())) {
-                            planParam.put("app_type", 201);
-                        }
-                        String convertType = requestJson.getString("convertType");
-                        if (null != convertType && "SIMPLE".equals(convertType)) {
-                            //普通应用下载
-                            planParam.put("external_action", requestJson.getLong("simpleDeliverytarget"));
-                        }
-                        if (null != convertType && "API".equals(convertType)) {
-                            Long convertId = requestJson.getLong("convertId");
-                            if (null != convertId && convertId != 0) {
-                                planParam.put("convert_id", convertId);
-                            }
-                        }
-                        String createResult = HttpUtils2.httpPostRequest("https://ad.oceanengine.com/overture/ad/create/", planParam, header);
-                        JSONObject result = JSONObject.parseObject(createResult);
-                        String status = result.getString("status");
-                        String msg = result.getString("msg");
-                        if (null != status && !"success".equals(status)) {
-                            resultMap.put("code", -1);
-                            resultMap.put("message", msg);
-                            resultMap.put("success", false);
-                            return resultMap;
-                        }
-                        //广告计划id
-                        Long adId = result.getJSONObject("data").getLong("ad_id");
-                        //修改用户定向
-                        ByteDanceUserOrientationTemplate template = userOrientationTemplateMapper.selectById(userOrientationId);
-                        if (null != template) {
-                            //获取modify_time
-                            Thread.sleep(5000L);
-                            advertiserDataService.getAdvertiserPlan(token, adId + "", null, null);
-                            advertiserDataService.updateAd(token, adId, template, requestJson);
-                        }
-                        Long creativeTemplateId = requestJson.getLong("creativeTemplateId");
-
-                        //创建广告创意
-                        String name = requestJson.getString("name");
-                        data.put("title", name + "_" + System.currentTimeMillis() + "_" + "汇创广告创意");
-                        if (i == 0) {
-                            BytedanceCreativeLaunchTemplate launchTemplate = launchTemplateMapper.selectById(creativeTemplateId);
-                            data.put("ad_id", adId);
-                            String advertiseLoaction = launchTemplate.getAdvertiseLocation();
-                            if (deliveryRange == 2) {
-                                //按媒体指定位置
-                                JSONArray inventoryType = new JSONArray();
-                                inventoryType.add("INVENTORY_UNION_SLOT");
-                                data.put("inventory_type", inventoryType);
-                            } else {
-                                //穿山甲
-                                //按媒体指定位置
-                                if (null != advertiseLoaction && "media".equals(advertiseLoaction)) {
-                                    String inventoryTypeStr = launchTemplate.getInventoryType();
-                                    JSONArray inventoryType = JSONArray.parseArray(inventoryTypeStr);
-                                    data.put("inventory_type", inventoryType);
-                                }
-                                //按场景指定位置
-                                if (null != advertiseLoaction && "sence".equals(advertiseLoaction)) {
-                                    data.put("scene_inventory", launchTemplate.getSceneInventory());
-                                }
-                            }
-                            //创意展现方式
-                            data.put("creative_display_mode", launchTemplate.getCreativeDisplayMode());
-                            //优选广告位
-                            if (null != advertiseLoaction && "great".equals(advertiseLoaction) && null != launchTemplate.getSmartInventory() && !"".equals(launchTemplate.getSmartInventory())) {
-                                data.put("smart_inventory", launchTemplate.getSmartInventory());
-                            }
-
-                            //广告评论
-                            data.put("is_comment_disable", launchTemplate.getCommentDisable());
-                            //创意分类
-                            JSONArray categorys = JSONArray.parseArray(launchTemplate.getThirdIndustryId());
-                            String thirdIndustryId = categorys.getString(2);
-                            data.put("third_industry_id", thirdIndustryId);
-                            //创意标签
-                            data.put("ad_keywords", JSONArray.parseArray(launchTemplate.getAdKeywords()));
-
-                            //创意标题
-                            data.put("title", name + "_" + System.currentTimeMillis() + "_" + "汇创广告创意");
-
-                            //创意方式
-                            String creativeType = requestJson.getString("creativeType");
-                            if (null != creativeType && "customize".equals(creativeType)) {
-                                //自定义创意
-                                //拼装creative参数
-                                JSONArray creatives = new JSONArray();
-                                JSONArray getCreatives = requestJson.getJSONArray("creatives");
-                                if (null != getCreatives && getCreatives.size() > 0) {
-                                    getCreatives.forEach(k -> {
-                                        JSONObject createtive = JSONObject.parseObject(JSONObject.toJSONString(k));
-                                        JSONObject setCreatetive = new JSONObject();
-                                        String imageMode = createtive.getString("typeCode");
-                                        setCreatetive.put("image_mode", imageMode);
-                                        String title = createtive.getString("text");
-                                        setCreatetive.put("title", title);
-                                        JSONArray ids = getCreativeWordIds(title, wordsObject);
-                                        setCreatetive.put("creative_word_ids", ids);
-                                        String videoUrl = createtive.getString("vadioUrl");
-                                        String imageUrl = createtive.getString("imageUrl");
-                                        if ("CREATIVE_IMAGE_MODE_VIDEO".equals(imageMode) || "CREATIVE_IMAGE_MODE_VIDEO_VERTICAL".equals(imageMode)) {
-                                            //视频创意
-                                            if (null != videoUrl) {
-                                                Map<String, Object> getImageResult = fileInfoService.uploadImageToBytedance(token.getAccountId() + "", imageUrl);
-                                                JSONArray horizonVideoCoverImageArray = (JSONArray) getImageResult.get("imageIds");
-                                                String imageId = horizonVideoCoverImageArray.getString(0);
-                                                Map<String, Object> getVideoResult = fileInfoService.uploadVideoToBytedance(token.getAccountId() + "", videoUrl);
-                                                String videoId = (String) getVideoResult.get("videoId");
-                                                setCreatetive.put("image_id", imageId);
-                                                setCreatetive.put("video_id", videoId);
-                                                creatives.add(setCreatetive);
-                                            }
-                                        } else {
-                                            //图片创意
-                                            if (null != videoUrl && !"".equals(videoUrl.trim())) {
-                                                Map<String, Object> getImageResult = fileInfoService.uploadImageToBytedance(token.getAccountId() + "", videoUrl);
-                                                JSONArray imageArray = (JSONArray) getImageResult.get("imageIds");
-                                                setCreatetive.put("image_ids", imageArray);
-                                                creatives.add(setCreatetive);
-                                            }
-                                        }
-                                    });
-                                    data.put("creatives", creatives);
-                                }
-                            } else {
-                                data.put("creative_material_mode", "STATIC_ASSEMBLE");
-                                //程序化创意
-                                JSONArray titleArray = requestJson.getJSONArray("titles");
-                                if (null != titleArray && titleArray.size() > 0) {
-                                    JSONArray titleList = new JSONArray();
-                                    titleArray.forEach(v -> {
-                                        JSONObject getTitleObject = JSONObject.parseObject(JSONObject.toJSONString(v));
-                                        JSONObject titleObject = new JSONObject();
-                                        String getTitle = getTitleObject.getString("text");
-                                        titleObject.put("title", getTitle);
-                                        JSONArray ids = getCreativeWordIds(getTitle, wordsObject);
-                                        titleObject.put("creative_word_ids", ids);
-                                        titleList.add(titleObject);
-                                    });
-                                    data.put("title_list", titleList);
-                                }
-
-                                JSONArray getCreatives = requestJson.getJSONArray("creatives");
-                                if (null != getCreatives && getCreatives.size() > 0) {
-                                    JSONArray imageList = new JSONArray();
-                                    getCreatives.forEach(v -> {
-                                        JSONObject createtive = JSONObject.parseObject(JSONObject.toJSONString(v));
-                                        JSONObject setCreatetive = new JSONObject();
-                                        String imageMode = createtive.getString("typeCode");
-                                        setCreatetive.put("image_mode", imageMode);
-                                        String videoUrl = createtive.getString("vadioUrl");
-                                        String imageUrl = createtive.getString("imageUrl");
-                                        if ("CREATIVE_IMAGE_MODE_VIDEO".equals(imageMode) || "CREATIVE_IMAGE_MODE_VIDEO_VERTICAL".equals(imageMode)) {
-                                            if (null != videoUrl) {
-                                                Map<String, Object> getImageResult = fileInfoService.uploadImageToBytedance(token.getAccountId() + "", imageUrl);
-                                                JSONArray horizonVideoCoverImageArray = (JSONArray) getImageResult.get("imageIds");
-                                                String imageId = horizonVideoCoverImageArray.getString(0);
-                                                Map<String, Object> getVideoResult = fileInfoService.uploadVideoToBytedance(token.getAccountId() + "", videoUrl);
-                                                String videoId = (String) getVideoResult.get("videoId");
-                                                setCreatetive.put("image_id", imageId);
-                                                setCreatetive.put("video_id", videoId);
-                                                imageList.add(setCreatetive);
-                                            }
-                                        } else {
-                                            if (null != videoUrl && !"".equals(videoUrl.trim())) {
-                                                Map<String, Object> getImageResult = fileInfoService.uploadImageToBytedance(token.getAccountId() + "", videoUrl);
-                                                JSONArray imageArray = (JSONArray) getImageResult.get("imageIds");
-                                                setCreatetive.put("image_ids", imageArray);
-                                                imageList.add(setCreatetive);
-                                            }
-                                        }
-                                    });
-                                    data.put("image_list", imageList);
-                                }
-                            }
-                            //应用下载详情页
-                            data.put("web_url", requestJson.getString("webUrl"));
-                            //应用名
-                            data.put("app_name", requestJson.getString("appName"));
-                        }
-                        resultMap = byteDanceCreativeService.creativeCreate(token.getAccountId() + "", adId, data.toJSONString());
-                        Boolean createSuccess = (Boolean) resultMap.get("success");
-                        if (null != createSuccess && !createSuccess) {
-                            return resultMap;
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            //清除所有的缓存
-            webDriver.manage().deleteAllCookies();
-            webDriver.close();
-            HttpUtils2.cookieStore = new BasicCookieStore();
-        }
-        ResultMapUtils.setResultMap(resultMap, StatusCode.COMMON_SUCCESS.getCode());
-        return resultMap;
-    }
-
-    public JSONArray getCreativeWordIds(String getTitle, JSONObject wordsObject) {
-        ArrayList<String> wordsString = StringUtils.stringCutFromBrace(getTitle);
-        JSONArray creativeWords = wordsObject.getJSONArray("creative_word");
-        JSONArray ids = new JSONArray();
-        wordsString.forEach(v -> {
-            creativeWords.forEach(word -> {
-                JSONObject wordObject = (JSONObject) word;
-                String name = wordObject.getString("name");
-                Integer id = wordObject.getInteger("creative_word_id");
-                if (v.equals(name)) {
-                    ids.add(id);
-                }
-            });
-        });
-        return ids;
-    }
-
-
-    @Autowired
-    private BytedanceCreativeLaunchTemplateMapper launchTemplateMapper;
-    @Autowired
-    private IByteDanceCreativeService byteDanceCreativeService;
-    @Autowired
-    private IFileInfoService fileInfoService;
-    @Autowired
-    private ByteDanceUserOrientationTemplateMapper userOrientationTemplateMapper;
-    @Autowired
-    private ICtopOauthTokenService tokenService;
-    @Autowired
-    private IByteDanceAdvertiserDataService advertiserDataService;
 }

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

@@ -28,7 +28,6 @@ public class CreativeTitleServiceImpl implements ICreativeTitleService {
         return null;
     }
 
-
     @Override
     public JSONArray titleSuggestion(String firstCategory, String secondCategory, String keyword) {
         if (Check.isNull(keyword)) {

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

@@ -1,7 +1,7 @@
 package org.jeecg.modules.ctop.service.impl;
 
-import cn.com.ctop.bytedance.mapper.MaterialReportMapper;
 import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.kuaishou.modules.report.mapper.MaterialReportMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.ctop.entity.Project;
 import org.jeecg.modules.ctop.entity.ProjectMember;

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/excelutil/KuaishouChannelRegInfoExcelListener.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.excelutil;
 
+import cn.com.ctop.common.module.utils.SpringUtils;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import org.jeecg.common.util.DateUtils;

+ 0 - 11
jeecg-boot-module-system/src/main/java/org/jeecg/modules/fegin/LogService.java

@@ -1,11 +0,0 @@
-//package org.jeecg.modules.fegin;
-//
-//import org.springframework.cloud.openfeign.FeignClient;
-//import org.springframework.web.bind.annotation.GetMapping;
-//import org.springframework.web.bind.annotation.RequestParam;
-//
-//@FeignClient(name = "log-service")
-//public interface LogService {
-//    @GetMapping("hi")
-//    String home(@RequestParam(value = "name") String name);
-//}

+ 0 - 162
jeecg-boot-module-system/src/main/java/org/jeecg/modules/industry/vue/IndustryList.vue

@@ -1,162 +0,0 @@
-<template>
-    <a-card :bordered="false">
-
-        <!-- 查询区域 -->
-        <div class="table-page-search-wrapper">
-            <a-form layout="inline">
-                <a-row :gutter="24">
-
-                    <a-col :md="6" :sm="8">
-                        <a-form-item label="父ID">
-                            <a-input placeholder="请输入父ID" v-model="queryParam.parentId"></a-input>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="6" :sm="8">
-                        <a-form-item label="行业名称">
-                            <a-input placeholder="请输入行业名称" v-model="queryParam.name"></a-input>
-                        </a-form-item>
-                    </a-col>
-</template>
-<a-col :md="6" :sm="8">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-</a-col>
-
-</a-row>
-</a-form>
-</div>
-
-<!-- 操作按钮区域 -->
-<div class="table-operator">
-    <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-    <a-button type="primary" icon="download" @click="handleExportXls('行业表')">导出</a-button>
-    <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
-              @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-    </a-upload>
-    <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-            <a-menu-item key="1" @click="batchDel">
-                <a-icon type="delete"/>
-                删除
-            </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-            <a-icon type="down"/>
-        </a-button>
-    </a-dropdown>
-</div>
-
-<!-- table区域-begin -->
-<div>
-    <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
-        selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-    </div>
-
-    <a-table
-            ref="table"
-            size="middle"
-            bordered
-            rowKey="id"
-            :columns="columns"
-            :dataSource="dataSource"
-            :pagination="ipagination"
-            :loading="loading"
-            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-            @change="handleTableChange">
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-    </a-table>
-</div>
-<!-- table区域-end -->
-
-<!-- 表单区域 -->
-<industry-modal ref="modalForm" @ok="modalFormOk"></industry-modal>
-</a-card>
-</template>
-
-<script>
-    import IndustryModal from './modules/IndustryModal'
-    import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-
-    export default {
-        name: "IndustryList",
-        mixins: [JeecgListMixin],
-        components: {
-            IndustryModal
-        },
-        data() {
-            return {
-                description: '行业表管理页面',
-                // 表头
-                columns: [
-                    {
-                        title: '#',
-                        dataIndex: '',
-                        key: 'rowIndex',
-                        width: 60,
-                        align: "center",
-                        customRender: function (t, r, index) {
-                            return parseInt(index) + 1;
-                        }
-                    },
-                    {
-                        title: '父ID',
-                        align: "center",
-                        dataIndex: 'parentId'
-                    },
-                    {
-                        title: '行业名称',
-                        align: "center",
-                        dataIndex: 'name'
-                    },
-                    {
-                        title: '操作',
-                        dataIndex: 'action',
-                        align: "center",
-                        scopedSlots: {customRender: 'action'},
-                    }
-                ],
-                url: {
-                    list: "/industry/industry/list",
-                    delete: "/industry/industry/delete",
-                    deleteBatch: "/industry/industry/deleteBatch",
-                    exportXlsUrl: "industry/industry/exportXls",
-                    importExcelUrl: "industry/industry/importExcel",
-                },
-            }
-        },
-        computed: {
-            importExcelUrl: function () {
-                return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-            }
-        },
-        methods: {}
-    }
-</script>
-<style scoped>
-    @import '~@assets/less/common.less'
-</style>

+ 0 - 128
jeecg-boot-module-system/src/main/java/org/jeecg/modules/industry/vue/modules/IndustryModal.vue

@@ -1,128 +0,0 @@
-<template>
-    <a-modal
-            :title="title"
-            :width="800"
-            :visible="visible"
-            :confirmLoading="confirmLoading"
-            @ok="handleOk"
-            @cancel="handleCancel"
-            cancelText="关闭">
-
-        <a-spin :spinning="confirmLoading">
-            <a-form :form="form">
-
-                <a-form-item
-                        :labelCol="labelCol"
-                        :wrapperCol="wrapperCol"
-                        label="父ID">
-                    <a-input placeholder="请输入父ID" v-decorator="['parentId', {}]"/>
-                </a-form-item>
-                <a-form-item
-                        :labelCol="labelCol"
-                        :wrapperCol="wrapperCol"
-                        label="行业名称">
-                    <a-input placeholder="请输入行业名称" v-decorator="['name', {}]"/>
-                </a-form-item>
-
-            </a-form>
-        </a-spin>
-    </a-modal>
-</template>
-
-<script>
-    import {httpAction} from '@/api/manage'
-    import pick from 'lodash.pick'
-    import moment from "moment"
-
-    export default {
-        name: "IndustryModal",
-        data() {
-            return {
-                title: "操作",
-                visible: false,
-                model: {},
-                labelCol: {
-                    xs: {span: 24},
-                    sm: {span: 5},
-                },
-                wrapperCol: {
-                    xs: {span: 24},
-                    sm: {span: 16},
-                },
-
-                confirmLoading: false,
-                form: this.$form.createForm(this),
-                validatorRules: {},
-                url: {
-                    add: "/industry/industry/add",
-                    edit: "/industry/industry/edit",
-                },
-            }
-        },
-        created() {
-        },
-        methods: {
-            add() {
-                this.edit({});
-            },
-            edit(record) {
-                this.form.resetFields();
-                this.model = Object.assign({}, record);
-                this.visible = true;
-                this.$nextTick(() => {
-                    this.form.setFieldsValue(pick(this.model, 'parentId', 'name'))
-                    //时间格式化
-                });
-
-            },
-            close() {
-                this.$emit('close');
-                this.visible = false;
-            },
-            handleOk() {
-                const that = this;
-                // 触发表单验证
-                this.form.validateFields((err, values) => {
-                    if (!err) {
-                        that.confirmLoading = true;
-                        let httpurl = '';
-                        let method = '';
-                        if (!this.model.id) {
-                            httpurl += this.url.add;
-                            method = 'post';
-                        } else {
-                            httpurl += this.url.edit;
-                            method = 'put';
-                        }
-                        let formData = Object.assign(this.model, values);
-                        //时间格式化
-
-                        console.log(formData)
-                        httpAction(httpurl, formData, method).then((res) => {
-                            if (res.success) {
-                                that.$message.success(res.message);
-                                that.$emit('ok');
-                            } else {
-                                that.$message.warning(res.message);
-                            }
-                        }).finally(() => {
-                            that.confirmLoading = false;
-                            that.close();
-                        })
-
-
-                    }
-                })
-            },
-            handleCancel() {
-                this.close()
-            },
-
-
-        }
-    }
-</script>
-
-<style lang="less" scoped>
-
-</style>

+ 0 - 135
jeecg-boot-module-system/src/main/java/org/jeecg/modules/industry/vue/modules/IndustryModal__Style#Drawer.vue

@@ -1,135 +0,0 @@
-<template>
-    <a-drawer
-            :title="title"
-            :width="800"
-            placement="right"
-            :closable="false"
-            @close="close"
-            :visible="visible"
-    >
-
-        <a-spin :spinning="confirmLoading">
-            <a-form :form="form">
-
-                <a-form-item
-                        :labelCol="labelCol"
-                        :wrapperCol="wrapperCol"
-                        label="父ID">
-                    <a-input placeholder="请输入父ID" v-decorator="['parentId', {}]"/>
-                </a-form-item>
-                <a-form-item
-                        :labelCol="labelCol"
-                        :wrapperCol="wrapperCol"
-                        label="行业名称">
-                    <a-input placeholder="请输入行业名称" v-decorator="['name', {}]"/>
-                </a-form-item>
-
-            </a-form>
-        </a-spin>
-        <a-button type="primary" @click="handleOk">确定</a-button>
-        <a-button type="primary" @click="handleCancel">取消</a-button>
-    </a-drawer>
-</template>
-
-<script>
-    import {httpAction} from '@/api/manage'
-    import pick from 'lodash.pick'
-    import moment from "moment"
-
-    export default {
-        name: "IndustryModal",
-        data() {
-            return {
-                title: "操作",
-                visible: false,
-                model: {},
-                labelCol: {
-                    xs: {span: 24},
-                    sm: {span: 5},
-                },
-                wrapperCol: {
-                    xs: {span: 24},
-                    sm: {span: 16},
-                },
-
-                confirmLoading: false,
-                form: this.$form.createForm(this),
-                validatorRules: {},
-                url: {
-                    add: "/industry/industry/add",
-                    edit: "/industry/industry/edit",
-                },
-            }
-        },
-        created() {
-        },
-        methods: {
-            add() {
-                this.edit({});
-            },
-            edit(record) {
-                this.form.resetFields();
-                this.model = Object.assign({}, record);
-                this.visible = true;
-                this.$nextTick(() => {
-                    this.form.setFieldsValue(pick(this.model, 'parentId', 'name'))
-                    //时间格式化
-                });
-
-            },
-            close() {
-                this.$emit('close');
-                this.visible = false;
-            },
-            handleOk() {
-                const that = this;
-                // 触发表单验证
-                this.form.validateFields((err, values) => {
-                    if (!err) {
-                        that.confirmLoading = true;
-                        let httpurl = '';
-                        let method = '';
-                        if (!this.model.id) {
-                            httpurl += this.url.add;
-                            method = 'post';
-                        } else {
-                            httpurl += this.url.edit;
-                            method = 'put';
-                        }
-                        let formData = Object.assign(this.model, values);
-                        //时间格式化
-
-                        console.log(formData)
-                        httpAction(httpurl, formData, method).then((res) => {
-                            if (res.success) {
-                                that.$message.success(res.message);
-                                that.$emit('ok');
-                            } else {
-                                that.$message.warning(res.message);
-                            }
-                        }).finally(() => {
-                            that.confirmLoading = false;
-                            that.close();
-                        })
-
-
-                    }
-                })
-            },
-            handleCancel() {
-                this.close()
-            },
-
-
-        }
-    }
-</script>
-
-<style lang="less" scoped>
-    /** Button按钮间距 */
-    .ant-btn {
-        margin-left: 30px;
-        margin-bottom: 30px;
-        float: right;
-    }
-</style>

+ 0 - 780
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/PerformanceController2.java

@@ -1,780 +0,0 @@
-package org.jeecg.modules.system.controller;
-
-import cn.com.ctop.common.module.entity.MaterialInfo;
-import cn.com.ctop.performanceaccount.entity.PerformanceAccount;
-import cn.com.ctop.performanceappraisal.entity.Performance;
-import cn.com.ctop.userefficientvideomap.entity.*;
-import cn.com.ctop.userefficientvideomap.mapper.UserEfficientVideoMapMapper;
-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.commons.lang.StringUtils;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.ctop.entity.Project;
-import org.jeecg.modules.system.service.IPerformanceService2;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 设计师季度绩效表2
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-10
- */
-@Slf4j
-@Api(tags = "设计师季度绩效表2")
-@RestController
-@RequestMapping("/ctop/performance2")
-public class PerformanceController2 {
-    @Autowired
-    private IPerformanceService2 performanceService;
-    @Autowired
-    private UserEfficientVideoMapMapper userEfficientVideoMapMapper;
-
-    //平台的总有效数量、素材总数、素材有效率、总跑量、当前可获得绩效
-    @AutoLog(value = "平台的总有效数量、素材总数、素材有效率、总跑量、当前可获得绩效")
-    @ApiOperation(value = "平台的总有效数量、素材总数、素材有效率、总跑量、当前可获得绩效", notes = "平台的总有效数量、素材总数、素材有效率、总跑量、当前可获得绩效")
-    @PostMapping(value = "/getPerformanceInfo")
-    public Result<Map<String,Object>> getPerformanceInfo() {
-        Result<Map<String, Object>> result = new Result<>();
-        Map<String,Object> resultMap = new HashMap<>();
-        try {
-            resultMap = performanceService.getPerformanceInfo();
-            result.setSuccess(true);
-            result.setResult(resultMap);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("/getPerformanceInfo出错啦");
-        }
-        return result;
-    }
-
-    //有效率排行榜
-    @AutoLog(value = "有效率排行榜")
-    @ApiOperation(value = "有效率排行榜", notes = "有效率排行榜")
-    @PostMapping(value = "/effiRateRank")
-    public Result<Map<String,Object>> effiRateRank(@RequestParam(name = "pageSize")Integer pageSize) {
-        Result<Map<String,Object>> result = new Result<Map<String,Object>>();
-        Map<String,Object> resultMap = new HashMap<>();
-        try {
-            resultMap = performanceService.effiRateRank(pageSize);
-            result.setSuccess(true);
-            result.setResult(resultMap);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("/ctop/performance2/effiRateRank出错啦");
-        }
-        return result;
-    }
-
-    //素材、素材跑量、封面点击数、封面曝光数、行为数
-    @AutoLog(value = "素材、素材跑量、封面点击数、封面曝光数、行为数")
-    @ApiOperation(value = "素材、素材跑量、封面点击数、封面曝光数、行为数", notes = "素材、素材跑量、封面点击数、封面曝光数、行为数")
-    @PostMapping(value = "/materialInfoList")
-    public Result<Map<String,Object>> materialInfoList() {
-        Result<Map<String,Object>> result = new Result<Map<String,Object>>();
-        Map<String,Object> resultMap = new HashMap<>();
-        try {
-            List<DesignMaterialInfo> designMaterialInfoList= performanceService.materialInfoList();
-            resultMap.put("designMaterialInfoList",designMaterialInfoList);
-            result.setSuccess(true);
-            result.setResult(resultMap);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("/ctop/performance2/materialInfoList出错啦");
-        }
-        return result;
-    }
-
-    //点击+符号 投放账户、投放账户、跑量
-    @AutoLog(value = "点击账户增加_投放账户、投放账户、跑量")
-    @ApiOperation(value = "点击账户增加_投放账户、投放账户、跑量", notes = "点击账户增加_投放账户、投放账户、跑量")
-    @PostMapping(value = "/materialAccountInfo")
-    public Result<Map<String,Object>> materialAccountInfo(@RequestParam(name = "materialId")String materialId) {
-        Result<Map<String,Object>> result = new Result<Map<String,Object>>();
-        Map<String,Object> resultMap = new HashMap<>();
-        try {
-            List<DesignMaterialInfo> designMaterialInfoList= performanceService.materialAccountInfo(materialId);
-            resultMap.put("designMaterialInfoList",designMaterialInfoList);
-            result.setSuccess(true);
-            result.setResult(resultMap);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("/ctop/performance2/materialAccountInfo出错啦");
-        }
-        return result;
-    }
-
-    @AutoLog(value = "根据year、quarter计算季度设计师绩效")
-    @ApiOperation(value = "根据year、quarter计算季度设计师绩效", notes = "根据year、quarter计算季度设计师绩效")
-    @GetMapping(value = "/designerPerformance")
-    public Result<Map<String, Object>> designerPerformanceTask(@RequestParam(name = "year", required = true) int year,
-                                                               @RequestParam(name = "quarter", required = true) int quarter) {
-        Result<Map<String, Object>> result = new Result<Map<String, Object>>();
-        try {
-            performanceService.designerPerformanceTask(year, quarter);
-            result.setSuccess(true);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            log.error("/ctop/performance2/designerPerformance出错啦" + "year:" + year + " quarter:" + quarter);
-            result.error500("/ctop/performance2/designerPerformance出错啦");
-        }
-        return result;
-    }
-
-    @AutoLog(value = "有效视频定时任务")
-    @ApiOperation(value = "有效视频定时任务", notes = "calcDate传递yyyy-MM-dd格式的日期")
-    @GetMapping(value = "/efficientVideo")
-    public Result<Map<String, Object>> efficientVideo(@RequestParam(name = "calcDate", required = true) String calcDate) {
-        log.info("有效视频任务开始,有效视频所属时间为" + calcDate);
-        Result<Map<String, Object>> result = new Result<Map<String, Object>>();
-        if (StringUtils.isBlank(calcDate)) {
-            result.error500("时间不能为空");
-        }
-        try {
-            //String calc = "2020-01-03";
-            //for(int i=0; i<12 ;i++){
-            //    if(i!=0){
-            //        calc = DateUtils.addDay( calc,  7);
-            //    }
-            //    performanceService.efficientVideoTask(calc);
-            //}
-            performanceService.efficientVideoTask(calcDate);
-            result.setSuccess(true);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            log.error("/ctop/performance2/efficientVideo出错啦" + "date:" + calcDate);
-            result.error500("/ctop/performance2/efficientVideo出错啦");
-        }
-        return result;
-    }
-
-    @AutoLog(value = "根据year、quarter计算kuaishou季度设计师绩效")
-    @ApiOperation(value = "根据year、quarter计算kuaishou季度设计师绩效", notes = "根据year、quarter计算kuaishou季度设计师绩效")
-    @PostMapping(value = "/toutiaoDesignerPerformance")
-    public Result<Map<String, Object>> toutiaoDesignerPerformance(@RequestParam(name = "year", required = true) int year,
-                                                                  @RequestParam(name = "quarter", required = true) int quarter) {
-        Result<Map<String, Object>> result = new Result<Map<String, Object>>();
-        try {
-            performanceService.toutiaoDesigner(year, quarter);
-            result.setSuccess(true);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            log.error("/ctop/performance2/toutiaoDesignerPerformance出错啦" + "year:" + year + " quarter:" + quarter);
-            result.error500("/ctop/performance2/toutiaoDesignerPerformance出错啦");
-        }
-        return result;
-    }
-
-    @AutoLog(value = "根据year、quarter计算toutiao季度设计师绩效")
-    @ApiOperation(value = "根据year、quarter计算toutiao季度设计师绩效", notes = "根据year、quarter计算toutiao季度设计师绩效")
-    @PostMapping(value = "/kuaishouDesignerPerformance")
-    public Result<Map<String, Object>> kuaishouDesignerPerformance(@RequestParam(name = "year", required = true) int year,
-                                                                   @RequestParam(name = "quarter", required = true) int quarter) {
-        Result<Map<String, Object>> result = new Result<Map<String, Object>>();
-        try {
-            performanceService.kuaishouDesigner(year, quarter);
-            result.setSuccess(true);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            log.error("/ctop/performance2/kuaishouDesignerPerformance出错啦" + "year:" + year + " quarter:" + quarter);
-            result.error500("/ctop/performance2/kuaishouDesignerPerformance出错啦");
-        }
-        return result;
-    }
-
-    @AutoLog(value = "获取设计师组下所有人的绩效")
-    @ApiOperation(value = "获取设计师组下所有人的绩效", notes = "获取设计师组下所有人的绩效")
-    @PostMapping(value = "/designerLastQuarterPerformanceInfo")
-    public Result<Map<String, Object>> designerLastQuarterPerformanceInfo() {
-        Result<Map<String, Object>> result = new Result<Map<String, Object>>();
-        try {
-            Map<String, Object> resultMap = performanceService.designerLastQuarterPerformanceInfo();
-            result.setResult(resultMap);
-            result.setSuccess(true);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            log.error("/ctop/performance2/designerLastQuarterPerformanceInfo出错啦");
-            result.error500("/ctop/performance2/designerLastQuarterPerformanceInfo出错啦");
-        }
-        return result;
-    }
-
-    @AutoLog(value = "获取同一媒体类型下上个季度所有人的绩效")
-    @ApiOperation(value = "获取同一媒体类型下上个季度所有人的绩效", notes = "获取同一媒体类型下上个季度所有人的绩效")
-    @PostMapping(value = "/quarterUserPerformanceList")
-    public Result<Map<String, Object>> quarterUserPerformanceList(@RequestParam(name = "appType", required = true) int appType) {
-        Result<Map<String, Object>> result = new Result<Map<String, Object>>();
-        try {
-            Map<String, Object> resultMap = performanceService.quarterUserPerformanceList(appType);
-            result.setResult(resultMap);
-            result.setSuccess(true);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            log.error("/ctop/performance2/quarterUserPerformanceList出错啦");
-            result.error500("/ctop/performance2/quarterUserPerformanceList出错啦");
-        }
-        return result;
-    }
-
-    @AutoLog(value = "获取快手上个季度的季度有效数、素材总数、上个季度的绩效")
-    @ApiOperation(value = "获取快手上个季度的季度有效数、素材总数、上个季度的绩效", notes = "获取快手上个季度的季度有效数、素材总数、上个季度的绩效")
-    @PostMapping(value = "/kuaishouDesignerLastQuarterPerformanceInfo")
-    public Result<Map<String, Object>> kuaishouDesignerLastQuarterPerformanceInfo() {
-        Result<Map<String, Object>> result = new Result<Map<String, Object>>();
-        Map<String, Object> resultMap = new HashMap<>();
-        try {
-            resultMap = performanceService.kuaishouDesignerLastQuarterPerformanceInfo();
-            result.setResult(resultMap);
-            result.setSuccess(true);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            log.error("/ctop/performance2/kuaishouDesignerLastQuarterPerformanceInfo出错啦");
-            result.error500("/ctop/performance2/kuaishouDesignerLastQuarterPerformanceInfo出错啦");
-        }
-        return result;
-    }
-
-    @AutoLog(value = "获取平面设计师上个季度的绩效")
-    @ApiOperation(value = "获取平面设计师上个季度的绩效", notes = "获取平面设计师上个季度的绩效")
-    @PostMapping(value = "/planeLastQuarterPerformanceInfo")
-    public Result<Map<String, Object>> planeLastQuarterPerformanceInfo(@RequestParam(name = "appType", required = true) int appType) {
-        Result<Map<String, Object>> result = new Result<Map<String, Object>>();
-        try {
-            Map<String, Object> resultMap = performanceService.planeLastQuarterPerformanceInfo(appType);
-            result.setResult(resultMap);
-            result.setSuccess(true);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            log.error("/ctop/performance2/planeLastQuarterPerformanceInfo出错啦");
-            result.error500("/ctop/performance2/planeLastQuarterPerformanceInfo出错啦");
-        }
-        return result;
-    }
-
-    /**
-     * 分页列表查询
-     *
-     * @param performance
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "平面设计师季度绩效表-分页列表查询")
-    @ApiOperation(value = "平面设计师季度绩效表-分页列表查询", notes = "平面设计师季度绩效表-分页列表查询")
-    @GetMapping(value = "/planePerformanceList")
-    public Result<IPage<Performance>> planePerformanceList(Performance performance,
-                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                           HttpServletRequest req) {
-        Result<IPage<Performance>> result = new Result<IPage<Performance>>();
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        performance.setUserId(sysUser.getId());
-        QueryWrapper<Performance> queryWrapper = QueryGenerator.initQueryWrapper(performance, req.getParameterMap());
-        Page<Performance> page = new Page<Performance>(pageNo, pageSize);
-        IPage<Performance> pageList = performanceService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 分页列表查询
-     *
-     * @param performance
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "平面设计师季度绩效表-分页列表查询")
-    @ApiOperation(value = "平面设计师季度绩效表-分页列表查询", notes = "平面设计师季度绩效表-分页列表查询")
-    @GetMapping(value = "/designerDepartMemberPerformanceList")
-    public Result<IPage<Performance>> designerDepartMemberPerformanceList(Performance performance,
-                                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                          HttpServletRequest req) {
-        Result<IPage<Performance>> result = new Result<IPage<Performance>>();
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String departId = userEfficientVideoMapMapper.getDepartIdByUserId("e9ca23d68d884d4ebb19d07889727dae");
-        List<String> userIdList = userEfficientVideoMapMapper.getUserIdListByDepId(departId);
-        //
-        QueryWrapper<Performance> queryWrapper = QueryGenerator.initQueryWrapper(performance, req.getParameterMap());
-        queryWrapper.in("user_id", userIdList);
-
-        Page<Performance> page = new Page<Performance>(pageNo, pageSize);
-        IPage<Performance> pageList = performanceService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    @AutoLog(value = "获取快手绩效时时数据接口")
-    @ApiOperation(value = "获取快手绩效时时数据接口", notes = "获取快手绩效时时数据接口")
-    @PostMapping(value = "/kuaishouPerformanceInfoNow")
-    public Result<List<UserDto2>> kuaishouPerformanceInfoNow(HttpServletRequest req) {
-        Result<List<UserDto2>> result = new Result<List<UserDto2>>();
-        List<UserDto2> userDto2List = performanceService.kuaishouPerformanceInfoNow();
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-    @AutoLog(value = "获取快手优化师绩效时时数据接口")
-    @ApiOperation(value = "获取快手优化师绩效时时数据接口", notes = "获取快手优化师绩效时时数据接口")
-    @PostMapping(value = "/kuaishouYouhuaPerformanceInfoNow")
-    public Result<List<UserDto2>> kuaishouYouhuaPerformanceInfoNow(HttpServletRequest req) {
-        Result<List<UserDto2>> result = new Result<List<UserDto2>>();
-        List<UserDto2> userDto2List = performanceService.kuaishouYouhuaPerformanceInfoNow();
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-    @AutoLog(value = "获取头条优化师绩效时时数据接口")
-    @ApiOperation(value = "获取头条优化师绩效时时数据接口", notes = "获取头条优化师绩效时时数据接口")
-    @PostMapping(value = "/toutiaoYouhuaPerformanceInfoNow")
-    public Result<List<UserDto2>> toutiaoYouhuaPerformanceInfoNow(HttpServletRequest req) {
-        Result<List<UserDto2>> result = new Result<List<UserDto2>>();
-        List<UserDto2> userDto2List = performanceService.toutiaoYouhuaPerformanceInfoNow();
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-    @AutoLog(value = "获取快手优化师所属账号信息")
-    @ApiOperation(value = "获取快手优化师所属账号信息", notes = "获取快手优化师所属账号信息")
-    @PostMapping(value = "/getKuaiShouYouhuaAccountsList")
-    public Result<List<AccountDTO>> getKuaiShouYouhuaAccountsList(@RequestBody PerformanceTimeDTO dto, HttpServletRequest req) {
-        Result<List<AccountDTO>> result = new Result<>();
-        String userId = dto.getUserId();
-        Integer year = dto.getYear();
-        Integer quarter = dto.getQuarter();
-        Integer appType = dto.getAppType();
-        if(userId==null || appType == null){
-            result.setSuccess(false);
-            result.setMessage("userId和appType不能为空");
-        }
-        List<AccountDTO> accountDTOList = performanceService.getKuaiShouYouhuaAccountsList(userId, appType, year, quarter);
-        result.setSuccess(true);
-        result.setResult(accountDTOList);
-        return result;
-    }
-
-    @AutoLog(value = "获取头条优化师所属账号信息")
-    @ApiOperation(value = "获取头条优化师所属账号信息", notes = "获取头条优化师所属账号信息")
-    @PostMapping(value = "/getToutiaoYouhuaAccountsList")
-    public Result<List<AccountDTO>> getToutiaoYouhuaAccountsList(@RequestBody PerformanceTimeDTO dto, HttpServletRequest req) {
-        Result<List<AccountDTO>> result = new Result<>();
-        String userId = dto.getUserId();
-        Integer year = dto.getYear();
-        Integer quarter = dto.getQuarter();
-        Integer appType = dto.getAppType();
-        if(userId==null || appType == null){
-            result.setSuccess(false);
-            result.setMessage("userId和appType不能为空");
-        }
-        List<AccountDTO> accountDTOList = performanceService.getToutiaoYouhuaAccountsList(userId, appType, year, quarter);
-        result.setSuccess(true);
-        result.setResult(accountDTOList);
-        return result;
-    }
-
-    @AutoLog(value = "获取头条绩效时时数据接口")
-    @ApiOperation(value = "获取头条绩效时时数据接口", notes = "获取头条绩效时时数据接口")
-    @PostMapping(value = "/toutiaoPerformanceInfoNow")
-    public Result<List<UserDto2>> toutiaoPerformanceInfoNow(HttpServletRequest req) {
-        Result<List<UserDto2>> result = new Result<List<UserDto2>>();
-        List<UserDto2> userDto2List = performanceService.toutiaoPerformanceInfoNow();
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-    @AutoLog(value = "获取快手绩效周报表")
-    @ApiOperation(value = "获取快手绩效周报表", notes = "获取快手绩效周报表")
-    @PostMapping(value = "/kuaishouWeekReport")
-    public Result<List<UserDto2>> kuaishouWeekReport(@RequestBody PerformanceTimeDTO dto,
-                                                     HttpServletRequest req) {
-        Result<List<UserDto2>> result = new Result<List<UserDto2>>();
-        String startDate = dto.getStartDate();
-        String endDate = dto.getEndDate();
-        if(StringUtils.isBlank(startDate) || StringUtils.isBlank(endDate)){
-            result.setSuccess(false);
-            result.setMessage("时间不能为空");
-            return result;
-        }
-        List<UserDto2> userDto2List = performanceService.kuaishouWeekReport(startDate, endDate);
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-    @AutoLog(value = "获取头条绩效周报表")
-    @ApiOperation(value = "获取头条绩效周报表", notes = "获取头条绩效周报表")
-    @PostMapping(value = "/toutiaoWeekReport")
-    public Result<List<UserDto2>> toutiaoWeekReport(@RequestBody PerformanceTimeDTO dto,
-                                                    HttpServletRequest req) {
-        Result<List<UserDto2>> result = new Result<List<UserDto2>>();
-        String startDate = dto.getStartDate();
-        String endDate = dto.getEndDate();
-        if(StringUtils.isBlank(startDate) || StringUtils.isBlank(endDate)){
-            result.setSuccess(false);
-            result.setMessage("时间不能为空");
-            return result;
-        }
-        List<UserDto2> userDto2List = performanceService.toutiaoWeekReport(startDate, endDate);
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-    //快手优化师周报
-    @AutoLog(value = "获取快手优化师绩效周报表")
-    @ApiOperation(value = "获取快手优化师绩效周报表", notes = "获取快手优化师绩效周报表")
-    @PostMapping(value = "/kuaishouYouhuaWeekReport")
-    public Result<List<UserDto2>> kuaishouYouhuaWeekReport(@RequestBody PerformanceTimeDTO dto,
-                                                     HttpServletRequest req) {
-        Result<List<UserDto2>> result = new Result<List<UserDto2>>();
-        String startDate = dto.getStartDate();
-        String endDate = dto.getEndDate();
-        if(StringUtils.isBlank(startDate) || StringUtils.isBlank(endDate)){
-            result.setSuccess(false);
-            result.setMessage("时间不能为空");
-            return result;
-        }
-        List<UserDto2> userDto2List = performanceService.kuaishouYouhuaWeekReport(startDate, endDate);
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-    //头条优化师周报
-    @AutoLog(value = "获取头条优化师绩效周报表")
-    @ApiOperation(value = "获取头条优化师绩效周报表", notes = "获取头条绩效周报表")
-    @PostMapping(value = "/toutiaoYouhuaWeekReport")
-    public Result<List<UserDto2>> toutiaoYouhuaWeekReport(@RequestBody PerformanceTimeDTO dto,
-                                                    HttpServletRequest req) {
-        Result<List<UserDto2>> result = new Result<List<UserDto2>>();
-        String startDate = dto.getStartDate();
-        String endDate = dto.getEndDate();
-        if(StringUtils.isBlank(startDate) || StringUtils.isBlank(endDate)){
-            result.setSuccess(false);
-            result.setMessage("时间不能为空");
-            return result;
-        }
-        List<UserDto2> userDto2List = performanceService.toutiaoYouhuaWeekReport(startDate, endDate);
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-    @AutoLog(value = "获取快手季度绩效报表")
-    @ApiOperation(value = "获取快手季度绩效报表", notes = "获取快手季度绩效报表")
-    @PostMapping(value = "/kuaishouQuarterReport")
-    public Result<List<UserDto2>> kuaishouQuarterReport(@RequestBody PerformanceTimeDTO dto,
-                                                        HttpServletRequest req) {
-        Result<List<UserDto2>> result = new Result<List<UserDto2>>();
-        Integer year = dto.getYear();
-        Integer quarter = dto.getQuarter();
-        if(year==null || quarter == null){
-            result.setSuccess(false);
-            result.setMessage("时间不能为空");
-        }
-        List<UserDto2> userDto2List = performanceService.kuaishouQuarterReport(year, quarter);
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-    @AutoLog(value = "获取头条季度绩效报表")
-    @ApiOperation(value = "获取头条季度绩效报表", notes = "获取头条季度绩效报表")
-    @PostMapping(value = "/toutiaoQuarterReport")
-    public Result<List<UserDto2>> toutiaoQuarterReport(@RequestBody PerformanceTimeDTO dto,
-                                                       HttpServletRequest req) {
-        Result<List<UserDto2>> result = new Result<List<UserDto2>>();
-        Integer year = dto.getYear();
-        Integer quarter = dto.getQuarter();
-        if(year==null || quarter == null){
-            result.setSuccess(false);
-            result.setMessage("时间不能为空");
-        }
-        List<UserDto2> userDto2List = performanceService.toutiaoQuarterReport(year, quarter);
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-    @AutoLog(value = "获取相关有效视频列表")
-    @ApiOperation(value = "获取相关有效视频列表", notes = "获取相关有效视频列表")
-    @PostMapping(value = "/getEffiVideoList")
-    public Result<List<MaterialInfo>> getEffiVideoList(@RequestBody PerformanceTimeDTO dto,
-                                                       HttpServletRequest req) {
-        Result<List<MaterialInfo>> result = new Result<>();
-        String userId = dto.getUserId();
-        Integer year = dto.getYear();
-        Integer quarter = dto.getQuarter();
-        Integer appType = dto.getAppType();
-        if(userId==null || appType == null){
-            result.setSuccess(false);
-            result.setMessage("userId和appType不能为空");
-        }
-        List<MaterialInfo> materialInfoList = performanceService.effiVideoList(appType, year, quarter, userId);
-        result.setSuccess(true);
-        result.setResult(materialInfoList);
-        return result;
-    }
-
-    @AutoLog(value = "获取相关视频列表")
-    @ApiOperation(value = "获取相关视频列表", notes = "获取相关视频列表")
-    @PostMapping(value = "/getVideoList")
-    public Result<List<MaterialInfo>> getVideoList(@RequestBody PerformanceTimeDTO dto,
-                                                       HttpServletRequest req) {
-        Result<List<MaterialInfo>> result = new Result<>();
-        String userId = dto.getUserId();
-        String startDate = dto.getStartDate();
-        String endDate = dto.getEndDate();
-        Integer appType = dto.getAppType();
-        if(userId==null || startDate == null || endDate == null){
-            result.setSuccess(false);
-            result.setMessage("userId和时间不能为空");
-        }
-        List<MaterialInfo> materialInfoList = performanceService.getVideoList(appType, userId, startDate, endDate);
-        result.setSuccess(true);
-        result.setResult(materialInfoList);
-        return result;
-    }
-
-    @AutoLog(value = "获取本周相关有效视频列表")
-    @ApiOperation(value = "获取本周相关有效视频列表", notes = "获取本周相关有效视频列表")
-    @PostMapping(value = "/getWeekEffiVideoList")
-    public Result<List<MaterialInfo>> getWeekEffiVideoList(@RequestBody PerformanceTimeDTO dto,
-                                                       HttpServletRequest req) {
-        Result<List<MaterialInfo>> result = new Result<>();
-        String userId = dto.getUserId();
-        String startDate = dto.getStartDate();
-        String endDate = dto.getEndDate();
-        Integer appType = dto.getAppType();
-        if(userId==null || appType == null){
-            result.setSuccess(false);
-            result.setMessage("userId和appType不能为空");
-        }
-        List<MaterialInfo> materialInfoList = performanceService.getEffiWeekVideoList(appType, startDate, endDate, userId);
-        result.setSuccess(true);
-        result.setResult(materialInfoList);
-        return result;
-    }
-
-    //快手优化季度绩效报表
-    //List<UserDto2> kuaishouYouhuaQuarterReport(Integer year, Integer quarter);
-    @AutoLog(value = "快手优化季度绩效报表")
-    @ApiOperation(value = "快手优化季度绩效报表", notes = "快手优化季度绩效报表")
-    @PostMapping(value = "/kuaishouYouhuaQuarterReport")
-    public Result<List<UserDto2>> kuaishouYouhuaQuarterReport(@RequestBody PerformanceTimeDTO dto,
-                                                             HttpServletRequest req) {
-        Result<List<UserDto2>> result = new Result<List<UserDto2>>();
-        Integer year = dto.getYear();
-        Integer quarter = dto.getQuarter();
-        if(year==null || quarter == null){
-            result.setSuccess(false);
-            result.setMessage("时间不能为空");
-        }
-        List<UserDto2> userDto2List = performanceService.kuaishouYouhuaQuarterReport(year, quarter);
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-    //头条优化季度绩效报表
-    @AutoLog(value = "头条优化季度绩效报表")
-    @ApiOperation(value = "头条优化季度绩效报表", notes = "头条优化季度绩效报表")
-    @PostMapping(value = "/toutiaoYouhuaQuarterReport")
-    public Result<List<UserDto2>> toutiaoYouhuaQuarterReport(@RequestBody PerformanceTimeDTO dto,
-                                                       HttpServletRequest req) {
-        Result<List<UserDto2>> result = new Result<List<UserDto2>>();
-        Integer year = dto.getYear();
-        Integer quarter = dto.getQuarter();
-        if(year==null || quarter == null){
-            result.setSuccess(false);
-            result.setMessage("时间不能为空");
-        }
-        List<UserDto2> userDto2List = performanceService.toutiaoYouhuaQuarterReport(year, quarter);
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-
-    //头条优化季度绩效报表
-    @AutoLog(value = "头条优化季度绩效报表")
-    @ApiOperation(value = "头条优化季度绩效报表", notes = "头条优化季度绩效报表")
-    @PostMapping(value = "/getYunyingQuarterDetailByUserId")
-    public Result<List<PerformanceAccount>> getYunyingQuarterDetailByUserId(@RequestBody PerformanceTimeDTO dto,
-                                                             HttpServletRequest req) {
-        Result<List<PerformanceAccount>> result = new Result<>();
-        Integer year = dto.getYear();
-        Integer quarter = dto.getQuarter();
-        String userId = dto.getUserId();
-        Integer appType = dto.getAppType();
-        if(year==null || quarter == null || StringUtils.isBlank(userId) || appType == null){
-            result.setSuccess(false);
-            result.setMessage("时间不能为空");
-        }
-        List<PerformanceAccount> userDto2List = performanceService.getYunyingQuarterDetailByUserId(year, quarter, userId, appType);
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-
-    @AutoLog(value = "项目报表-按平台获取其下所有项目信息以及消耗")
-    @ApiOperation(value = "按平台获取其下所有项目信息以及消耗", notes = "按平台获取其下所有项目信息以及消耗")
-    @PostMapping(value = "/getProjcetListByMediaType")
-    public Result<List<ProjectDTO>> getProjcetListByMediaType(@RequestBody PerformanceTimeDTO dto,
-                                                             HttpServletRequest req) {
-        Result<List<ProjectDTO>> result = new Result<>();
-        Integer year = dto.getYear();
-        Integer quarter = dto.getQuarter();
-        Integer appType = dto.getAppType();
-        if(year==null || quarter == null || appType == null ){
-            result.setSuccess(false);
-            result.setMessage("媒体类型均不能为空");
-        }
-        List<ProjectDTO> userDto2List = performanceService.getProjcetListByMediaType(year, quarter, appType);
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-    @AutoLog(value = "项目报表-根据projectId获取其下账户季度消耗信息")
-    @ApiOperation(value = "根据projectId获取其下账户季度消耗信息", notes = "根据projectId获取其下账户季度消耗信息")
-    @PostMapping(value = "/getQuarterAccountDetail")
-    public Result<List<AccountDTO>> getQuarterAccountDetail(@RequestBody PerformanceTimeDTO dto,
-                                                              HttpServletRequest req) {
-        Result<List<AccountDTO>> result = new Result<>();
-        Integer year = dto.getYear();
-        Integer quarter = dto.getQuarter();
-        Integer appType = dto.getAppType();
-        Integer projectId = dto.getProjectId();
-        if(year==null || quarter == null || appType == null || projectId == null){
-            result.setSuccess(false);
-            result.setMessage("媒体类型均不能为空");
-        }
-        List<AccountDTO> userDto2List = performanceService.getQuarterAccountDetail(year, quarter, projectId, appType);
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-    @AutoLog(value = "项目报表-根据accountId获取季度视频信息")
-    @ApiOperation(value = "根据accountId获取季度视频信息", notes = "根据accountId获取季度视频信息")
-    @PostMapping(value = "/getKuaishouQuarterVideoInfoByAccountId")
-    public Result<List<VideoDTO>> getKuaishouQuarterVideoInfoByAccountId(@RequestBody PerformanceTimeDTO dto,
-                                                            HttpServletRequest req) {
-        Result<List<VideoDTO>> result = new Result<>();
-        Integer year = dto.getYear();
-        Integer quarter = dto.getQuarter();
-        Long accountId = dto.getAccountId();
-        if(year==null || quarter == null || accountId == null ){
-            result.setSuccess(false);
-            result.setMessage("媒体类型均不能为空");
-        }
-        List<VideoDTO> userDto2List = performanceService.getKuaishouQuarterVideoInfoByAccountId(year, quarter, accountId);
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-    @AutoLog(value = "项目报表-根据accountId获取季度视频信息")
-    @ApiOperation(value = "根据accountId获取季度视频信息", notes = "根据accountId获取季度视频信息")
-    @PostMapping(value = "/getToutiaoQuarterVideoInfoByAccountId")
-    public Result<List<VideoDTO>> getToutiaoQuarterVideoInfoByAccountId(@RequestBody PerformanceTimeDTO dto,
-                                                                         HttpServletRequest req) {
-        Result<List<VideoDTO>> result = new Result<>();
-        Integer year = dto.getYear();
-        Integer quarter = dto.getQuarter();
-        Long accountId = dto.getAccountId();
-        if(year==null || quarter == null || accountId == null ){
-            result.setSuccess(false);
-            result.setMessage("媒体类型均不能为空");
-        }
-        List<VideoDTO> userDto2List = performanceService.getToutiaoQuarterVideoInfoByAccountId(year, quarter, accountId);
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-    @AutoLog(value = "项目报表-根据accountId获取季度视频信息")
-    @ApiOperation(value = "根据accountId获取季度视频信息", notes = "根据accountId获取季度视频信息")
-    @PostMapping(value = "/getUserQuarterVideo")
-    public Result<List<VideoDTO>> getUserQuarterVideo(@RequestBody PerformanceTimeDTO dto,
-                                                                        HttpServletRequest req) {
-        Result<List<VideoDTO>> result = new Result<>();
-        Integer year = dto.getYear();
-        Integer quarter = dto.getQuarter();
-        String userId = dto.getUserId();
-        if(year==null || quarter == null || userId == null ){
-            result.setSuccess(false);
-            result.setMessage("媒体类型均不能为空");
-        }
-        List<VideoDTO> userDto2List = performanceService.getUserQuarterVideo(year, quarter, userId);
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-    @AutoLog(value = "项目报表-根据userId获取有效视频信息")
-    @ApiOperation(value = "根据userId获取有效视频信息", notes = "根据userId获取有效视频信息")
-    @PostMapping(value = "/getUserQuarterEffiVideo")
-    public Result<List<VideoDTO>> getUserQuarterEffiVideo(@RequestBody PerformanceTimeDTO dto,
-                                                      HttpServletRequest req) {
-        Result<List<VideoDTO>> result = new Result<>();
-        Integer year = dto.getYear();
-        Integer quarter = dto.getQuarter();
-        String userId = dto.getUserId();
-        if(year==null || quarter == null || userId == null ){
-            result.setSuccess(false);
-            result.setMessage("媒体类型均不能为空");
-        }
-        List<VideoDTO> userDto2List = performanceService.getUserQuarterEffiVideo(year, quarter, userId);
-        result.setSuccess(true);
-        result.setResult(userDto2List);
-        return result;
-    }
-
-    @AutoLog(value = "绩效-获取快手、头条下各账户下视频的季度消耗")
-    @ApiOperation(value = "绩效-获取快手、头条下各账户下视频的季度消耗", notes = "绩效-获取快手、头条下各账户下视频的季度消耗")
-    @PostMapping(value = "/getQuarterVideoInfoByAccountId")
-    public Result getQuarterVideoInfoByAccountId(@RequestBody PerformanceTimeDTO dto,
-                                                          HttpServletRequest req) {
-        Result result = new Result<>();
-        Integer year = dto.getYear();
-        Integer quarter = dto.getQuarter();
-        if(year==null || quarter == null  ){
-            result.setSuccess(false);
-            result.setMessage("媒体类型均不能为空");
-        }
-        performanceService.getQuarterVideoInfoByAccountId(year, quarter);
-        result.setSuccess(true);
-        return result;
-    }
-
-
-
-}

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

@@ -17,11 +17,11 @@ import org.jeecg.common.util.SqlInjectionUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.system.entity.SysDict;
 import org.jeecg.modules.system.entity.SysDictItem;
+import org.jeecg.modules.system.model.SysDictPage;
 import org.jeecg.modules.system.model.SysDictTree;
 import org.jeecg.modules.system.model.TreeSelectModel;
 import org.jeecg.modules.system.service.ISysDictItemService;
 import org.jeecg.modules.system.service.ISysDictService;
-import org.jeecg.modules.system.vo.SysDictPage;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;

+ 15 - 20
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysLogController.java

@@ -1,15 +1,15 @@
 package org.jeecg.modules.system.controller;
 
 
-import java.util.Arrays;
-
-import javax.servlet.http.HttpServletRequest;
-
+import cn.com.ctop.common.module.entity.SysRole;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.system.entity.SysLog;
-import org.jeecg.modules.system.entity.SysRole;
 import org.jeecg.modules.system.service.ISysLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,11 +17,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import lombok.extern.slf4j.Slf4j;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
 /**
  * <p>
@@ -35,11 +32,11 @@ import lombok.extern.slf4j.Slf4j;
 @RequestMapping("/sys/log")
 @Slf4j
 public class SysLogController {
-	
-	@Autowired
+
+    @Autowired
 	private ISysLogService sysLogService;
-	
-	/**
+
+    /**
 	 * @功能:查询日志记录
 	 * @param syslog
 	 * @param pageNo
@@ -71,8 +68,8 @@ public class SysLogController {
 		result.setResult(pageList);
 		return result;
 	}
-	
-	/**
+
+    /**
 	 * @功能:删除单个日志记录
 	 * @param id
 	 * @return
@@ -91,8 +88,8 @@ public class SysLogController {
 		}
 		return result;
 	}
-	
-	/**
+
+    /**
 	 * @功能:批量,全部清空日志记录
 	 * @param ids
 	 * @return
@@ -112,6 +109,4 @@ public class SysLogController {
 		}
 		return result;
 	}
-	
-	
 }

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

@@ -1,6 +1,8 @@
 package org.jeecg.modules.system.controller;
 
 
+import cn.com.ctop.common.module.entity.SysRole;
+import cn.com.ctop.common.module.service.ISysRoleService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -16,13 +18,11 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.system.entity.SysPermission;
 import org.jeecg.modules.system.entity.SysPermissionDataRule;
-import org.jeecg.modules.system.entity.SysRole;
 import org.jeecg.modules.system.entity.SysRolePermission;
 import org.jeecg.modules.system.model.TreeModel;
 import org.jeecg.modules.system.service.ISysPermissionDataRuleService;
 import org.jeecg.modules.system.service.ISysPermissionService;
 import org.jeecg.modules.system.service.ISysRolePermissionService;
-import org.jeecg.modules.system.service.ISysRoleService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -74,9 +74,9 @@ public class SysRoleController {
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	public Result<IPage<SysRole>> queryPageList(SysRole role,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
+                                                @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                HttpServletRequest req) {
 		Result<IPage<SysRole>> result = new Result<IPage<SysRole>>();
 		QueryWrapper<SysRole> queryWrapper = QueryGenerator.initQueryWrapper(role, req.getParameterMap());
 		Page<SysRole> page = new Page<SysRole>(pageNo, pageSize);

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

@@ -1,7 +1,8 @@
 package org.jeecg.modules.system.controller;
 
-
-import cn.com.ctop.bytedance.mapper.MaterialReportMapper;
+import cn.com.ctop.common.module.vo.SysDepartUsersVO;
+import cn.com.ctop.common.module.vo.SysUserRoleVO;
+import cn.com.ctop.common.module.vo.SysUserVo;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -19,14 +20,13 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.*;
-import org.jeecg.modules.system.mapper.SysUserMapper;
-import org.jeecg.modules.system.mapper.UserCompanyMapper;
+import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.entity.SysUserDepart;
+import org.jeecg.modules.system.entity.SysUserRole;
 import org.jeecg.modules.system.model.DepartIdModel;
 import org.jeecg.modules.system.model.SysUserDepartsVO;
 import org.jeecg.modules.system.service.*;
-import org.jeecg.modules.system.vo.SysDepartUsersVO;
-import org.jeecg.modules.system.vo.SysUserRoleVO;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -76,8 +76,6 @@ public class SysUserController {
 
     @Autowired
     private IUserCompanyService userCompanyService;
-    @Autowired
-    private SysUserMapper sysUserMapper;
 
 
     @RequestMapping(value = "/getRoleInfo", method = RequestMethod.GET)
@@ -103,11 +101,6 @@ public class SysUserController {
     }
 
 
-    @Autowired
-    private MaterialReportMapper materialReportMapper;
-    @Autowired
-    private UserCompanyMapper userCompanyMapper;
-
     @RequestMapping(value = "/getAllUserListByCompany", method = RequestMethod.GET)
     public Result<List<SysUserVo>> getAllUserListByCompany(String userId) {
         Result<List<SysUserVo>> result = new Result<>();

+ 0 - 26
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/EffiRateComparator.java

@@ -1,26 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import cn.com.ctop.userefficientvideomap.entity.UserDto2;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-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.io.Serializable;
-import java.util.Comparator;
-import java.util.Date;
-
-public class EffiRateComparator implements Comparator<Object> {
-
-
-    @Override
-    public int compare(Object o1, Object o2) {
-        UserDto2 p1 = (UserDto2) o1; // 强制转换
-        UserDto2 p2 = (UserDto2) o2;
-        return (p2.getEffiRate()).compareTo(p1.getEffiRate());
-    }
-}

+ 0 - 82
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysRole.java

@@ -1,82 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 角色表
- * </p>
- *
- * @Author scott
- * @since 2018-12-19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class SysRole implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.UUID)
-    private String id;
-    
-    /**
-     * 角色名称
-     */
-    @Excel(name="角色名",width=15)
-    private String roleName;
-    
-    /**
-     * 角色编码
-     */
-    @Excel(name="角色编码",width=15)
-    private String roleCode;
-    
-    /**
-          * 描述
-     */
-    @Excel(name="描述",width=60)
-    private String description;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /**
-     * 更新人
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-
-}

+ 0 - 28
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java

@@ -1,28 +0,0 @@
-package org.jeecg.modules.system.mapper;
-
-
-import io.lettuce.core.dynamic.annotation.Param;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.system.entity.SysRole;
-import org.jeecg.modules.system.entity.UserDto;
-
-import java.util.List;
-
-/**
- * <p>
- * 角色表 Mapper 接口
- * </p>
- *
- * @Author scott
- * @since 2018-12-19
- */
-public interface SysRoleMapper extends BaseMapper<SysRole> {
-    //根据roleCode获取相对应的用户信息
-    List<UserDto> getUserByRoleCode(@Param("roleCode")String roleCode);
-
-    String getRoleIdByRoleCode(@Param("roleCode")String roleCode);
-
-    String getRoleCodeByUserId(@Param("userId")String userId);
-
-}

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java

@@ -1,11 +1,11 @@
 package org.jeecg.modules.system.mapper;
 
+import cn.com.ctop.common.module.vo.SysUserVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.entity.SysUserVo;
 
 import java.util.List;
 import java.util.Map;

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -67,7 +67,7 @@ SELECT
 </select>
 
 
-    <select id="getAllUser" resultType="org.jeecg.modules.system.entity.SysUserVo">
+    <select id="getAllUser" resultType="cn.com.ctop.common.module.vo.SysUserVo">
 
       SELECT
       t1.id userId,
@@ -81,7 +81,7 @@ SELECT
 </select>
 
 
-    <select id="getUserListByCompany" resultType="org.jeecg.modules.system.entity.SysUserVo">
+    <select id="getUserListByCompany" resultType="cn.com.ctop.common.module.vo.SysUserVo">
    SELECT
       t2.id userId,
       t2.username userName,
@@ -93,7 +93,7 @@ SELECT
     LEFT JOIN sys_user_role t3 on t1.user_id = t3.user_id
     WHERE t1.company_id = #{companyId}
     </select>
-    <select id="getAllSale" resultType="org.jeecg.modules.system.entity.SysUserVo">
+    <select id="getAllSale" resultType="cn.com.ctop.common.module.vo.SysUserVo">
         SELECT
             t1.id userId,
             t1.username userName,

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.system.vo;
+package org.jeecg.modules.system.model;
 
 import lombok.Data;
 import org.jeecg.modules.system.entity.SysDictItem;

+ 0 - 141
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IPerformanceService2.java

@@ -1,141 +0,0 @@
-package org.jeecg.modules.system.service;
-
-import cn.com.ctop.common.module.entity.MaterialInfo;
-import cn.com.ctop.performanceaccount.entity.PerformanceAccount;
-import cn.com.ctop.performanceappraisal.entity.Performance;
-import cn.com.ctop.userefficientvideomap.entity.*;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 设计师季度绩效表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-10
- */
-public interface IPerformanceService2 extends IService<Performance> {
-    /**
-     * 查询统计有效视频
-     *
-     * @param calcDateStr
-     */
-    void efficientVideoTask(String calcDateStr);
-
-    /**
-     * 平台的总有效数量、素材总数、素材有效率、总跑量、当前可获得绩效
-     *
-     * @return
-     */
-    Map<String, Object> getPerformanceInfo();
-
-    /**
-     * 有效率排行榜
-     *
-     * @param size
-     * @return
-     */
-    Map<String, Object> effiRateRank(Integer size);
-
-    /**
-     * 素材、素材跑量、封面点击数、封面曝光数、行为数
-     *
-     * @return
-     */
-    List<DesignMaterialInfo> materialInfoList();
-
-    /**
-     * 点击+符号 投放账户、投放账户、跑量
-     *
-     * @param materialInfoId
-     * @return
-     */
-    List<DesignMaterialInfo> materialAccountInfo(String materialInfoId);
-
-    void designerPerformanceTask(int year, int quarter);
-
-    void kuaishouDesigner(int thisYear, int thisQuarter);
-
-    void toutiaoDesigner(int thisYear, int thisQuarter);
-
-    Map<String, Object> designerLastQuarterPerformanceInfo();
-
-    Map<String, Object> quarterUserPerformanceList(Integer appType);
-
-    Map<String, Object> kuaishouDesignerLastQuarterPerformanceInfo();
-
-    Map<String, Object> planeLastQuarterPerformanceInfo(int appType);
-
-    //获取快手绩效时时数据接口
-    List<UserDto2> kuaishouPerformanceInfoNow();
-
-    //获取快手绩效时时数据接口
-    List<UserDto2> toutiaoPerformanceInfoNow();
-
-    //获取快手绩效周报表
-    List<UserDto2> kuaishouWeekReport(String startDate, String endDate);
-
-    //获取头条绩效周报表
-    List<UserDto2> toutiaoWeekReport(String startDate, String endDate);
-
-    //获取快手季度绩效报表
-    List<UserDto2> kuaishouQuarterReport(Integer year, Integer quarter);
-
-    //获取头条季度绩效报表
-    List<UserDto2> toutiaoQuarterReport(Integer year, Integer quarter);
-
-    //获取有效视频列表
-    List<MaterialInfo> effiVideoList(Integer appType, Integer year, Integer quarter, String userId);
-
-    //获取有效视频列表
-    List<MaterialInfo> getVideoList(Integer appType, String userId, String startDate, String endDate);
-
-    List<MaterialInfo> getEffiWeekVideoList(Integer appType, String startDate, String endDate, String userId);
-
-    //获取快手优化师绩效实时数据
-    List<UserDto2> kuaishouYouhuaPerformanceInfoNow();
-
-    //获取头条优化师实时数据
-    List<UserDto2> toutiaoYouhuaPerformanceInfoNow();
-
-    //获取快手优化师所属账号信息
-    List<AccountDTO> getKuaiShouYouhuaAccountsList(String userId, Integer appType, Integer year , Integer quarter);
-
-    //获取头条优化师所属账号信息
-    List<AccountDTO> getToutiaoYouhuaAccountsList(String userId, Integer appType, Integer year , Integer quarter);
-
-    //快手优化师周报
-    List<UserDto2> kuaishouYouhuaWeekReport(String startDate, String endDate);
-
-    //头条优化师周报
-    List<UserDto2> toutiaoYouhuaWeekReport(String startDate, String endDate);
-
-    //快手优化季度绩效报表
-    List<UserDto2> kuaishouYouhuaQuarterReport(Integer year, Integer quarter);
-
-    //头条优化季度绩效报表
-    List<UserDto2> toutiaoYouhuaQuarterReport(Integer year, Integer quarter);
-
-    //根据userId获取此人在季度的消耗明细
-    List<PerformanceAccount> getYunyingQuarterDetailByUserId(Integer year, Integer quarter, String userId, Integer appType);
-
-    //按平台获取其下所有项目信息以及消耗
-    List<ProjectDTO> getProjcetListByMediaType(Integer year, Integer quarter, Integer appType );
-
-    //根据projectId获取其下账户季度消耗信息
-    List<AccountDTO> getQuarterAccountDetail(Integer year, Integer quarter, Integer projectId, Integer appType);
-
-    //根据accountId获取季度视频信息
-    List<VideoDTO> getKuaishouQuarterVideoInfoByAccountId(Integer year, Integer quarter, Long accountId);
-
-    //根据accountId获取季度视频信息
-    List<VideoDTO> getToutiaoQuarterVideoInfoByAccountId(Integer year, Integer quarter, Long accountId);
-
-    List<VideoDTO> getUserQuarterVideo(Integer year, Integer quarter, String userId);
-
-    List<VideoDTO> getUserQuarterEffiVideo(Integer year, Integer quarter, String userId);
-
-    void getQuarterVideoInfoByAccountId(Integer year, Integer quarter);
-}

+ 0 - 22
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java

@@ -1,22 +0,0 @@
-package org.jeecg.modules.system.service;
-
-import org.jeecg.modules.system.entity.SysRole;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 角色表 服务类
- * </p>
- *
- * @Author scott
- * @since 2018-12-19
- */
-public interface ISysRoleService extends IService<SysRole> {
-	
-
-}

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

@@ -1,12 +1,12 @@
 package org.jeecg.modules.system.service;
 
+import cn.com.ctop.common.module.vo.SysUserVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.entity.SysUserVo;
 
 import java.util.List;
 import java.util.Map;

文件差異過大導致無法顯示
+ 0 - 2783
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/PerformanceServiceImpl2.java


+ 0 - 27
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java

@@ -1,27 +0,0 @@
-package org.jeecg.modules.system.service.impl;
-
-import org.jeecg.modules.system.entity.SysRole;
-import org.jeecg.modules.system.mapper.SysRoleMapper;
-import org.jeecg.modules.system.service.ISysRoleService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * <p>
- * 角色表 服务实现类
- * </p>
- *
- * @Author scott
- * @since 2018-12-19
- */
-@Service
-public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
-
-
-}

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java

@@ -1,12 +1,12 @@
 package org.jeecg.modules.system.service.impl;
 
+import cn.com.ctop.common.module.entity.SysRole;
+import cn.com.ctop.common.module.service.ISysRoleService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.system.entity.SysRole;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.entity.SysUserRole;
 import org.jeecg.modules.system.mapper.SysUserRoleMapper;
-import org.jeecg.modules.system.service.ISysRoleService;
 import org.jeecg.modules.system.service.ISysUserRoleService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.service.impl;
 
+import cn.com.ctop.common.module.vo.SysUserVo;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

+ 1 - 40
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -1,6 +1,5 @@
 package org.jeecg;
 
-import cn.com.ctop.bytedance.service.IReportService;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
@@ -10,12 +9,11 @@ import cn.com.ctop.common.module.utils.HttpUtils;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreativeService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouHistoryReportTaskService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
+import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.ctop.service.IBytedanceFundDailyService;
 import org.jeecg.modules.ctop.service.IPerformanceSaleService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -25,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import java.util.Date;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
@@ -62,39 +59,6 @@ public class SampleTest {
     private static CountDownLatch countDownLatch = null;
 
     @Autowired
-    private IBytedanceFundDailyService fundDailyService;
-
-    @Test
-    public void testLoadJob() {
-        CtopOauthToken token = tokenService.getTokenByAccountId(6308264L);
-        kuaishouInterfaceService.getAdvertiserReportHourly(token, new Date(), new Date());
-    }
-
-    @Test
-    public void loadCampaignDate() {
-        Date endDate = DateUtils.addDay(new Date(), -1);
-        Date startDate = DateUtils.addDay(new Date(), -10);
-        //1:查询当日数据
-        List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
-        if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取头条数据异常:为获取到可用的token");
-            return;
-        }
-//        executorService = Executors.newFixedThreadPool(10);
-        tokens.forEach(token -> {
-//            executorService.submit(new Runnable() {
-//                @Override
-//                public void run() {
-            //获取广告主信息数据
-            reportService.getCampaignReportByPage(token, startDate, endDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY, 1);
-//                }
-//            });
-        });
-    }
-
-    @Autowired
-    private IReportService reportService;
-    @Autowired
     private IUserAllocationService userAllocationService;
 
     @Test
@@ -102,9 +66,6 @@ public class SampleTest {
         String url = "https://ad.oceanengine.com/open_api/2/kaleidoscope/job/smart_cut/submit/";
 
         JSONObject conditions = new JSONObject();
-
-        // 1629785592929294
-
         conditions.put("advertiser_id", "1659671533108238");
         JSONObject job = new JSONObject();
         job.put("job_conf_id", 10);

+ 2 - 2
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/SysRole.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.userefficientvideomap.entity;
+package cn.com.ctop.common.module.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -46,7 +46,7 @@ public class SysRole implements Serializable {
     private String roleCode;
 
     /**
-     * 描述
+          * 描述
      */
     @Excel(name="描述",width=60)
     private String description;

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

@@ -21,8 +21,6 @@ public interface MaterialInfoMapper extends BaseMapper<MaterialInfo> {
 
     Integer selectCountByMap(Map<String, Object> requestMap);
 
-    String getRoleCodeByUserId(@Param("userId") String userId);
-
     Integer getKuaishouUpVideoCount(@Param("code") String code);
 
     Integer getToutiaoUpVideoCount(@Param("code") String code);

+ 27 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/SysRoleMapper.java

@@ -0,0 +1,27 @@
+package cn.com.ctop.common.module.mapper;
+
+
+import cn.com.ctop.common.module.entity.SysRole;
+import cn.com.ctop.common.module.vo.UserDto;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.lettuce.core.dynamic.annotation.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 角色表 Mapper 接口
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-19
+ */
+public interface SysRoleMapper extends BaseMapper<SysRole> {
+    //根据roleCode获取相对应的用户信息
+    List<UserDto> getUserByRoleCode(@Param("roleCode") String roleCode);
+
+    String getRoleIdByRoleCode(@Param("roleCode") String roleCode);
+
+    String getRoleCodeByUserId(@Param("userId") String userId);
+
+}

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

@@ -23,23 +23,6 @@
 
     </select>
 
-    <select id="getRoleCodeByUserId" resultType="java.lang.String">
-   SELECT
-    role_code
-    FROM
-    sys_role
-    WHERE
-    id = (
-    SELECT
-    t2.role_id
-    FROM
-    sys_user t1
-    LEFT JOIN sys_user_role t2 ON t1.id = t2.user_id
-    WHERE
-    t1.id = #{userId,jdbcType=VARCHAR}
-    )
-    </select>
-
     <select id="getKuaishouUpVideoCount" resultType="java.lang.Integer">
         select
         count(1)

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysRoleMapper">
+<mapper namespace="cn.com.ctop.common.module.mapper.SysRoleMapper">
 
 	<!-- 根据rolecode获取相对应角色所有的人 -->
-	<select id="getUserByRoleCode" resultType="org.jeecg.modules.system.entity.UserDto">
+    <select id="getUserByRoleCode" resultType="cn.com.ctop.common.module.vo.UserDto">
 			select
 			a.id as userId,
 			a.realname,

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

@@ -28,8 +28,6 @@ public interface IMaterialInfoService extends IService<MaterialInfo> {
 
     JSONObject report(String userId);
 
-    String getRoleCodeByUserId(String userId);
-
     void watermarkVideo(String materialId, Integer videoWatermarkTemplateId, String userId);
 
     void getFile(MaterialInfo materialInfo);

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

@@ -0,0 +1,18 @@
+package cn.com.ctop.common.module.service;
+
+import cn.com.ctop.common.module.entity.SysRole;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 角色表 服务类
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-19
+ */
+public interface ISysRoleService extends IService<SysRole> {
+
+
+    String getRoleCodeByUserId(String userId);
+}

+ 2 - 2
module-common/src/main/java/cn/com/ctop/common/module/service/impl/BindAccountAuthServiceImpl.java

@@ -8,9 +8,9 @@ import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.common.module.utils.PropertiesUtils;
 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 javax.annotation.Resource;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.Date;
@@ -27,7 +27,7 @@ import java.util.Map;
 @Service
 public class BindAccountAuthServiceImpl extends ServiceImpl<BindAccountAuthMapper, BindAccountAuth> implements IBindAccountAuthService {
 
-    @Autowired
+    @Resource
     private BindAccountAuthMapper bindAccountAuthMapper;
 
     /**

+ 9 - 34
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -46,6 +46,14 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
     private IVideoWatermarkTaskService videoWatermarkTaskService;
     @Autowired
     private MaterialInfoMapper materialInfoMapper;
+    @Autowired
+    private MaterialAscriptionMapper materialAscriptionMapper;
+    @Autowired
+    private MaterialTagMapper materialTagMapper;
+    @Autowired
+    private IMaterialImageInfoService materialImageInfoService;
+    @Autowired
+    private MaterialParameterMapper materialParameterMapper;
     @Value("${oss.replace.replace-value}")
     private String replaceValue;
     @Value("${oss.replace.replace-old-value}")
@@ -53,6 +61,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
     @Value("${oss.replace.download}")
     private String downloadUrl;
 
+
     @Override
     public void watermarkVideo(String materialId, Integer videoWatermarkTemplateId, String userId) {
         VideoWatermarkTemplate videoWatermarkTemplate = videoWatermarkTemplateService.getById(videoWatermarkTemplateId);
@@ -114,12 +123,6 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         String reg = "(mp4|flv|avi|rm|rmvb|wmv)";
         Pattern p = Pattern.compile(reg);
     }
-
-    @Autowired
-    private MaterialAscriptionMapper materialAscriptionMapper;
-    @Autowired
-    private MaterialTagMapper materialTagMapper;
-
     @Override
     public Map<String, Object> insert(JSONObject jsonObject) {
         Map<String, Object> resultMap = new HashMap<>();
@@ -171,8 +174,6 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         return resultMap;
     }
 
-    @Autowired
-    private IMaterialCutFrameService materialCutFrameService;
 
     private void insertMaterialInfo(String url, String type, JSONObject jsonObject) {
         MaterialInfo info = new MaterialInfo();
@@ -230,23 +231,16 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                 }
             }
         }
-
         getFile(info);
 
     }
 
-
     /**
      * 获取素材详细信息
      *
      * @param materialId
      * @return
      */
-
-    //@Autowired
-    //private MaterialInfoMapper materialInfoMapper;
-
-
     @Override
     public JSONObject getDetail(String materialId) {
         JSONObject json = new JSONObject();
@@ -318,14 +312,6 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         return json;
     }
 
-    @Override
-    public String getRoleCodeByUserId(String userId) {
-        return materialInfoMapper.getRoleCodeByUserId(userId);
-    }
-
-
-    @Autowired
-    private MaterialParameterMapper materialParameterMapper;
 
     @Override
     public void getFile(MaterialInfo materialInfo) {
@@ -430,12 +416,8 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
     }
 
 
-    @Autowired
-    private IMaterialImageInfoService materialImageInfoService;
-
     /**
      * 素材库关联上传素材 1
-     *
      * @param json
      * @return
      */
@@ -500,7 +482,6 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                 if (i > 0) {
                     log.info("素材归属信息入库完成,MaterialId:{}", info.getId());
                 }
-
             }
 
             JSONArray tag = json.getJSONArray("tag");
@@ -525,11 +506,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
             e.printStackTrace();
 
         }
-
-
         return resultMap;
-
-
     }
 
     @Override
@@ -580,6 +557,4 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
 
         return materialInfoList;
     }
-
-
 }

+ 27 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/SysRoleServiceImpl.java

@@ -0,0 +1,27 @@
+package cn.com.ctop.common.module.service.impl;
+
+import cn.com.ctop.common.module.entity.SysRole;
+import cn.com.ctop.common.module.mapper.SysRoleMapper;
+import cn.com.ctop.common.module.service.ISysRoleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 角色表 服务实现类
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-19
+ */
+@Service
+public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
+    @Autowired
+    private SysRoleMapper sysRoleMapper;
+
+    @Override
+    public String getRoleCodeByUserId(String userId) {
+        return sysRoleMapper.getRoleCodeByUserId(userId);
+    }
+}

+ 73 - 16
module-common/src/main/java/cn/com/ctop/common/module/utils/LoadFileUtil.java

@@ -5,6 +5,8 @@ import org.apache.commons.codec.digest.DigestUtils;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.URLEncoder;
+import java.util.Map;
 
 public class LoadFileUtil {
     /**
@@ -54,17 +56,6 @@ public class LoadFileUtil {
 
     }
 
-    public static byte[] readInputStream(InputStream inputStream) throws IOException {
-        byte[] buffer = new byte[1024];
-        int len = 0;
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        while ((len = inputStream.read(buffer)) != -1) {
-            bos.write(buffer, 0, len);
-        }
-        bos.close();
-        return bos.toByteArray();
-    }
-
 
     /**
      * 删除文件
@@ -101,15 +92,81 @@ public class LoadFileUtil {
         return DigestUtils.md5Hex(inputStream);
     }
 
-
-    public static void main(String[] args) throws IOException {
-        System.out.println(LoadFileUtil.getMD5("D://video/BMjAyMDAzMDQxODMyMTlfMTU3ODQ0ODY5MV8yNDQ1ODc0Mzk1OF8wXzM=_b_Bd696ca7f28234aac3713b18edd139469.mp4"));
-    }
-
     public static void checkFile(String filePackageName) {
         File file = new File(filePackageName);
         if (!file.exists()) {
             file.mkdir();
         }
     }
+
+    public static String downloadByUrl(Map<String, Object> requestMap, String downloadPath, String urlStr, String token, String fileName) {
+
+        try {
+            StringBuilder postBody = null;
+            if (!Check.isNull(requestMap)) {
+                postBody = new StringBuilder();
+                for (Map.Entry<String, Object> entry : requestMap.entrySet()) {
+                    if (entry.getValue() == null) {
+                        continue;
+                    }
+                    postBody.append(entry.getKey()).append("=").append(URLEncoder.encode(entry.getValue().toString(),
+                            "utf-8")).append("&");
+                }
+                if (!requestMap.isEmpty()) {
+                    postBody.deleteCharAt(postBody.length() - 1);
+                }
+            }
+
+            URL url = new URL(urlStr + "?" + postBody);
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            //设置超时间为3秒
+            conn.setConnectTimeout(120 * 1000);
+            //防止屏蔽程序抓取而返回403错误
+            conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
+            conn.setRequestProperty("Access-Token", token);
+            //得到输入流
+            InputStream inputStream = null;
+
+            inputStream = conn.getInputStream();
+
+            //获取自己数组
+            byte[] getData = readInputStream(inputStream);
+
+            //文件保存位置
+            File saveDir = new File(downloadPath);
+            if (!saveDir.exists()) {
+                saveDir.mkdirs();
+            }
+            String filePath = downloadPath + fileName;
+
+            File file = new File(saveDir + File.separator + fileName);
+            FileOutputStream fos = new FileOutputStream(file);
+            fos.write(getData);
+            if (fos != null) {
+                fos.close();
+            }
+            if (inputStream != null) {
+                inputStream.close();
+            }
+
+            return filePath;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+
+        return null;
+
+    }
+
+    public static byte[] readInputStream(InputStream inputStream) throws IOException {
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        while ((len = inputStream.read(buffer)) != -1) {
+            bos.write(buffer, 0, len);
+        }
+        bos.close();
+        return bos.toByteArray();
+    }
 }

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/excelutil/SpringUtils.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.excelutil;
+package cn.com.ctop.common.module.utils;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;

+ 1 - 1
module-report/src/main/java/cn/com/ctop/bytedance/vo/ByteDanceAdvertiserReportDTO.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.bytedance.vo;
+package cn.com.ctop.common.module.vo;
 
 import lombok.Data;
 

+ 1 - 1
module-report/src/main/java/cn/com/ctop/bytedance/vo/DailyAccountReportVO.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.bytedance.vo;
+package cn.com.ctop.common.module.vo;
 
 import lombok.Data;
 

+ 1 - 1
module-report/src/main/java/cn/com/ctop/bytedance/vo/DailyGroupReportVO.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.bytedance.vo;
+package cn.com.ctop.common.module.vo;
 
 import lombok.Data;
 

+ 1 - 1
module-report/src/main/java/cn/com/ctop/bytedance/vo/DailyReportVO.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.bytedance.vo;
+package cn.com.ctop.common.module.vo;
 
 import lombok.Data;
 

+ 1 - 1
module-report/src/main/java/cn/com/ctop/bytedance/vo/ReportVO.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.bytedance.vo;
+package cn.com.ctop.common.module.vo;
 
 import lombok.Data;
 

+ 1 - 1
module-report/src/main/java/cn/com/ctop/bytedance/vo/StatisticCampaignVo.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.bytedance.vo;
+package cn.com.ctop.common.module.vo;
 
 import lombok.Data;
 

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysDepartUsersVO.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.system.vo;
+package cn.com.ctop.common.module.vo;
 
 import lombok.Data;
 

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysUserRoleVO.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.system.vo;
+package cn.com.ctop.common.module.vo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.system.entity;
+package cn.com.ctop.common.module.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+ 1 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/UserDto.java

@@ -1,11 +1,9 @@
-package org.jeecg.modules.system.entity;
+package cn.com.ctop.common.module.vo;
 
 import lombok.Data;
 
-import java.awt.print.Book;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Comparator;
 
 @Data
 public class UserDto implements Serializable {

+ 0 - 10
module-crawler/src/main/java/cn/com/ctop/crawler/modules/dataeye/service/impl/DataeyeCompanyServiceImpl.java

@@ -1,7 +1,6 @@
 package cn.com.ctop.crawler.modules.dataeye.service.impl;
 
 import cn.com.ctop.common.module.utils.HttpUtils;
-import cn.com.ctop.crawler.modules.core.util.SignUtil;
 import cn.com.ctop.crawler.modules.dataeye.entity.DataeyeCompany;
 import cn.com.ctop.crawler.modules.dataeye.mapper.DataeyeCompanyMapper;
 import cn.com.ctop.crawler.modules.dataeye.service.DataeyeCompanyService;
@@ -10,19 +9,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.impl.cookie.BasicClientCookie;
-import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import sun.misc.BASE64Encoder;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;

+ 2 - 6
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouDailyReportTaskServiceImpl.java

@@ -1,16 +1,12 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.common.module.utils.HttpUtils;
-import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
-import cn.com.ctop.common.module.utils.PropertiesUtils;
+import cn.com.ctop.common.module.utils.*;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouDailyReportTask;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouDailyReportTaskMapper;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouDailyReportTaskService;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyCampaignMapper;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyCreativeMapper;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyGroupMapper;
-import cn.com.ctop.kuaishou.modules.utils.DownloadUtils;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -120,7 +116,7 @@ public class KuaiShouDailyReportTaskServiceImpl extends ServiceImpl<KuaiShouDail
             Map<String, Object> requestMap = new HashMap<>();
             requestMap.put("advertiser_id", task.getAccountId());
             requestMap.put("task_id", task.getTaskId());
-            String localPath = DownloadUtils.downloadByUrl(requestMap, downloadPath + task.getStatDate() + "//", url, token, fileName);
+            String localPath = LoadFileUtil.downloadByUrl(requestMap, downloadPath + task.getStatDate() + "//", url, token, fileName);
             if (!Check.isNull(localPath)) {
                 if (task.getViewType() == 2) {
                     reportDailyCampaignMapper.loadCampaignDailyReport(task.getAccountId(), localPath);

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

@@ -12,7 +12,6 @@ import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAccountMapp
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyCampaignMapper;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyCreativeMapper;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyGroupMapper;
-import cn.com.ctop.kuaishou.modules.utils.DownloadUtils;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -205,7 +204,7 @@ public class KuaiShouHistoryReportTaskServiceImpl extends ServiceImpl<KuaiShouHi
             Map<String, Object> requestMap = new HashMap<>();
             requestMap.put("advertiser_id", task.getAccountId());
             requestMap.put("task_id", task.getTaskId());
-            String localPath = DownloadUtils.downloadByUrl(requestMap, downloadPath, url, token, fileName);
+            String localPath = LoadFileUtil.downloadByUrl(requestMap, downloadPath, url, token, fileName);
             if (!Check.isNull(localPath)) {
                 if (task.getViewType() == 1) {
                     reportDailyAccountMapper.loadAccountDailyReport(task.getAccountId(), localPath);

+ 2 - 2
module-report/src/main/java/cn/com/ctop/bytedance/controller/AccountReportController.java

@@ -1,8 +1,8 @@
-package cn.com.ctop.bytedance.controller;
+package cn.com.ctop.kuaishou.modules.report.controller;
 
-import cn.com.ctop.bytedance.service.IAccountReportService;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.UserAllocationMapper;
+import cn.com.ctop.kuaishou.modules.report.service.IAccountReportService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;

+ 5 - 5
module-report/src/main/java/cn/com/ctop/bytedance/controller/DailyReportController.java

@@ -1,12 +1,12 @@
-package cn.com.ctop.bytedance.controller;
+package cn.com.ctop.kuaishou.modules.report.controller;
 
-import cn.com.ctop.bytedance.service.IDailyReportService;
-import cn.com.ctop.bytedance.vo.DailyAccountReportVO;
-import cn.com.ctop.bytedance.vo.DailyGroupReportVO;
-import cn.com.ctop.bytedance.vo.DailyReportVO;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.ExportExcelUtils;
 import cn.com.ctop.common.module.utils.RateUtil;
+import cn.com.ctop.common.module.vo.DailyAccountReportVO;
+import cn.com.ctop.common.module.vo.DailyGroupReportVO;
+import cn.com.ctop.common.module.vo.DailyReportVO;
+import cn.com.ctop.kuaishou.modules.report.service.IDailyReportService;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;

+ 2 - 2
module-report/src/main/java/cn/com/ctop/bytedance/controller/KuaiShouYiCheReportController.java

@@ -1,8 +1,8 @@
-package cn.com.ctop.bytedance.controller;
+package cn.com.ctop.kuaishou.modules.report.controller;
 
-import cn.com.ctop.bytedance.service.IKuaiShouYiCheReportService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.ExportExcelUtils;
+import cn.com.ctop.kuaishou.modules.report.service.IKuaiShouYiCheReportService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;

+ 2 - 2
module-report/src/main/java/cn/com/ctop/bytedance/controller/MaterialReportController.java

@@ -1,9 +1,9 @@
-package cn.com.ctop.bytedance.controller;
+package cn.com.ctop.kuaishou.modules.report.controller;
 
 
-import cn.com.ctop.bytedance.service.IMaterialReportService;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.kuaishou.modules.report.service.IMaterialReportService;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;

+ 1 - 1
module-report/src/main/java/cn/com/ctop/bytedance/entity/CustomerPlanStatisticInfo.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.bytedance.entity;
+package cn.com.ctop.kuaishou.modules.report.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
module-report/src/main/java/cn/com/ctop/bytedance/entity/PlatformCampaignStatisticInfo.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.bytedance.entity;
+package cn.com.ctop.kuaishou.modules.report.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 2 - 2
module-report/src/main/java/cn/com/ctop/bytedance/mapper/AccountReportMapper.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.bytedance.mapper;
+package cn.com.ctop.kuaishou.modules.report.mapper;
 
 
 import com.alibaba.fastjson.JSONArray;
@@ -167,7 +167,7 @@ public interface AccountReportMapper {
 
     JSONObject selectSummaryByMap(Map<String, Object> queryMap);
 
-    List<JSONObject> selectReportDetailGroupAccountIdByDate(@Param("statDate") String anotherDay,@Param("accountIds") JSONArray accountIds);
+    List<JSONObject> selectReportDetailGroupAccountIdByDate(@Param("statDate") String anotherDay, @Param("accountIds") JSONArray accountIds);
 
     JSONObject selectHourSummaryByMap(Map<String, Object> queryMap);
 }

+ 2 - 2
module-report/src/main/java/cn/com/ctop/bytedance/mapper/CustomerPlanStatisticInfoMapper.java

@@ -1,6 +1,6 @@
-package cn.com.ctop.bytedance.mapper;
+package cn.com.ctop.kuaishou.modules.report.mapper;
 
-import cn.com.ctop.bytedance.entity.CustomerPlanStatisticInfo;
+import cn.com.ctop.kuaishou.modules.report.entity.CustomerPlanStatisticInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 3 - 3
module-report/src/main/java/cn/com/ctop/bytedance/mapper/DailyReportMapper.java

@@ -1,7 +1,7 @@
-package cn.com.ctop.bytedance.mapper;
+package cn.com.ctop.kuaishou.modules.report.mapper;
 
-import cn.com.ctop.bytedance.vo.DailyAccountReportVO;
-import cn.com.ctop.bytedance.vo.DailyGroupReportVO;
+import cn.com.ctop.common.module.vo.DailyAccountReportVO;
+import cn.com.ctop.common.module.vo.DailyGroupReportVO;
 
 import java.util.List;
 import java.util.Map;

+ 0 - 0
module-report/src/main/java/cn/com/ctop/bytedance/mapper/KuaiShouYiCheReportMapper.java


部分文件因文件數量過多而無法顯示