瀏覽代碼

整理代码+添加区县数据信息

syh 5 年之前
父節點
當前提交
16f892c880
共有 61 個文件被更改,包括 857 次插入587 次删除
  1. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/JeecgOneGui.java
  2. 2 3
      jeecg-boot-module-system/src/main/java/org/jeecg/config/AutoPoiConfig.java
  3. 4 5
      jeecg-boot-module-system/src/main/java/org/jeecg/config/MybatisPlusConfig.java
  4. 5 11
      jeecg-boot-module-system/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java
  5. 18 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdvertiserController.java
  6. 0 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AuthController.java
  7. 17 22
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertiserController.java
  8. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertiserPostController.java
  9. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceTemplateController.java
  10. 17 22
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceAdvertiserDailyReportController.java
  11. 17 22
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceAdvertiserHourlyReportController.java
  12. 253 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceAreaInfoController.java
  13. 17 22
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceCampaignDailyReportController.java
  14. 17 22
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceCampaignHourlyReportController.java
  15. 17 22
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceCreativeDailyReportController.java
  16. 17 22
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceCreativeHourlyReportController.java
  17. 17 22
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceNameModelRuleController.java
  18. 17 22
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedancePlanDailyReportController.java
  19. 17 22
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedancePlanHourlyReportController.java
  20. 0 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CrawlerController.java
  21. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CtopOauthTokenController.java
  22. 21 23
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CustomerPlanStatisticInfoController.java
  23. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/FileInfoController.java
  24. 20 20
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouAppAccountController.java
  25. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/PlatformCampaignStatisticInfoController.java
  26. 0 13
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SignController.java
  27. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SourceFileController.java
  28. 5 7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java
  29. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/Advertiser.java
  30. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/AuthTask.java
  31. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BindAccountAuth.java
  32. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BindAccountLogin.java
  33. 6 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertisePlan.java
  34. 6 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertiser.java
  35. 6 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertiserBudget.java
  36. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceBudgetTemplate.java
  37. 6 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCampaign.java
  38. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCampaignTemplate.java
  39. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAdvertisePlanTemplate.java
  40. 7 11
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAdvertiserDailyReport.java
  41. 7 11
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAdvertiserHourlyReport.java
  42. 73 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAreaInfo.java
  43. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/SourceFile.java
  44. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/UserAllocation.java
  45. 3 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/TestJob.java
  46. 18 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/BytedanceAreaInfoMapper.java
  47. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/BytedanceAreaInfoMapper.xml
  48. 15 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IBytedanceAreaInfoService.java
  49. 0 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/BindAccountLoginServiceImpl.java
  50. 20 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/BytedanceAreaInfoServiceImpl.java
  51. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/BytedanceDeliveryTargetTemplateServiceImpl.java
  52. 0 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/RefreshTokenServiceImpl.java
  53. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ReportServiceImpl.java
  54. 17 23
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouActionBarTextController.java
  55. 31 33
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupBidController.java
  56. 31 33
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupDayBudgetController.java
  57. 0 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouCreateServiceImpl.java
  58. 8 10
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/AutoLogAspect.java
  59. 12 15
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/DictAspect.java
  60. 26 30
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/PermissionDataAspect.java
  61. 3 3
      jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/JeecgOneGui.java

@@ -3,7 +3,7 @@ package org.jeecg;
 import org.jeecgframework.codegenerate.window.CodeWindow;
 
 /**
- * @Title: 单表代码生成器入口
+ * @title: 单表代码生成器入口
  * @Author 张代浩
  * @site www.jeecg.org
  * @Version:V1.0.1
@@ -15,4 +15,4 @@ public class JeecgOneGui {
     	new CodeWindow().pack();
 	}
 
-}
+}

+ 2 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/config/AutoPoiConfig.java

@@ -9,11 +9,10 @@ import org.springframework.context.annotation.Configuration;
  * @Date: 2018/2/7
  * @description: autopoi 配置类
  */
-
 @Configuration
 public class AutoPoiConfig {
-	
-	/**
+
+    /**
 	 * excel注解字典参数支持(导入导出字典值,自动翻译)
 	 * 举例: @Excel(name = "性别", width = 15, dicCode = "sex")
 	 * 1、导出的时候会根据字典配置,把值1,2翻译成:男、女;

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

@@ -1,10 +1,9 @@
 package org.jeecg.config;
 
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
 
 /**
  * 单数据源配置(jeecg.datasource.open = false时生效)
@@ -23,7 +22,7 @@ public class MybatisPlusConfig {
     public PaginationInterceptor paginationInterceptor() {
         return new PaginationInterceptor();
     }
-    
+
 //    /**
 //     * mybatis-plus SQL执行效率插件【生产环境可以关闭】
 //     */
@@ -31,6 +30,6 @@ public class MybatisPlusConfig {
 //    public PerformanceInterceptor performanceInterceptor() {
 //        return new PerformanceInterceptor();
 //    }
-    
-   
+
+
 }

+ 5 - 11
jeecg-boot-module-system/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java

@@ -1,25 +1,19 @@
 package org.jeecg.config.mybatis;
 
-import java.lang.reflect.Field;
-import java.util.Date;
-import java.util.Properties;
-
+import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.binding.MapperMethod.ParamMap;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.SqlCommandType;
-import org.apache.ibatis.plugin.Interceptor;
-import org.apache.ibatis.plugin.Intercepts;
-import org.apache.ibatis.plugin.Invocation;
-import org.apache.ibatis.plugin.Plugin;
-import org.apache.ibatis.plugin.Signature;
+import org.apache.ibatis.plugin.*;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysUser;
 import org.springframework.stereotype.Component;
 
-import lombok.extern.slf4j.Slf4j;
+import java.lang.reflect.Field;
+import java.util.Date;
+import java.util.Properties;
 
 /**
  * mybatis拦截器,自动注入创建人、创建时间、修改人、修改时间

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

@@ -1,23 +1,18 @@
 package org.jeecg.modules.ctop.controller;
 
-import java.util.*;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.Advertiser;
 import org.jeecg.modules.ctop.service.IAdvertiserService;
-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.modules.system.entity.SysCategory;
 import org.jeecg.modules.system.service.ISysCategoryService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -25,15 +20,21 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 广告主信息表

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

@@ -5,14 +5,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
 import java.util.UUID;
 
 /**

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

@@ -1,42 +1,37 @@
 package org.jeecg.modules.ctop.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.ByteDanceAdvertiser;
 import org.jeecg.modules.ctop.service.IByteDanceAdvertiserService;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+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: 今日头条广告主信息

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

@@ -214,7 +214,7 @@ public class ByteDanceAdvertiserPostController {
      */
     @RequestMapping(value = "dictitem/list", method = RequestMethod.GET)
     public Result<IPage<SysDictItem>> dictitemPageList(SysDictItem sysDictItem, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+                                                       @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");

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

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 import java.util.Map;
 

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

@@ -1,42 +1,37 @@
 package org.jeecg.modules.ctop.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.BytedanceAdvertiserDailyReport;
 import org.jeecg.modules.ctop.service.IBytedanceAdvertiserDailyReportService;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+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: 广告主日报表

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

@@ -1,42 +1,37 @@
 package org.jeecg.modules.ctop.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.BytedanceAdvertiserHourlyReport;
 import org.jeecg.modules.ctop.service.IBytedanceAdvertiserHourlyReportService;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+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: 广告主小时级别报表信息

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

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

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

@@ -1,42 +1,37 @@
 package org.jeecg.modules.ctop.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.BytedanceCampaignDailyReport;
 import org.jeecg.modules.ctop.service.IBytedanceCampaignDailyReportService;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+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: 广告组日报表信息

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

@@ -1,42 +1,37 @@
 package org.jeecg.modules.ctop.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.BytedanceCampaignHourlyReport;
 import org.jeecg.modules.ctop.service.IBytedanceCampaignHourlyReportService;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+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: 广告组时报表信息

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

@@ -1,42 +1,37 @@
 package org.jeecg.modules.ctop.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.BytedanceCreativeDailyReport;
 import org.jeecg.modules.ctop.service.IBytedanceCreativeDailyReportService;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+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: 广告创意日报表信息

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

@@ -1,42 +1,37 @@
 package org.jeecg.modules.ctop.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.BytedanceCreativeHourlyReport;
 import org.jeecg.modules.ctop.service.IBytedanceCreativeHourlyReportService;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+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: 广告创意日报表信息

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

@@ -1,42 +1,37 @@
 package org.jeecg.modules.ctop.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.BytedanceNameModelRule;
 import org.jeecg.modules.ctop.service.IBytedanceNameModelRuleService;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+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: 名称生成规则模板信息

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

@@ -1,42 +1,37 @@
 package org.jeecg.modules.ctop.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.BytedancePlanDailyReport;
 import org.jeecg.modules.ctop.service.IBytedancePlanDailyReportService;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+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: 广告计划日报表信息

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

@@ -1,42 +1,37 @@
 package org.jeecg.modules.ctop.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.BytedancePlanHourlyReport;
 import org.jeecg.modules.ctop.service.IBytedancePlanHourlyReportService;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+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: 广告计划时报表信息

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

@@ -1,4 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-public class CrawlerController {
-}

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

@@ -34,10 +34,10 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @Description: oauth授权码
- * @Author: jeecg-boot
- * @Date: 2019-07-09
- * @Version: V1.0
+ * oauth授权码
+ * @author jeecg-boot
+ * @date 2019-07-09
+ * @version V1.0
  */
 @Slf4j
 @Api(tags = "oauth授权码")

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

@@ -1,45 +1,43 @@
 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 com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.CustomerPlanStatisticInfo;
 import org.jeecg.modules.ctop.service.ICustomerPlanStatisticInfoService;
-import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
- * @Description: 用户平台广告计划信息
- * @Author: jeecg-boot
- * @Date: 2019-08-23
- * @Version: V1.0
+ *  用户平台广告计划信息
+ * @author jeecg-boot
+ * @date 2019-08-23
+ * @version V1.0
  */
 @Slf4j
 @Api(tags = "用户平台广告计划信息")

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

@@ -34,10 +34,10 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @Description: 文件信息
- * @Author: jeecg-boot
- * @Date: 2019-07-28
- * @Version: V1.0
+ * 文件信息
+ * @author jeecg-boot
+ * @date 2019-07-28
+ * @version V1.0
  */
 @Slf4j
 @Api(tags = "文件信息")

+ 20 - 20
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouAppAccountController.java

@@ -34,10 +34,10 @@ import java.util.List;
 import java.util.Map;
 
  /**
- * @Description: 快手APP账号表
- * @Author: jeecg-boot
- * @Date:   2019-06-28
- * @Version: V1.0
+  * 快手APP账号表
+  * @author jeecg-boot
+  * @date 2019-06-28
+  * @version V1.0
  */
 @Slf4j
 @Api(tags="快手APP账号表")
@@ -46,8 +46,8 @@ import java.util.Map;
 public class KuaishouAppAccountController {
 	@Autowired
 	private IKuaishouAppAccountService kuaishouAppAccountService;
-	
-	/**
+
+     /**
 	  * 分页列表查询
 	 * @param kuaishouAppAccount
 	 * @param pageNo
@@ -70,8 +70,8 @@ public class KuaishouAppAccountController {
 		result.setResult(pageList);
 		return result;
 	}
-	
-	/**
+
+     /**
 	  *   添加
 	 * @param kuaishouAppAccount
 	 * @return
@@ -90,8 +90,8 @@ public class KuaishouAppAccountController {
 		}
 		return result;
 	}
-	
-	/**
+
+     /**
 	  *  编辑
 	 * @param kuaishouAppAccount
 	 * @return
@@ -111,11 +111,11 @@ public class KuaishouAppAccountController {
 				result.success("修改成功!");
 			}
 		}
-		
-		return result;
+
+        return result;
 	}
-	
-	/**
+
+     /**
 	  *   通过id删除
 	 * @param id
 	 * @return
@@ -134,11 +134,11 @@ public class KuaishouAppAccountController {
 				result.success("删除成功!");
 			}
 		}
-		
-		return result;
+
+        return result;
 	}
-	
-	/**
+
+     /**
 	  *  批量删除
 	 * @param ids
 	 * @return
@@ -156,8 +156,8 @@ public class KuaishouAppAccountController {
 		}
 		return result;
 	}
-	
-	/**
+
+     /**
 	  * 通过id查询
 	 * @param id
 	 * @return

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

@@ -39,10 +39,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 /**
- * @Description: 快手平台广告组信息
- * @Author: jeecg-boot
- * @Date: 2019-08-23
- * @Version: V1.0
+ * 快手平台广告组信息
+ * @author jeecg-boot
+ * @date 2019-08-23
+ * @version V1.0
  */
 @Slf4j
 @Api(tags = "快手平台广告组信息")

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

@@ -1,13 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 签章controller
- */
-@RestController
-@RequestMapping("sign")
-public class SignController {
-
-}

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

@@ -39,10 +39,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 /**
- * @Description: 统一资源库文件信息
- * @Author: jeecg-boot
- * @Date: 2019-09-02
- * @Version: V1.0
+ * 统一资源库文件信息
+ * @author jeecg-boot
+ * @date 2019-09-02
+ * @version V1.0
  */
 @Slf4j
 @Api(tags = "统一资源库文件信息")

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

@@ -36,10 +36,10 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @Description: 用户分配
- * @Author: jeecg-boot
- * @Date: 2019-08-08
- * @Version: V1.0
+ * 用户分配
+ * @author jeecg-boot
+ * @date 2019-08-08
+ * @version V1.0
  */
 @Slf4j
 @Api(tags = "用户分配")
@@ -114,12 +114,10 @@ public class UserAllocationController {
             result.error500("未找到对应实体");
         } else {
             boolean ok = userAllocationService.updateById(userAllocation);
-            //TODO 返回false说明什么?
             if (ok) {
                 result.success("修改成功!");
             }
         }
-
         return result;
     }
 
@@ -172,7 +170,7 @@ public class UserAllocationController {
     @ApiOperation(value = "用户分配-通过id查询", notes = "用户分配-通过id查询")
     @GetMapping(value = "/queryById")
     public Result<UserAllocation> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<UserAllocation> result = new Result<UserAllocation>();
+        Result<UserAllocation> result = new Result<>();
         UserAllocation userAllocation = userAllocationService.getById(id);
         if (userAllocation == null) {
             result.error500("未找到对应实体");

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

@@ -15,10 +15,10 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.util.Date;
 
 /**
- * @Description: 广告主信息表
- * @Author: jeecg-boot
- * @Date:   2019-06-11
- * @Version: V1.0
+ * 广告主信息表
+ * @author jeecg-boot
+ * @date 2019-06-11
+ * @version V1.0
  */
 @Data
 @TableName("ctop_advertiser")
@@ -26,7 +26,7 @@ import java.util.Date;
 @Accessors(chain = true)
 @ApiModel(value="ctop_advertiser对象", description="广告主信息表")
 public class Advertiser {
-    
+
 	/**主键ID*/
 	@TableId(type = IdType.UUID)
     @ApiModelProperty(value = "主键ID")

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/AuthTask.java

@@ -11,10 +11,10 @@ import lombok.experimental.Accessors;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 /**
- * @Description: 关联用户分配
- * @Author: jeecg-boot
- * @Date: 2019-07-31
- * @Version: V1.0
+ * 关联用户分配
+ * @author jeecg-boot
+ * @date 2019-07-31
+ * @version V1.0
  */
 @Data
 @TableName("ctop_auth_task")

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

@@ -15,10 +15,10 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.util.Date;
 
 /**
- * @Description: 账号绑定-授权
- * @Author: jeecg-boot
- * @Date: 2019-07-31
- * @Version: V1.0
+ * 账号绑定-授权
+ * @author jeecg-boot
+ * @date 2019-07-31
+ * @version V1.0
  */
 @Data
 @TableName("ctop_bind_account_auth")

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

@@ -15,10 +15,10 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.util.Date;
 
 /**
- * @Description: 账号绑定-登陆
- * @Author: jeecg-boot
- * @Date: 2019-07-31
- * @Version: V1.0
+ * 账号绑定-登陆
+ * @author jeecg-boot
+ * @date 2019-07-31
+ * @version V1.0
  */
 @Data
 @TableName("ctop_bind_account_login")

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

@@ -13,10 +13,10 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import java.math.BigDecimal;
 
 /**
- * @Description: 今日头条广告计划信息
- * @Author: jeecg-boot
- * @Date: 2019-07-22
- * @Version: V1.0
+ * 今日头条广告计划信息
+ * @author jeecg-boot
+ * @date 2019-07-22
+ * @version V1.0
  */
 @Data
 @TableName("ctop_bytedance_advertise_plan")
@@ -24,8 +24,8 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 @ApiModel(value = "ctop_bytedance_advertise_plan对象", description = "今日头条广告计划信息")
 public class ByteDanceAdvertisePlan {
-    
-	/**头条平台广告计划id*/
+
+    /**头条平台广告计划id*/
     @TableId
     @ApiModelProperty(value = "头条平台广告计划id")
 	private Long id;

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

@@ -14,10 +14,10 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * @Description: 今日头条广告主信息
- * @Author: jeecg-boot
- * @Date: 2019-07-22
- * @Version: V1.0
+ * 今日头条广告主信息
+ * @author jeecg-boot
+ * @date 2019-07-22
+ * @version V1.0
  */
 @Data
 @TableName("ctop_bytedance_advertiser")
@@ -25,8 +25,8 @@ import java.util.Date;
 @Accessors(chain = true)
 @ApiModel(value = "ctop_bytedance_advertiser对象", description = "今日头条广告主信息")
 public class ByteDanceAdvertiser {
-    
-	/**外部平台头条id*/
+
+    /**外部平台头条id*/
     @TableId
     @ApiModelProperty(value = "外部平台头条id")
 	private Long id;

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

@@ -14,10 +14,10 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * @Description: 今日头条广告主预算信息
- * @Author: jeecg-boot
- * @Date: 2019-07-22
- * @Version: V1.0
+ * 今日头条广告主预算信息
+ * @author jeecg-boot
+ * @date 2019-07-22
+ * @version V1.0
  */
 @Data
 @TableName("ctop_bytedance_advertiser_budget")
@@ -25,8 +25,8 @@ import java.util.Date;
 @Accessors(chain = true)
 @ApiModel(value = "ctop_bytedance_advertiser_budget对象", description = "今日头条广告主预算信息")
 public class ByteDanceAdvertiserBudget {
-    
-	/**头条广告主id*/
+
+    /**头条广告主id*/
     @TableId
     @ApiModelProperty(value = "头条广告主id")
 	private Long id;

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

@@ -13,10 +13,10 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import java.util.Date;
 
 /**
- * @Description: 今日头条预算模板信息
- * @Author: jeecg-boot
- * @Date: 2019-07-22
- * @Version: V1.0
+ * 今日头条预算模板信息
+ * @author jeecg-boot
+ * @date 2019-07-22
+ * @version V1.0
  */
 @Data
 @TableName("ctop_bytedance_budget_template")

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

@@ -14,10 +14,10 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * @Description: 今日头条广告组信息
- * @Author: jeecg-boot
- * @Date: 2019-07-22
- * @Version: V1.0
+ * 今日头条广告组信息
+ * @author jeecg-boot
+ * @date 2019-07-22
+ * @version V1.0
  */
 @Data
 @TableName("ctop_bytedance_campaign")
@@ -25,8 +25,8 @@ import java.util.Date;
 @Accessors(chain = true)
 @ApiModel(value = "ctop_bytedance_campaign对象", description = "今日头条广告组信息")
 public class ByteDanceCampaign {
-    
-	/**今日头条广告组id*/
+
+    /**今日头条广告组id*/
 	@TableId
     @ApiModelProperty(value = "今日头条广告组id")
 	private Long id;

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

@@ -14,10 +14,10 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import java.util.Date;
 
 /**
- * @Description: 今日头条广告组模板信息
- * @Author: jeecg-boot
- * @Date: 2019-07-22
- * @Version: V1.0
+ * 今日头条广告组模板信息
+ * @author jeecg-boot
+ * @date 2019-07-22
+ * @version V1.0
  */
 @Data
 @TableName("ctop_bytedance_campaign_template")

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

@@ -14,10 +14,10 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import java.util.Date;
 
 /**
- * @Description: 广告计划模板信息
- * @Author: jeecg-boot
- * @Date: 2019-07-28
- * @Version: V1.0
+ * 广告计划模板信息
+ * @author jeecg-boot
+ * @date 2019-07-28
+ * @version V1.0
  */
 @Data
 @TableName("ctop_bytedance_advertise_plan_template")

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

@@ -1,28 +1,24 @@
 package org.jeecg.modules.ctop.entity;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
- * @Description: 广告主日报表
- * @Author: jeecg-boot
- * @Date: 2019-09-10
- * @Version: V1.0
+ * 广告主日报表
+ * @author jeecg-boot
+ * @date 2019-09-10
+ * @version V1.0
  */
 @Data
 @TableName("ctop_bytedance_report_advertiser_daily")

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

@@ -1,28 +1,24 @@
 package org.jeecg.modules.ctop.entity;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
- * @Description: 广告主小时级别报表信息
- * @Author: jeecg-boot
- * @Date: 2019-09-10
- * @Version: V1.0
+ * 广告主小时级别报表信息
+ * @author jeecg-boot
+ * @date 2019-09-10
+ * @version V1.0
  */
 @Data
 @TableName("ctop_bytedance_report_advertiser_hourly")

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

@@ -0,0 +1,73 @@
+package org.jeecg.modules.ctop.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 省市县信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-09-17
+ */
+@Data
+@TableName("ctop_bytedance_area_info")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_bytedance_area_info对象", description = "省市县信息")
+public class BytedanceAreaInfo {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.UUID)
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    /**
+     * name
+     */
+    @Excel(name = "name", width = 15)
+    @ApiModelProperty(value = "name")
+    private String name;
+    /**
+     * code
+     */
+    @Excel(name = "code", width = 15)
+    @ApiModelProperty(value = "code")
+    private String code;
+    /**
+     * parentCode
+     */
+    @Excel(name = "parentCode", width = 15)
+    @ApiModelProperty(value = "parentCode")
+    private String parentCode;
+    /**
+     * level
+     */
+    @Excel(name = "level", width = 15)
+    @ApiModelProperty(value = "level")
+    private Integer level;
+    /**
+     * createTime
+     */
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+    /**
+     * updateTime
+     */
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+}

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

@@ -17,10 +17,10 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 /**
- * @Description: 统一资源库文件信息
- * @Author: jeecg-boot
- * @Date: 2019-09-02
- * @Version: V1.0
+ * 统一资源库文件信息
+ * @author jeecg-boot
+ * @date 2019-09-02
+ * @version V1.0
  */
 @Data
 @TableName("ctop_source_file")

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

@@ -15,10 +15,10 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.util.Date;
 
 /**
- * @Description: 用户分配
- * @Author: jeecg-boot
- * @Date: 2019-08-08
- * @Version: V1.0
+ * 用户分配
+ * @author jeecg-boot
+ * @date 2019-08-08
+ * @version V1.0
  */
 @Data
 @TableName("ctop_user_allocation")

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

@@ -1,7 +1,6 @@
 package org.jeecg.modules.ctop.job;
 
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.chrome.ChromeDriverService;
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.firefox.FirefoxOptions;
 import org.openqa.selenium.firefox.GeckoDriverService;
@@ -12,6 +11,9 @@ import org.quartz.JobExecutionException;
 import java.io.File;
 import java.util.concurrent.TimeUnit;
 
+/**
+ * @author jeecg-boot
+ */
 public class TestJob implements Job {
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {

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

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

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

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

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

@@ -0,0 +1,15 @@
+package org.jeecg.modules.ctop.service;
+
+import org.jeecg.modules.ctop.entity.BytedanceAreaInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 省市县信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-09-17
+ */
+public interface IBytedanceAreaInfoService extends IService<BytedanceAreaInfo> {
+
+}

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

@@ -8,8 +8,6 @@ import org.jeecg.modules.ctop.entity.BindAccountLogin;
 import org.jeecg.modules.ctop.mapper.BindAccountLoginMapper;
 import org.jeecg.modules.ctop.service.IBindAccountLoginService;
 import org.jeecg.modules.ctop.service.ICreateInternalService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -0,0 +1,20 @@
+package org.jeecg.modules.ctop.service.impl;
+
+import org.jeecg.modules.ctop.entity.BytedanceAreaInfo;
+import org.jeecg.modules.ctop.mapper.BytedanceAreaInfoMapper;
+import org.jeecg.modules.ctop.service.IBytedanceAreaInfoService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 省市县信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-09-17
+ */
+@Service
+public class BytedanceAreaInfoServiceImpl extends ServiceImpl<BytedanceAreaInfoMapper, BytedanceAreaInfo> implements IBytedanceAreaInfoService {
+
+}

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

@@ -1,6 +1,5 @@
 package org.jeecg.modules.ctop.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

@@ -7,8 +7,6 @@ import org.jeecg.modules.ctop.entity.CtopOauthToken;
 import org.jeecg.modules.ctop.mapper.CtopOauthTokenMapper;
 import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
 import org.jeecg.modules.ctop.service.IRefreshTokenService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -128,7 +128,7 @@ public class ReportServiceImpl implements IReportService {
             if (null != dataArray && dataArray.size() > 0) {
                 for (int i = 0; i < dataArray.size(); i++) {
                     JSONObject data = dataArray.getJSONObject(i);
-                    if (null != time_granularity && time_granularity.equals("STAT_TIME_GRANULARITY_HOURLY")) {
+                    if (null != time_granularity && "STAT_TIME_GRANULARITY_HOURLY".equals(time_granularity)) {
                         BytedanceCampaignHourlyReport hourlyReport = new BytedanceCampaignHourlyReport(data);
                         campaignHourlyReportService.saveOrUpdate(hourlyReport);
                     } else {
@@ -180,7 +180,7 @@ public class ReportServiceImpl implements IReportService {
             if (null != dataArray && dataArray.size() > 0) {
                 for (int i = 0; i < dataArray.size(); i++) {
                     JSONObject data = dataArray.getJSONObject(i);
-                    if (null != time_granularity && time_granularity.equals("STAT_TIME_GRANULARITY_HOURLY")) {
+                    if (null != time_granularity && "STAT_TIME_GRANULARITY_HOURLY".equals(time_granularity)) {
                         BytedancePlanHourlyReport hourlyReport = new BytedancePlanHourlyReport(data);
                         planHourlyReportService.saveOrUpdate(hourlyReport);
                     } else {
@@ -215,7 +215,7 @@ public class ReportServiceImpl implements IReportService {
             if (null != dataArray && dataArray.size() > 0) {
                 for (int i = 0; i < dataArray.size(); i++) {
                     JSONObject data = dataArray.getJSONObject(i);
-                    if (null != time_granularity && time_granularity.equals("STAT_TIME_GRANULARITY_HOURLY")) {
+                    if (null != time_granularity && "STAT_TIME_GRANULARITY_HOURLY".equals(time_granularity)) {
                         BytedanceCreativeHourlyReport hourlyReport = new BytedanceCreativeHourlyReport(data);
                         creativeHourlyReportService.saveOrUpdate(hourlyReport);
                     } else {

+ 17 - 23
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouActionBarTextController.java

@@ -1,46 +1,40 @@
 package org.jeecg.modules.kuaishou.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.utils.Check;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.kuaishou.entity.KuaiShouActionBarText;
 import org.jeecg.modules.kuaishou.entity.KuaiShouCampaignCreate;
 import org.jeecg.modules.kuaishou.service.IKuaiShouActionBarTextService;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
 import org.jeecg.modules.kuaishou.service.IKuaiShouCampaignCreateService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 快手-行动号召文案

+ 31 - 33
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupBidController.java

@@ -1,39 +1,37 @@
 package org.jeecg.modules.kuaishou.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 com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.kuaishou.entity.KuaiShouGroupBid;
 import org.jeecg.modules.kuaishou.service.IKuaiShouGroupBidService;
-import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+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: 快手修改广告组出价
@@ -48,8 +46,8 @@ import io.swagger.annotations.ApiOperation;
 public class KuaiShouGroupBidController {
 	@Autowired
 	private IKuaiShouGroupBidService kuaiShouGroupBidService;
-	
-	/**
+
+     /**
 	  * 分页列表查询
 	 * @param kuaiShouGroupBid
 	 * @param pageNo
@@ -72,8 +70,8 @@ public class KuaiShouGroupBidController {
 		result.setResult(pageList);
 		return result;
 	}
-	
-	/**
+
+     /**
 	  *   添加
 	 * @param kuaiShouGroupBid
 	 * @return
@@ -92,8 +90,8 @@ public class KuaiShouGroupBidController {
 		}
 		return result;
 	}
-	
-	/**
+
+     /**
 	  *  编辑
 	 * @param kuaiShouGroupBid
 	 * @return
@@ -113,11 +111,11 @@ public class KuaiShouGroupBidController {
 				result.success("修改成功!");
 			}
 		}
-		
-		return result;
+
+        return result;
 	}
-	
-	/**
+
+     /**
 	  *   通过id删除
 	 * @param id
 	 * @return
@@ -134,8 +132,8 @@ public class KuaiShouGroupBidController {
 		}
 		return Result.ok("删除成功!");
 	}
-	
-	/**
+
+     /**
 	  *  批量删除
 	 * @param ids
 	 * @return
@@ -153,8 +151,8 @@ public class KuaiShouGroupBidController {
 		}
 		return result;
 	}
-	
-	/**
+
+     /**
 	  * 通过id查询
 	 * @param id
 	 * @return

+ 31 - 33
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupDayBudgetController.java

@@ -1,39 +1,37 @@
 package org.jeecg.modules.kuaishou.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 com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.kuaishou.entity.KuaiShouGroupDayBudget;
 import org.jeecg.modules.kuaishou.service.IKuaiShouGroupDayBudgetService;
-import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+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: 快手 修改广告组预算
@@ -48,8 +46,8 @@ import io.swagger.annotations.ApiOperation;
 public class KuaiShouGroupDayBudgetController {
 	@Autowired
 	private IKuaiShouGroupDayBudgetService kuaiShouGroupDayBudgetService;
-	
-	/**
+
+     /**
 	  * 分页列表查询
 	 * @param kuaiShouGroupDayBudget
 	 * @param pageNo
@@ -72,8 +70,8 @@ public class KuaiShouGroupDayBudgetController {
 		result.setResult(pageList);
 		return result;
 	}
-	
-	/**
+
+     /**
 	  *   添加
 	 * @param kuaiShouGroupDayBudget
 	 * @return
@@ -92,8 +90,8 @@ public class KuaiShouGroupDayBudgetController {
 		}
 		return result;
 	}
-	
-	/**
+
+     /**
 	  *  编辑
 	 * @param kuaiShouGroupDayBudget
 	 * @return
@@ -113,11 +111,11 @@ public class KuaiShouGroupDayBudgetController {
 				result.success("修改成功!");
 			}
 		}
-		
-		return result;
+
+        return result;
 	}
-	
-	/**
+
+     /**
 	  *   通过id删除
 	 * @param id
 	 * @return
@@ -134,8 +132,8 @@ public class KuaiShouGroupDayBudgetController {
 		}
 		return Result.ok("删除成功!");
 	}
-	
-	/**
+
+     /**
 	  *  批量删除
 	 * @param ids
 	 * @return
@@ -153,8 +151,8 @@ public class KuaiShouGroupDayBudgetController {
 		}
 		return result;
 	}
-	
-	/**
+
+     /**
 	  * 通过id查询
 	 * @param id
 	 * @return

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

@@ -19,8 +19,6 @@ import org.jeecg.modules.kuaishou.service.IKuaiShouCreateService;
 import org.jeecg.modules.kuaishou.service.IKuaiShouImageService;
 import org.jeecg.modules.kuaishou.service.IKuaiShouVideoService;
 import org.jeecg.modules.kuaishou.service.IKuaishouInterfaceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 8 - 10
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/AutoLogAspect.java

@@ -1,10 +1,6 @@
 package org.jeecg.modules.system.aspect;
 
-import java.lang.reflect.Method;
-import java.util.Date;
-
-import javax.servlet.http.HttpServletRequest;
-
+import com.alibaba.fastjson.JSONObject;
 import org.apache.shiro.SecurityUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -20,12 +16,14 @@ import org.jeecg.modules.system.service.ISysLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.alibaba.fastjson.JSONObject;
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+import java.util.Date;
 
 
 /**
  * 系统日志,切面处理类
- * 
+ *
  * @Author scott
  * @email jeecgos@163.com
  * @Date 2018年1月14日
@@ -35,10 +33,10 @@ import com.alibaba.fastjson.JSONObject;
 public class AutoLogAspect {
 	@Autowired
 	private ISysLogService sysLogService;
-	
+
 	@Pointcut("@annotation(org.jeecg.common.aspect.annotation.AutoLog)")
-	public void logPointCut() { 
-		
+    public void logPointCut() {
+
 	}
 
 	@Around("logPointCut()")

+ 12 - 15
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/DictAspect.java

@@ -1,18 +1,17 @@
 package org.jeecg.modules.system.aspect;
 
-import java.lang.reflect.Field;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.Dict;
-
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.system.service.ISysDictService;
@@ -20,13 +19,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import lombok.extern.slf4j.Slf4j;
+import java.lang.reflect.Field;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * @Description: 字典aop类
@@ -50,7 +47,7 @@ public class DictAspect {
 
     @Around("excudeService()")
     public Object doAround(ProceedingJoinPoint pjp) throws Throwable {
-    	long time1=System.currentTimeMillis();	
+        long time1 = System.currentTimeMillis();
         Object result = pjp.proceed();
         long time2=System.currentTimeMillis();
         log.debug("获取JSON数据 耗时:"+(time2-time1)+"ms");

+ 26 - 30
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/PermissionDataAspect.java

@@ -1,10 +1,7 @@
 package org.jeecg.modules.system.aspect;
 
-import java.lang.reflect.Method;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -26,9 +23,9 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.PathMatcher;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-
-import lombok.extern.slf4j.Slf4j;
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+import java.util.List;
 
 /**
   * 数据权限切面处理类
@@ -40,21 +37,20 @@ import lombok.extern.slf4j.Slf4j;
 @Component
 @Slf4j
 public class PermissionDataAspect {
-	
 	@Autowired
 	private ISysPermissionService sysPermissionService;
-	
+
 	@Autowired
 	private ISysPermissionDataRuleService sysPermissionDataRuleService;
-	
-	@Autowired
+
+    @Autowired
 	private ISysUserService sysUserService;
-	
-	@Pointcut("@annotation(org.jeecg.common.aspect.annotation.PermissionData)")
+
+    @Pointcut("@annotation(org.jeecg.common.aspect.annotation.PermissionData)")
 	public void pointCut() {
-		
-	}
-	
+
+    }
+
 	@Around("pointCut()")
 	public Object arround(ProceedingJoinPoint point) throws  Throwable{
 		HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
@@ -94,17 +90,17 @@ public class PermissionDataAspect {
 			List<SysPermissionDataRule> dataRules = sysPermissionDataRuleService.queryPermissionDataRules(username, currentSyspermission.getId());
 			if(dataRules!=null && dataRules.size()>0) {
 				JeecgDataAutorUtils.installDataSearchConditon(request, dataRules);
-				
-				//TODO 此处将用户信息查找出来放到request中实属无奈  可以优化
+
+                //TODO 此处将用户信息查找出来放到request中实属无奈  可以优化
 				SysUserCacheInfo userinfo = sysUserService.getCacheUser(username);
 				JeecgDataAutorUtils.installUserInfo(request, userinfo);
 			}
 		}
-		
-		return  point.proceed();
+
+        return  point.proceed();
 	}
-	
-	private String filterUrl(String requestPath){
+
+    private String filterUrl(String requestPath){
 		String url = "";
 		if(oConvertUtils.isNotEmpty(requestPath)){
 			url = requestPath.replace("\\", "/");
@@ -118,8 +114,8 @@ public class PermissionDataAspect {
 		}
 		return url;
 	}
-	
-	/**
+
+    /**
 	 * 获取请求地址
 	 * @param request
 	 * @return
@@ -145,8 +141,8 @@ public class PermissionDataAspect {
         requestPath = requestPath.substring(request.getContextPath().length() + 1);
 		return filterUrl(requestPath);
 	}
-	
-	private boolean moHuContain(List<String> list,String key){
+
+    private boolean moHuContain(List<String> list,String key){
 		for(String str : list){
 			if(key.contains(str)){
 				return true;
@@ -154,8 +150,8 @@ public class PermissionDataAspect {
 		}
 		return false;
 	}
-	
-	/**
+
+    /**
 	 * 匹配前端传过来的地址 匹配成功返回正则地址
 	 * AntPathMatcher匹配地址
 	 *()* 匹配0个或多个字符
@@ -173,5 +169,5 @@ public class PermissionDataAspect {
 		}
 		return null;
 	}
-	
+
 }

+ 3 - 3
jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai

@@ -9,9 +9,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
  * ${tableVo.ftlDescription}
- * @author: jeecg-boot
- * @date:   ${.now?string["yyyy-MM-dd"]}
- * @version: V1.0
+ * @author jeecg-boot
+ * @date   ${.now?string["yyyy-MM-dd"]}
+ * @version V1.0
  */
 @Service
 public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service {