yumeng 5 years ago
parent
commit
343322228b
100 changed files with 1898 additions and 1853 deletions
  1. 4 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CtopOauthTokenController.java
  2. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCustomAudience.java
  3. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/FileInfo.java
  4. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IByteDanceAdvertiserDataService.java
  5. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IByteDanceCampaignTemplateService.java
  6. 2 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceCreativeServiceImpl.java
  7. 5 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouActionBarTextController.java
  8. 218 213
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAdvertiserBaseInfoController.java
  9. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAppCreateController.java
  10. 161 155
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAppInfoController.java
  11. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAppListController.java
  12. 161 155
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignController.java
  13. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignCreateController.java
  14. 218 214
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignDayBudgetController.java
  15. 218 214
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignStatusController.java
  16. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignTemplateController.java
  17. 1 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouController.java
  18. 161 155
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouConversionInfosController.java
  19. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouConversionTypesController.java
  20. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreateAppTemplateController.java
  21. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreateController.java
  22. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreativeController.java
  23. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreativeCreateController.java
  24. 194 188
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupBidController.java
  25. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupController.java
  26. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupCreateLogController.java
  27. 161 155
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupCreateTargetController.java
  28. 194 188
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupDayBudgetController.java
  29. 19 22
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouImageController.java
  30. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouImageGetController.java
  31. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouImageUploandController.java
  32. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouRegionListChildrenController.java
  33. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouRegionListParentController.java
  34. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouScheduleController.java
  35. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouVideoController.java
  36. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouVideoGetController.java
  37. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouVideoUploadController.java
  38. 10 0
      module-common/pom.xml
  39. 13 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/CtopOauthToken.java
  40. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/CtopOauthTokenMapper.java
  41. 0 0
      module-common/src/main/java/module/mapper/xml/CtopOauthTokenMapper.xml
  42. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/ICtopOauthTokenService.java
  43. 6 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CtopOauthTokenServiceImpl.java
  44. 11 0
      module-ctop/pom.xml
  45. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouActionBarText.java
  46. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouAdvertiserBaseInfo.java
  47. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouAppCreate.java
  48. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouAppInfo.java
  49. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouAppList.java
  50. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouCampaign.java
  51. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouCampaignCreate.java
  52. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouCampaignDayBudget.java
  53. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouCampaignStatus.java
  54. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouCampaignTemplate.java
  55. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouConversionInfos.java
  56. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouConversionTypes.java
  57. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouCreateAppTemplate.java
  58. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouCreative.java
  59. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouCreativeCreate.java
  60. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouGroup.java
  61. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouGroupBid.java
  62. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouGroupCreateLog.java
  63. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouGroupCreateTarget.java
  64. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouGroupDayBudget.java
  65. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouImage.java
  66. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouImageGet.java
  67. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouImageUploand.java
  68. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouRegionListChildren.java
  69. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouRegionListParent.java
  70. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouSchedule.java
  71. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouVideo.java
  72. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouVideoGet.java
  73. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouVideoUpload.java
  74. 3 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouActionBarTextMapper.java
  75. 4 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouAdvertiserBaseInfoMapper.java
  76. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouAppCreateMapper.java
  77. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouAppInfoMapper.java
  78. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouAppListMapper.java
  79. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouCampaignCreateMapper.java
  80. 3 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouCampaignDayBudgetMapper.java
  81. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouCampaignMapper.java
  82. 3 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouCampaignStatusMapper.java
  83. 3 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouCampaignTemplateMapper.java
  84. 2 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouConversionInfosMapper.java
  85. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouConversionTypesMapper.java
  86. 3 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouCreateAppTemplateMapper.java
  87. 2 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouCreativeCreateMapper.java
  88. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouCreativeMapper.java
  89. 2 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouGroupBidMapper.java
  90. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouGroupCreateLogMapper.java
  91. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouGroupCreateTargetMapper.java
  92. 3 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouGroupDayBudgetMapper.java
  93. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouGroupMapper.java
  94. 2 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouImageGetMapper.java
  95. 3 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouImageMapper.java
  96. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouImageUploandMapper.java
  97. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouRegionListChildrenMapper.java
  98. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouRegionListParentMapper.java
  99. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouScheduleMapper.java
  100. 0 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouVideoGetMapper.java

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

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

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

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
+import module.entity.CtopOauthToken;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 
 import java.util.Date;
 import java.util.Date;

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
+import module.entity.CtopOauthToken;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 
 import java.util.Date;
 import java.util.Date;

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

@@ -1,8 +1,8 @@
 package org.jeecg.modules.ctop.service;
 package org.jeecg.modules.ctop.service;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
+import module.entity.CtopOauthToken;
 import org.jeecg.modules.ctop.entity.ByteDanceUserOrientationTemplate;
 import org.jeecg.modules.ctop.entity.ByteDanceUserOrientationTemplate;
-import org.jeecg.modules.ctop.entity.CtopOauthToken;
 
 
 import java.util.Map;
 import java.util.Map;
 
 

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

@@ -1,10 +1,10 @@
 package org.jeecg.modules.ctop.service;
 package org.jeecg.modules.ctop.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import module.entity.CtopOauthToken;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
 import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.ctop.entity.CtopOauthToken;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 import java.util.Map;

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

@@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import module.entity.CtopOauthToken;
+import module.service.ICtopOauthTokenService;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPost;
@@ -15,7 +17,6 @@ import org.apache.http.impl.client.HttpClientBuilder;
 import org.jeecg.common.util.ResultMapUtils;
 import org.jeecg.common.util.ResultMapUtils;
 import org.jeecg.common.util.StatusCode;
 import org.jeecg.common.util.StatusCode;
 import org.jeecg.modules.ctop.entity.ByteDanceCreative;
 import org.jeecg.modules.ctop.entity.ByteDanceCreative;
-import org.jeecg.modules.ctop.entity.CtopOauthToken;
 import org.jeecg.modules.ctop.mapper.ByteDanceCreativeMapper;
 import org.jeecg.modules.ctop.mapper.ByteDanceCreativeMapper;
 import org.jeecg.modules.ctop.service.*;
 import org.jeecg.modules.ctop.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,6 +1,10 @@
 package org.jeecg.modules.kuaishou.controller;
 package org.jeecg.modules.kuaishou.controller;
 
 
 import cn.com.ctop.common.utils.Check;
 import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouActionBarText;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignCreate;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouActionBarTextService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCampaignCreateService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,10 +16,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 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 org.jeecg.modules.kuaishou.service.IKuaiShouCampaignCreateService;
+
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;

+ 218 - 213
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAdvertiserBaseInfoController.java

@@ -1,243 +1,248 @@
 package org.jeecg.modules.kuaishou.controller;
 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 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.kuaishou.entity.KuaiShouAdvertiserBaseInfo;
-import org.jeecg.modules.kuaishou.service.IKuaiShouAdvertiserBaseInfoService;
-import java.util.Date;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAdvertiserBaseInfo;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAdvertiserBaseInfoService;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 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;
+
+/**
  * 快手-广告主基本信息
  * 快手-广告主基本信息
+ *
  * @author jeecg-boot
  * @author jeecg-boot
- * @date   2019-09-18
  * @version V1.0
  * @version V1.0
+ * @date 2019-09-18
  */
  */
 @Slf4j
 @Slf4j
-@Api(tags="快手-广告主基本信息")
+@Api(tags = "快手-广告主基本信息")
 @RestController
 @RestController
 @RequestMapping("/kuaishou/kuaiShouAdvertiserBaseInfo")
 @RequestMapping("/kuaishou/kuaiShouAdvertiserBaseInfo")
 public class KuaiShouAdvertiserBaseInfoController {
 public class KuaiShouAdvertiserBaseInfoController {
-	@Autowired
-	private IKuaiShouAdvertiserBaseInfoService kuaiShouAdvertiserBaseInfoService;
-	
-	/**
-	  * 分页列表查询
-	 * @param kuaiShouAdvertiserBaseInfo
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "快手-广告主基本信息-分页列表查询")
-	@ApiOperation(value="快手-广告主基本信息-分页列表查询", notes="快手-广告主基本信息-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouAdvertiserBaseInfo>> queryPageList(KuaiShouAdvertiserBaseInfo kuaiShouAdvertiserBaseInfo,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouAdvertiserBaseInfo>> result = new Result<IPage<KuaiShouAdvertiserBaseInfo>>();
-		QueryWrapper<KuaiShouAdvertiserBaseInfo> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAdvertiserBaseInfo, req.getParameterMap());
-		Page<KuaiShouAdvertiserBaseInfo> page = new Page<KuaiShouAdvertiserBaseInfo>(pageNo, pageSize);
-		IPage<KuaiShouAdvertiserBaseInfo> pageList = kuaiShouAdvertiserBaseInfoService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param kuaiShouAdvertiserBaseInfo
-	 * @return
-	 */
-	@AutoLog(value = "快手-广告主基本信息-添加")
-	@ApiOperation(value="快手-广告主基本信息-添加", notes="快手-广告主基本信息-添加")
-	@PostMapping(value = "/add")
-	public Result<KuaiShouAdvertiserBaseInfo> add(@RequestBody KuaiShouAdvertiserBaseInfo kuaiShouAdvertiserBaseInfo) {
-		Result<KuaiShouAdvertiserBaseInfo> result = new Result<KuaiShouAdvertiserBaseInfo>();
-		try {
-			kuaiShouAdvertiserBaseInfoService.save(kuaiShouAdvertiserBaseInfo);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param kuaiShouAdvertiserBaseInfo
-	 * @return
-	 */
-	@AutoLog(value = "快手-广告主基本信息-编辑")
-	@ApiOperation(value="快手-广告主基本信息-编辑", notes="快手-广告主基本信息-编辑")
-	@PutMapping(value = "/edit")
-	public Result<KuaiShouAdvertiserBaseInfo> edit(@RequestBody KuaiShouAdvertiserBaseInfo kuaiShouAdvertiserBaseInfo) {
-		Result<KuaiShouAdvertiserBaseInfo> result = new Result<KuaiShouAdvertiserBaseInfo>();
-		KuaiShouAdvertiserBaseInfo kuaiShouAdvertiserBaseInfoEntity = kuaiShouAdvertiserBaseInfoService.getById(kuaiShouAdvertiserBaseInfo.getId());
-		if(kuaiShouAdvertiserBaseInfoEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = kuaiShouAdvertiserBaseInfoService.updateById(kuaiShouAdvertiserBaseInfo);
-			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 {
-			kuaiShouAdvertiserBaseInfoService.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<KuaiShouAdvertiserBaseInfo> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouAdvertiserBaseInfo> result = new Result<KuaiShouAdvertiserBaseInfo>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.kuaiShouAdvertiserBaseInfoService.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<KuaiShouAdvertiserBaseInfo> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouAdvertiserBaseInfo> result = new Result<KuaiShouAdvertiserBaseInfo>();
-		KuaiShouAdvertiserBaseInfo kuaiShouAdvertiserBaseInfo = kuaiShouAdvertiserBaseInfoService.getById(id);
-		if(kuaiShouAdvertiserBaseInfo==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(kuaiShouAdvertiserBaseInfo);
-			result.setSuccess(true);
-		}
-		return result;
-	}
+    @Autowired
+    private IKuaiShouAdvertiserBaseInfoService kuaiShouAdvertiserBaseInfoService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param kuaiShouAdvertiserBaseInfo
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "快手-广告主基本信息-分页列表查询")
+    @ApiOperation(value = "快手-广告主基本信息-分页列表查询", notes = "快手-广告主基本信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<KuaiShouAdvertiserBaseInfo>> queryPageList(KuaiShouAdvertiserBaseInfo kuaiShouAdvertiserBaseInfo,
+                                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                   HttpServletRequest req) {
+        Result<IPage<KuaiShouAdvertiserBaseInfo>> result = new Result<IPage<KuaiShouAdvertiserBaseInfo>>();
+        QueryWrapper<KuaiShouAdvertiserBaseInfo> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAdvertiserBaseInfo, req.getParameterMap());
+        Page<KuaiShouAdvertiserBaseInfo> page = new Page<KuaiShouAdvertiserBaseInfo>(pageNo, pageSize);
+        IPage<KuaiShouAdvertiserBaseInfo> pageList = kuaiShouAdvertiserBaseInfoService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param kuaiShouAdvertiserBaseInfo
+     * @return
+     */
+    @AutoLog(value = "快手-广告主基本信息-添加")
+    @ApiOperation(value = "快手-广告主基本信息-添加", notes = "快手-广告主基本信息-添加")
+    @PostMapping(value = "/add")
+    public Result<KuaiShouAdvertiserBaseInfo> add(@RequestBody KuaiShouAdvertiserBaseInfo kuaiShouAdvertiserBaseInfo) {
+        Result<KuaiShouAdvertiserBaseInfo> result = new Result<KuaiShouAdvertiserBaseInfo>();
+        try {
+            kuaiShouAdvertiserBaseInfoService.save(kuaiShouAdvertiserBaseInfo);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param kuaiShouAdvertiserBaseInfo
+     * @return
+     */
+    @AutoLog(value = "快手-广告主基本信息-编辑")
+    @ApiOperation(value = "快手-广告主基本信息-编辑", notes = "快手-广告主基本信息-编辑")
+    @PutMapping(value = "/edit")
+    public Result<KuaiShouAdvertiserBaseInfo> edit(@RequestBody KuaiShouAdvertiserBaseInfo kuaiShouAdvertiserBaseInfo) {
+        Result<KuaiShouAdvertiserBaseInfo> result = new Result<KuaiShouAdvertiserBaseInfo>();
+        KuaiShouAdvertiserBaseInfo kuaiShouAdvertiserBaseInfoEntity = kuaiShouAdvertiserBaseInfoService.getById(kuaiShouAdvertiserBaseInfo.getId());
+        if (kuaiShouAdvertiserBaseInfoEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = kuaiShouAdvertiserBaseInfoService.updateById(kuaiShouAdvertiserBaseInfo);
+            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 {
+            kuaiShouAdvertiserBaseInfoService.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<KuaiShouAdvertiserBaseInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouAdvertiserBaseInfo> result = new Result<KuaiShouAdvertiserBaseInfo>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.kuaiShouAdvertiserBaseInfoService.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<KuaiShouAdvertiserBaseInfo> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouAdvertiserBaseInfo> result = new Result<KuaiShouAdvertiserBaseInfo>();
+        KuaiShouAdvertiserBaseInfo kuaiShouAdvertiserBaseInfo = kuaiShouAdvertiserBaseInfoService.getById(id);
+        if (kuaiShouAdvertiserBaseInfo == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouAdvertiserBaseInfo);
+            result.setSuccess(true);
+        }
+        return result;
+    }
 
 
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouAdvertiserBaseInfo> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouAdvertiserBaseInfo kuaiShouAdvertiserBaseInfo = JSON.parseObject(deString, KuaiShouAdvertiserBaseInfo.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAdvertiserBaseInfo, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouAdvertiserBaseInfo> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouAdvertiserBaseInfo kuaiShouAdvertiserBaseInfo = JSON.parseObject(deString, KuaiShouAdvertiserBaseInfo.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAdvertiserBaseInfo, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
 
 
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouAdvertiserBaseInfo> pageList = kuaiShouAdvertiserBaseInfoService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "快手-广告主基本信息列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouAdvertiserBaseInfo.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("快手-广告主基本信息列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouAdvertiserBaseInfo> pageList = kuaiShouAdvertiserBaseInfoService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-广告主基本信息列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouAdvertiserBaseInfo.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<KuaiShouAdvertiserBaseInfo> listKuaiShouAdvertiserBaseInfos = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouAdvertiserBaseInfo.class, params);
-              kuaiShouAdvertiserBaseInfoService.saveBatch(listKuaiShouAdvertiserBaseInfos);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouAdvertiserBaseInfos.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("文件导入失败!");
-  }
+    /**
+     * 通过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<KuaiShouAdvertiserBaseInfo> listKuaiShouAdvertiserBaseInfos = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouAdvertiserBaseInfo.class, params);
+                kuaiShouAdvertiserBaseInfoService.saveBatch(listKuaiShouAdvertiserBaseInfos);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouAdvertiserBaseInfos.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("文件导入失败!");
+    }
 
 
 }
 }

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAppCreateController.java

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

+ 161 - 155
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAppInfoController.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.kuaishou.controller;
 package org.jeecg.modules.kuaishou.controller;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppInfo;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAppInfoService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,8 +13,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.kuaishou.entity.KuaiShouAppInfo;
-import org.jeecg.modules.kuaishou.service.IKuaiShouAppInfoService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -33,10 +33,10 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
- /**
-  * @Description: 广告组-app信息
+/**
+ * @Description: 广告组-app信息
  * @Author: jeecg-boot
  * @Author: jeecg-boot
-  * @Date: 2019-07-23
+ * @Date: 2019-07-23
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 @Slf4j
 @Slf4j
@@ -44,20 +44,21 @@ import java.util.Map;
 @RestController
 @RestController
 @RequestMapping("/kuaishou/kuaiShouAppInfo")
 @RequestMapping("/kuaishou/kuaiShouAppInfo")
 public class KuaiShouAppInfoController {
 public class KuaiShouAppInfoController {
-	@Autowired
+    @Autowired
     private IKuaiShouAppInfoService kuaiShouAppInfoService;
     private IKuaiShouAppInfoService kuaiShouAppInfoService;
-	
-	/**
-	  * 分页列表查询
+
+    /**
+     * 分页列表查询
+     *
      * @param kuaiShouAppInfo
      * @param kuaiShouAppInfo
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
     @AutoLog(value = "广告组-app信息-分页列表查询")
     @AutoLog(value = "广告组-app信息-分页列表查询")
     @ApiOperation(value = "广告组-app信息-分页列表查询", notes = "广告组-app信息-分页列表查询")
     @ApiOperation(value = "广告组-app信息-分页列表查询", notes = "广告组-app信息-分页列表查询")
-	@GetMapping(value = "/list")
+    @GetMapping(value = "/list")
     public Result<IPage<KuaiShouAppInfo>> queryPageList(KuaiShouAppInfo kuaiShouAppInfo,
     public Result<IPage<KuaiShouAppInfo>> queryPageList(KuaiShouAppInfo kuaiShouAppInfo,
                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -66,177 +67,182 @@ public class KuaiShouAppInfoController {
         QueryWrapper<KuaiShouAppInfo> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAppInfo, req.getParameterMap());
         QueryWrapper<KuaiShouAppInfo> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAppInfo, req.getParameterMap());
         Page<KuaiShouAppInfo> page = new Page<KuaiShouAppInfo>(pageNo, pageSize);
         Page<KuaiShouAppInfo> page = new Page<KuaiShouAppInfo>(pageNo, pageSize);
         IPage<KuaiShouAppInfo> pageList = kuaiShouAppInfoService.page(page, queryWrapper);
         IPage<KuaiShouAppInfo> pageList = kuaiShouAppInfoService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
      * @param kuaiShouAppInfo
      * @param kuaiShouAppInfo
-	 * @return
-	 */
+     * @return
+     */
     @AutoLog(value = "广告组-app信息-添加")
     @AutoLog(value = "广告组-app信息-添加")
     @ApiOperation(value = "广告组-app信息-添加", notes = "广告组-app信息-添加")
     @ApiOperation(value = "广告组-app信息-添加", notes = "广告组-app信息-添加")
-	@PostMapping(value = "/add")
+    @PostMapping(value = "/add")
     public Result<KuaiShouAppInfo> add(@RequestBody KuaiShouAppInfo kuaiShouAppInfo) {
     public Result<KuaiShouAppInfo> add(@RequestBody KuaiShouAppInfo kuaiShouAppInfo) {
         Result<KuaiShouAppInfo> result = new Result<KuaiShouAppInfo>();
         Result<KuaiShouAppInfo> result = new Result<KuaiShouAppInfo>();
-		try {
+        try {
             kuaiShouAppInfoService.save(kuaiShouAppInfo);
             kuaiShouAppInfoService.save(kuaiShouAppInfo);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
      * @param kuaiShouAppInfo
      * @param kuaiShouAppInfo
-	 * @return
-	 */
+     * @return
+     */
     @AutoLog(value = "广告组-app信息-编辑")
     @AutoLog(value = "广告组-app信息-编辑")
     @ApiOperation(value = "广告组-app信息-编辑", notes = "广告组-app信息-编辑")
     @ApiOperation(value = "广告组-app信息-编辑", notes = "广告组-app信息-编辑")
-	@PutMapping(value = "/edit")
+    @PutMapping(value = "/edit")
     public Result<KuaiShouAppInfo> edit(@RequestBody KuaiShouAppInfo kuaiShouAppInfo) {
     public Result<KuaiShouAppInfo> edit(@RequestBody KuaiShouAppInfo kuaiShouAppInfo) {
         Result<KuaiShouAppInfo> result = new Result<KuaiShouAppInfo>();
         Result<KuaiShouAppInfo> result = new Result<KuaiShouAppInfo>();
         KuaiShouAppInfo kuaiShouAppInfoEntity = kuaiShouAppInfoService.getById(kuaiShouAppInfo.getId());
         KuaiShouAppInfo kuaiShouAppInfoEntity = kuaiShouAppInfoService.getById(kuaiShouAppInfo.getId());
         if (kuaiShouAppInfoEntity == null) {
         if (kuaiShouAppInfoEntity == null) {
-			result.error500("未找到对应实体");
-		}else {
+            result.error500("未找到对应实体");
+        } else {
             boolean ok = kuaiShouAppInfoService.updateById(kuaiShouAppInfo);
             boolean ok = kuaiShouAppInfoService.updateById(kuaiShouAppInfo);
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
+            //TODO 返回false说明什么?
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
     @AutoLog(value = "广告组-app信息-通过id删除")
     @AutoLog(value = "广告组-app信息-通过id删除")
     @ApiOperation(value = "广告组-app信息-通过id删除", notes = "广告组-app信息-通过id删除")
     @ApiOperation(value = "广告组-app信息-通过id删除", notes = "广告组-app信息-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
             kuaiShouAppInfoService.removeById(id);
             kuaiShouAppInfoService.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
     @AutoLog(value = "广告组-app信息-批量删除")
     @AutoLog(value = "广告组-app信息-批量删除")
     @ApiOperation(value = "广告组-app信息-批量删除", notes = "广告组-app信息-批量删除")
     @ApiOperation(value = "广告组-app信息-批量删除", notes = "广告组-app信息-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
     public Result<KuaiShouAppInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
     public Result<KuaiShouAppInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         Result<KuaiShouAppInfo> result = new Result<KuaiShouAppInfo>();
         Result<KuaiShouAppInfo> result = new Result<KuaiShouAppInfo>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
             this.kuaiShouAppInfoService.removeByIds(Arrays.asList(ids.split(",")));
             this.kuaiShouAppInfoService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
     @AutoLog(value = "广告组-app信息-通过id查询")
     @AutoLog(value = "广告组-app信息-通过id查询")
     @ApiOperation(value = "广告组-app信息-通过id查询", notes = "广告组-app信息-通过id查询")
     @ApiOperation(value = "广告组-app信息-通过id查询", notes = "广告组-app信息-通过id查询")
-	@GetMapping(value = "/queryById")
+    @GetMapping(value = "/queryById")
     public Result<KuaiShouAppInfo> queryById(@RequestParam(name = "id", required = true) String id) {
     public Result<KuaiShouAppInfo> queryById(@RequestParam(name = "id", required = true) String id) {
         Result<KuaiShouAppInfo> result = new Result<KuaiShouAppInfo>();
         Result<KuaiShouAppInfo> result = new Result<KuaiShouAppInfo>();
         KuaiShouAppInfo kuaiShouAppInfo = kuaiShouAppInfoService.getById(id);
         KuaiShouAppInfo kuaiShouAppInfo = kuaiShouAppInfoService.getById(id);
         if (kuaiShouAppInfo == null) {
         if (kuaiShouAppInfo == null) {
-			result.error500("未找到对应实体");
-		}else {
+            result.error500("未找到对应实体");
+        } else {
             result.setResult(kuaiShouAppInfo);
             result.setResult(kuaiShouAppInfo);
-			result.setSuccess(true);
-		}
-		return result;
-	}
+            result.setSuccess(true);
+        }
+        return result;
+    }
 
 
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouAppInfo> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouAppInfo kuaiShouAppInfo = JSON.parseObject(deString, KuaiShouAppInfo.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAppInfo, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouAppInfo> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouAppInfo kuaiShouAppInfo = JSON.parseObject(deString, KuaiShouAppInfo.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAppInfo, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
 
 
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouAppInfo> pageList = kuaiShouAppInfoService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "广告组-app信息列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouAppInfo.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("广告组-app信息列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouAppInfo> pageList = kuaiShouAppInfoService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "广告组-app信息列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouAppInfo.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("广告组-app信息列表数据", "导出人: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<KuaiShouAppInfo> listKuaiShouAppInfos = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouAppInfo.class, params);
-              kuaiShouAppInfoService.saveBatch(listKuaiShouAppInfos);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouAppInfos.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("文件导入失败!");
-  }
+    /**
+     * 通过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<KuaiShouAppInfo> listKuaiShouAppInfos = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouAppInfo.class, params);
+                kuaiShouAppInfoService.saveBatch(listKuaiShouAppInfos);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouAppInfos.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("文件导入失败!");
+    }
 
 
 }
 }

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAppListController.java

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

+ 161 - 155
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignController.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.kuaishou.controller;
 package org.jeecg.modules.kuaishou.controller;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaign;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCampaignService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,8 +13,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.kuaishou.entity.KuaiShouCampaign;
-import org.jeecg.modules.kuaishou.service.IKuaiShouCampaignService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -33,10 +33,10 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
- /**
-  * @Description: 快手-获取广告计划信息
+/**
+ * @Description: 快手-获取广告计划信息
  * @Author: jeecg-boot
  * @Author: jeecg-boot
-  * @Date: 2019-07-23
+ * @Date: 2019-07-23
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 @Slf4j
 @Slf4j
@@ -44,20 +44,21 @@ import java.util.Map;
 @RestController
 @RestController
 @RequestMapping("/kuaishou/kuaiShouCampaign")
 @RequestMapping("/kuaishou/kuaiShouCampaign")
 public class KuaiShouCampaignController {
 public class KuaiShouCampaignController {
-	@Autowired
+    @Autowired
     private IKuaiShouCampaignService kuaiShouCampaignService;
     private IKuaiShouCampaignService kuaiShouCampaignService;
-	
-	/**
-	  * 分页列表查询
+
+    /**
+     * 分页列表查询
+     *
      * @param kuaiShouCampaign
      * @param kuaiShouCampaign
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
     @AutoLog(value = "快手-获取广告计划信息-分页列表查询")
     @AutoLog(value = "快手-获取广告计划信息-分页列表查询")
     @ApiOperation(value = "快手-获取广告计划信息-分页列表查询", notes = "快手-获取广告计划信息-分页列表查询")
     @ApiOperation(value = "快手-获取广告计划信息-分页列表查询", notes = "快手-获取广告计划信息-分页列表查询")
-	@GetMapping(value = "/list")
+    @GetMapping(value = "/list")
     public Result<IPage<KuaiShouCampaign>> queryPageList(KuaiShouCampaign kuaiShouCampaign,
     public Result<IPage<KuaiShouCampaign>> queryPageList(KuaiShouCampaign kuaiShouCampaign,
                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -66,177 +67,182 @@ public class KuaiShouCampaignController {
         QueryWrapper<KuaiShouCampaign> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaign, req.getParameterMap());
         QueryWrapper<KuaiShouCampaign> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaign, req.getParameterMap());
         Page<KuaiShouCampaign> page = new Page<KuaiShouCampaign>(pageNo, pageSize);
         Page<KuaiShouCampaign> page = new Page<KuaiShouCampaign>(pageNo, pageSize);
         IPage<KuaiShouCampaign> pageList = kuaiShouCampaignService.page(page, queryWrapper);
         IPage<KuaiShouCampaign> pageList = kuaiShouCampaignService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
      * @param kuaiShouCampaign
      * @param kuaiShouCampaign
-	 * @return
-	 */
+     * @return
+     */
     @AutoLog(value = "快手-获取广告计划信息-添加")
     @AutoLog(value = "快手-获取广告计划信息-添加")
     @ApiOperation(value = "快手-获取广告计划信息-添加", notes = "快手-获取广告计划信息-添加")
     @ApiOperation(value = "快手-获取广告计划信息-添加", notes = "快手-获取广告计划信息-添加")
-	@PostMapping(value = "/add")
+    @PostMapping(value = "/add")
     public Result<KuaiShouCampaign> add(@RequestBody KuaiShouCampaign kuaiShouCampaign) {
     public Result<KuaiShouCampaign> add(@RequestBody KuaiShouCampaign kuaiShouCampaign) {
         Result<KuaiShouCampaign> result = new Result<KuaiShouCampaign>();
         Result<KuaiShouCampaign> result = new Result<KuaiShouCampaign>();
-		try {
+        try {
             kuaiShouCampaignService.save(kuaiShouCampaign);
             kuaiShouCampaignService.save(kuaiShouCampaign);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
      * @param kuaiShouCampaign
      * @param kuaiShouCampaign
-	 * @return
-	 */
+     * @return
+     */
     @AutoLog(value = "快手-获取广告计划信息-编辑")
     @AutoLog(value = "快手-获取广告计划信息-编辑")
     @ApiOperation(value = "快手-获取广告计划信息-编辑", notes = "快手-获取广告计划信息-编辑")
     @ApiOperation(value = "快手-获取广告计划信息-编辑", notes = "快手-获取广告计划信息-编辑")
-	@PutMapping(value = "/edit")
+    @PutMapping(value = "/edit")
     public Result<KuaiShouCampaign> edit(@RequestBody KuaiShouCampaign kuaiShouCampaign) {
     public Result<KuaiShouCampaign> edit(@RequestBody KuaiShouCampaign kuaiShouCampaign) {
         Result<KuaiShouCampaign> result = new Result<KuaiShouCampaign>();
         Result<KuaiShouCampaign> result = new Result<KuaiShouCampaign>();
         KuaiShouCampaign kuaiShouCampaignEntity = kuaiShouCampaignService.getById(kuaiShouCampaign.getId());
         KuaiShouCampaign kuaiShouCampaignEntity = kuaiShouCampaignService.getById(kuaiShouCampaign.getId());
         if (kuaiShouCampaignEntity == null) {
         if (kuaiShouCampaignEntity == null) {
-			result.error500("未找到对应实体");
-		}else {
+            result.error500("未找到对应实体");
+        } else {
             boolean ok = kuaiShouCampaignService.updateById(kuaiShouCampaign);
             boolean ok = kuaiShouCampaignService.updateById(kuaiShouCampaign);
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
+            //TODO 返回false说明什么?
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
     @AutoLog(value = "快手-获取广告计划信息-通过id删除")
     @AutoLog(value = "快手-获取广告计划信息-通过id删除")
     @ApiOperation(value = "快手-获取广告计划信息-通过id删除", notes = "快手-获取广告计划信息-通过id删除")
     @ApiOperation(value = "快手-获取广告计划信息-通过id删除", notes = "快手-获取广告计划信息-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
             kuaiShouCampaignService.removeById(id);
             kuaiShouCampaignService.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
     @AutoLog(value = "快手-获取广告计划信息-批量删除")
     @AutoLog(value = "快手-获取广告计划信息-批量删除")
     @ApiOperation(value = "快手-获取广告计划信息-批量删除", notes = "快手-获取广告计划信息-批量删除")
     @ApiOperation(value = "快手-获取广告计划信息-批量删除", notes = "快手-获取广告计划信息-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
     public Result<KuaiShouCampaign> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
     public Result<KuaiShouCampaign> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         Result<KuaiShouCampaign> result = new Result<KuaiShouCampaign>();
         Result<KuaiShouCampaign> result = new Result<KuaiShouCampaign>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
             this.kuaiShouCampaignService.removeByIds(Arrays.asList(ids.split(",")));
             this.kuaiShouCampaignService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
     @AutoLog(value = "快手-获取广告计划信息-通过id查询")
     @AutoLog(value = "快手-获取广告计划信息-通过id查询")
     @ApiOperation(value = "快手-获取广告计划信息-通过id查询", notes = "快手-获取广告计划信息-通过id查询")
     @ApiOperation(value = "快手-获取广告计划信息-通过id查询", notes = "快手-获取广告计划信息-通过id查询")
-	@GetMapping(value = "/queryById")
+    @GetMapping(value = "/queryById")
     public Result<KuaiShouCampaign> queryById(@RequestParam(name = "id", required = true) String id) {
     public Result<KuaiShouCampaign> queryById(@RequestParam(name = "id", required = true) String id) {
         Result<KuaiShouCampaign> result = new Result<KuaiShouCampaign>();
         Result<KuaiShouCampaign> result = new Result<KuaiShouCampaign>();
         KuaiShouCampaign kuaiShouCampaign = kuaiShouCampaignService.getById(id);
         KuaiShouCampaign kuaiShouCampaign = kuaiShouCampaignService.getById(id);
         if (kuaiShouCampaign == null) {
         if (kuaiShouCampaign == null) {
-			result.error500("未找到对应实体");
-		}else {
+            result.error500("未找到对应实体");
+        } else {
             result.setResult(kuaiShouCampaign);
             result.setResult(kuaiShouCampaign);
-			result.setSuccess(true);
-		}
-		return result;
-	}
+            result.setSuccess(true);
+        }
+        return result;
+    }
 
 
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouCampaign> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouCampaign kuaiShouCampaign = JSON.parseObject(deString, KuaiShouCampaign.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaign, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouCampaign> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouCampaign kuaiShouCampaign = JSON.parseObject(deString, KuaiShouCampaign.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaign, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
 
 
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouCampaign> pageList = kuaiShouCampaignService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "快手-获取广告计划信息列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouCampaign.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("快手-获取广告计划信息列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouCampaign> pageList = kuaiShouCampaignService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-获取广告计划信息列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouCampaign.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<KuaiShouCampaign> listKuaiShouCampaigns = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouCampaign.class, params);
-              kuaiShouCampaignService.saveBatch(listKuaiShouCampaigns);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouCampaigns.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("文件导入失败!");
-  }
+    /**
+     * 通过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<KuaiShouCampaign> listKuaiShouCampaigns = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouCampaign.class, params);
+                kuaiShouCampaignService.saveBatch(listKuaiShouCampaigns);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouCampaigns.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("文件导入失败!");
+    }
 
 
 }
 }

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignCreateController.java

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

+ 218 - 214
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignDayBudgetController.java

@@ -1,244 +1,248 @@
 package org.jeecg.modules.kuaishou.controller;
 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 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.kuaishou.entity.KuaiShouCampaignDayBudget;
-import org.jeecg.modules.kuaishou.service.IKuaiShouCampaignDayBudgetService;
-import java.util.Date;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignDayBudget;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCampaignDayBudgetService;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 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: 快手-修改广告计划记录表
  * @Description: 快手-修改广告计划记录表
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-09-11
+ * @Date: 2019-09-11
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 @Slf4j
 @Slf4j
-@Api(tags="快手-修改广告计划记录表")
+@Api(tags = "快手-修改广告计划记录表")
 @RestController
 @RestController
 @RequestMapping("/kuaishou/kuaiShouCampaignDayBudget")
 @RequestMapping("/kuaishou/kuaiShouCampaignDayBudget")
 public class KuaiShouCampaignDayBudgetController {
 public class KuaiShouCampaignDayBudgetController {
-	@Autowired
-	private IKuaiShouCampaignDayBudgetService kuaiShouCampaignDayBudgetService;
-	
-	/**
-	  * 分页列表查询
-	 * @param kuaiShouCampaignDayBudget
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "快手-修改广告计划记录表-分页列表查询")
-	@ApiOperation(value="快手-修改广告计划记录表-分页列表查询", notes="快手-修改广告计划记录表-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouCampaignDayBudget>> queryPageList(KuaiShouCampaignDayBudget kuaiShouCampaignDayBudget,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouCampaignDayBudget>> result = new Result<IPage<KuaiShouCampaignDayBudget>>();
-		QueryWrapper<KuaiShouCampaignDayBudget> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaignDayBudget, req.getParameterMap());
-		Page<KuaiShouCampaignDayBudget> page = new Page<KuaiShouCampaignDayBudget>(pageNo, pageSize);
-		IPage<KuaiShouCampaignDayBudget> pageList = kuaiShouCampaignDayBudgetService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param kuaiShouCampaignDayBudget
-	 * @return
-	 */
-	@AutoLog(value = "快手-修改广告计划记录表-添加")
-	@ApiOperation(value="快手-修改广告计划记录表-添加", notes="快手-修改广告计划记录表-添加")
-	@PostMapping(value = "/add")
-	public Result<KuaiShouCampaignDayBudget> add(@RequestBody KuaiShouCampaignDayBudget kuaiShouCampaignDayBudget) {
-		Result<KuaiShouCampaignDayBudget> result = new Result<KuaiShouCampaignDayBudget>();
-		try {
-			kuaiShouCampaignDayBudgetService.save(kuaiShouCampaignDayBudget);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param kuaiShouCampaignDayBudget
-	 * @return
-	 */
-	@AutoLog(value = "快手-修改广告计划记录表-编辑")
-	@ApiOperation(value="快手-修改广告计划记录表-编辑", notes="快手-修改广告计划记录表-编辑")
-	@PutMapping(value = "/edit")
-	public Result<KuaiShouCampaignDayBudget> edit(@RequestBody KuaiShouCampaignDayBudget kuaiShouCampaignDayBudget) {
-		Result<KuaiShouCampaignDayBudget> result = new Result<KuaiShouCampaignDayBudget>();
-		KuaiShouCampaignDayBudget kuaiShouCampaignDayBudgetEntity = kuaiShouCampaignDayBudgetService.getById(kuaiShouCampaignDayBudget.getId());
-		if(kuaiShouCampaignDayBudgetEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = kuaiShouCampaignDayBudgetService.updateById(kuaiShouCampaignDayBudget);
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "快手-修改广告计划记录表-通过id删除")
-	@ApiOperation(value="快手-修改广告计划记录表-通过id删除", notes="快手-修改广告计划记录表-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
-			kuaiShouCampaignDayBudgetService.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<KuaiShouCampaignDayBudget> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouCampaignDayBudget> result = new Result<KuaiShouCampaignDayBudget>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.kuaiShouCampaignDayBudgetService.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<KuaiShouCampaignDayBudget> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouCampaignDayBudget> result = new Result<KuaiShouCampaignDayBudget>();
-		KuaiShouCampaignDayBudget kuaiShouCampaignDayBudget = kuaiShouCampaignDayBudgetService.getById(id);
-		if(kuaiShouCampaignDayBudget==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(kuaiShouCampaignDayBudget);
-			result.setSuccess(true);
-		}
-		return result;
-	}
+    @Autowired
+    private IKuaiShouCampaignDayBudgetService kuaiShouCampaignDayBudgetService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param kuaiShouCampaignDayBudget
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "快手-修改广告计划记录表-分页列表查询")
+    @ApiOperation(value = "快手-修改广告计划记录表-分页列表查询", notes = "快手-修改广告计划记录表-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<KuaiShouCampaignDayBudget>> queryPageList(KuaiShouCampaignDayBudget kuaiShouCampaignDayBudget,
+                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                  HttpServletRequest req) {
+        Result<IPage<KuaiShouCampaignDayBudget>> result = new Result<IPage<KuaiShouCampaignDayBudget>>();
+        QueryWrapper<KuaiShouCampaignDayBudget> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaignDayBudget, req.getParameterMap());
+        Page<KuaiShouCampaignDayBudget> page = new Page<KuaiShouCampaignDayBudget>(pageNo, pageSize);
+        IPage<KuaiShouCampaignDayBudget> pageList = kuaiShouCampaignDayBudgetService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param kuaiShouCampaignDayBudget
+     * @return
+     */
+    @AutoLog(value = "快手-修改广告计划记录表-添加")
+    @ApiOperation(value = "快手-修改广告计划记录表-添加", notes = "快手-修改广告计划记录表-添加")
+    @PostMapping(value = "/add")
+    public Result<KuaiShouCampaignDayBudget> add(@RequestBody KuaiShouCampaignDayBudget kuaiShouCampaignDayBudget) {
+        Result<KuaiShouCampaignDayBudget> result = new Result<KuaiShouCampaignDayBudget>();
+        try {
+            kuaiShouCampaignDayBudgetService.save(kuaiShouCampaignDayBudget);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param kuaiShouCampaignDayBudget
+     * @return
+     */
+    @AutoLog(value = "快手-修改广告计划记录表-编辑")
+    @ApiOperation(value = "快手-修改广告计划记录表-编辑", notes = "快手-修改广告计划记录表-编辑")
+    @PutMapping(value = "/edit")
+    public Result<KuaiShouCampaignDayBudget> edit(@RequestBody KuaiShouCampaignDayBudget kuaiShouCampaignDayBudget) {
+        Result<KuaiShouCampaignDayBudget> result = new Result<KuaiShouCampaignDayBudget>();
+        KuaiShouCampaignDayBudget kuaiShouCampaignDayBudgetEntity = kuaiShouCampaignDayBudgetService.getById(kuaiShouCampaignDayBudget.getId());
+        if (kuaiShouCampaignDayBudgetEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = kuaiShouCampaignDayBudgetService.updateById(kuaiShouCampaignDayBudget);
+            //TODO 返回false说明什么?
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "快手-修改广告计划记录表-通过id删除")
+    @ApiOperation(value = "快手-修改广告计划记录表-通过id删除", notes = "快手-修改广告计划记录表-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            kuaiShouCampaignDayBudgetService.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<KuaiShouCampaignDayBudget> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouCampaignDayBudget> result = new Result<KuaiShouCampaignDayBudget>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.kuaiShouCampaignDayBudgetService.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<KuaiShouCampaignDayBudget> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouCampaignDayBudget> result = new Result<KuaiShouCampaignDayBudget>();
+        KuaiShouCampaignDayBudget kuaiShouCampaignDayBudget = kuaiShouCampaignDayBudgetService.getById(id);
+        if (kuaiShouCampaignDayBudget == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouCampaignDayBudget);
+            result.setSuccess(true);
+        }
+        return result;
+    }
 
 
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouCampaignDayBudget> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouCampaignDayBudget kuaiShouCampaignDayBudget = JSON.parseObject(deString, KuaiShouCampaignDayBudget.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaignDayBudget, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouCampaignDayBudget> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouCampaignDayBudget kuaiShouCampaignDayBudget = JSON.parseObject(deString, KuaiShouCampaignDayBudget.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaignDayBudget, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
 
 
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouCampaignDayBudget> pageList = kuaiShouCampaignDayBudgetService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "快手-修改广告计划记录表列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouCampaignDayBudget.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("快手-修改广告计划记录表列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouCampaignDayBudget> pageList = kuaiShouCampaignDayBudgetService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-修改广告计划记录表列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouCampaignDayBudget.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<KuaiShouCampaignDayBudget> listKuaiShouCampaignDayBudgets = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouCampaignDayBudget.class, params);
-              kuaiShouCampaignDayBudgetService.saveBatch(listKuaiShouCampaignDayBudgets);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouCampaignDayBudgets.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("文件导入失败!");
-  }
+    /**
+     * 通过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<KuaiShouCampaignDayBudget> listKuaiShouCampaignDayBudgets = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouCampaignDayBudget.class, params);
+                kuaiShouCampaignDayBudgetService.saveBatch(listKuaiShouCampaignDayBudgets);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouCampaignDayBudgets.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("文件导入失败!");
+    }
 
 
 }
 }

+ 218 - 214
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignStatusController.java

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

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignTemplateController.java

@@ -1,6 +1,9 @@
 package org.jeecg.modules.kuaishou.controller;
 package org.jeecg.modules.kuaishou.controller;
 
 
 import cn.com.ctop.common.utils.Check;
 import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignTemplate;
+import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouCampaignTemplateMapper;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCampaignTemplateService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,9 +17,6 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.kuaishou.entity.KuaiShouCampaignTemplate;
-import org.jeecg.modules.kuaishou.mapper.KuaiShouCampaignTemplateMapper;
-import org.jeecg.modules.kuaishou.service.IKuaiShouCampaignTemplateService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;

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

@@ -1,14 +1,13 @@
 package org.jeecg.modules.kuaishou.controller;
 package org.jeecg.modules.kuaishou.controller;
 
 
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResult;
 import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResult;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyCampaign;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyCampaign;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
-
 import org.jeecg.modules.ctop.entity.CtopOauthToken;
 import org.jeecg.modules.ctop.entity.CtopOauthToken;
 import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
 import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
 import org.jeecg.modules.ctop.service.IRefreshTokenService;
 import org.jeecg.modules.ctop.service.IRefreshTokenService;
-import org.jeecg.modules.kuaishou.service.IKuaishouInterfaceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;

+ 161 - 155
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouConversionInfosController.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.kuaishou.controller;
 package org.jeecg.modules.kuaishou.controller;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouConversionInfos;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouConversionInfosService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,8 +13,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.kuaishou.entity.KuaiShouConversionInfos;
-import org.jeecg.modules.kuaishou.service.IKuaiShouConversionInfosService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -33,10 +33,10 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
- /**
-  * @Description: 快手-可选深度转化类型
+/**
+ * @Description: 快手-可选深度转化类型
  * @Author: jeecg-boot
  * @Author: jeecg-boot
-  * @Date: 2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 @Slf4j
 @Slf4j
@@ -44,20 +44,21 @@ import java.util.Map;
 @RestController
 @RestController
 @RequestMapping("/kuaishou/kuaiShouConversionInfos")
 @RequestMapping("/kuaishou/kuaiShouConversionInfos")
 public class KuaiShouConversionInfosController {
 public class KuaiShouConversionInfosController {
-	@Autowired
+    @Autowired
     private IKuaiShouConversionInfosService kuaiShouConversionInfosService;
     private IKuaiShouConversionInfosService kuaiShouConversionInfosService;
-	
-	/**
-	  * 分页列表查询
+
+    /**
+     * 分页列表查询
+     *
      * @param kuaiShouConversionInfos
      * @param kuaiShouConversionInfos
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
     @AutoLog(value = "快手-可选深度转化类型-分页列表查询")
     @AutoLog(value = "快手-可选深度转化类型-分页列表查询")
     @ApiOperation(value = "快手-可选深度转化类型-分页列表查询", notes = "快手-可选深度转化类型-分页列表查询")
     @ApiOperation(value = "快手-可选深度转化类型-分页列表查询", notes = "快手-可选深度转化类型-分页列表查询")
-	@GetMapping(value = "/list")
+    @GetMapping(value = "/list")
     public Result<IPage<KuaiShouConversionInfos>> queryPageList(KuaiShouConversionInfos kuaiShouConversionInfos,
     public Result<IPage<KuaiShouConversionInfos>> queryPageList(KuaiShouConversionInfos kuaiShouConversionInfos,
                                                                 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -66,177 +67,182 @@ public class KuaiShouConversionInfosController {
         QueryWrapper<KuaiShouConversionInfos> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouConversionInfos, req.getParameterMap());
         QueryWrapper<KuaiShouConversionInfos> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouConversionInfos, req.getParameterMap());
         Page<KuaiShouConversionInfos> page = new Page<KuaiShouConversionInfos>(pageNo, pageSize);
         Page<KuaiShouConversionInfos> page = new Page<KuaiShouConversionInfos>(pageNo, pageSize);
         IPage<KuaiShouConversionInfos> pageList = kuaiShouConversionInfosService.page(page, queryWrapper);
         IPage<KuaiShouConversionInfos> pageList = kuaiShouConversionInfosService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
      * @param kuaiShouConversionInfos
      * @param kuaiShouConversionInfos
-	 * @return
-	 */
+     * @return
+     */
     @AutoLog(value = "快手-可选深度转化类型-添加")
     @AutoLog(value = "快手-可选深度转化类型-添加")
     @ApiOperation(value = "快手-可选深度转化类型-添加", notes = "快手-可选深度转化类型-添加")
     @ApiOperation(value = "快手-可选深度转化类型-添加", notes = "快手-可选深度转化类型-添加")
-	@PostMapping(value = "/add")
+    @PostMapping(value = "/add")
     public Result<KuaiShouConversionInfos> add(@RequestBody KuaiShouConversionInfos kuaiShouConversionInfos) {
     public Result<KuaiShouConversionInfos> add(@RequestBody KuaiShouConversionInfos kuaiShouConversionInfos) {
         Result<KuaiShouConversionInfos> result = new Result<KuaiShouConversionInfos>();
         Result<KuaiShouConversionInfos> result = new Result<KuaiShouConversionInfos>();
-		try {
+        try {
             kuaiShouConversionInfosService.save(kuaiShouConversionInfos);
             kuaiShouConversionInfosService.save(kuaiShouConversionInfos);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
      * @param kuaiShouConversionInfos
      * @param kuaiShouConversionInfos
-	 * @return
-	 */
+     * @return
+     */
     @AutoLog(value = "快手-可选深度转化类型-编辑")
     @AutoLog(value = "快手-可选深度转化类型-编辑")
     @ApiOperation(value = "快手-可选深度转化类型-编辑", notes = "快手-可选深度转化类型-编辑")
     @ApiOperation(value = "快手-可选深度转化类型-编辑", notes = "快手-可选深度转化类型-编辑")
-	@PutMapping(value = "/edit")
+    @PutMapping(value = "/edit")
     public Result<KuaiShouConversionInfos> edit(@RequestBody KuaiShouConversionInfos kuaiShouConversionInfos) {
     public Result<KuaiShouConversionInfos> edit(@RequestBody KuaiShouConversionInfos kuaiShouConversionInfos) {
         Result<KuaiShouConversionInfos> result = new Result<KuaiShouConversionInfos>();
         Result<KuaiShouConversionInfos> result = new Result<KuaiShouConversionInfos>();
         KuaiShouConversionInfos kuaiShouConversionInfosEntity = kuaiShouConversionInfosService.getById(kuaiShouConversionInfos.getId());
         KuaiShouConversionInfos kuaiShouConversionInfosEntity = kuaiShouConversionInfosService.getById(kuaiShouConversionInfos.getId());
         if (kuaiShouConversionInfosEntity == null) {
         if (kuaiShouConversionInfosEntity == null) {
-			result.error500("未找到对应实体");
-		}else {
+            result.error500("未找到对应实体");
+        } else {
             boolean ok = kuaiShouConversionInfosService.updateById(kuaiShouConversionInfos);
             boolean ok = kuaiShouConversionInfosService.updateById(kuaiShouConversionInfos);
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
+            //TODO 返回false说明什么?
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
     @AutoLog(value = "快手-可选深度转化类型-通过id删除")
     @AutoLog(value = "快手-可选深度转化类型-通过id删除")
     @ApiOperation(value = "快手-可选深度转化类型-通过id删除", notes = "快手-可选深度转化类型-通过id删除")
     @ApiOperation(value = "快手-可选深度转化类型-通过id删除", notes = "快手-可选深度转化类型-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
             kuaiShouConversionInfosService.removeById(id);
             kuaiShouConversionInfosService.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
     @AutoLog(value = "快手-可选深度转化类型-批量删除")
     @AutoLog(value = "快手-可选深度转化类型-批量删除")
     @ApiOperation(value = "快手-可选深度转化类型-批量删除", notes = "快手-可选深度转化类型-批量删除")
     @ApiOperation(value = "快手-可选深度转化类型-批量删除", notes = "快手-可选深度转化类型-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
     public Result<KuaiShouConversionInfos> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
     public Result<KuaiShouConversionInfos> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         Result<KuaiShouConversionInfos> result = new Result<KuaiShouConversionInfos>();
         Result<KuaiShouConversionInfos> result = new Result<KuaiShouConversionInfos>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
             this.kuaiShouConversionInfosService.removeByIds(Arrays.asList(ids.split(",")));
             this.kuaiShouConversionInfosService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
     @AutoLog(value = "快手-可选深度转化类型-通过id查询")
     @AutoLog(value = "快手-可选深度转化类型-通过id查询")
     @ApiOperation(value = "快手-可选深度转化类型-通过id查询", notes = "快手-可选深度转化类型-通过id查询")
     @ApiOperation(value = "快手-可选深度转化类型-通过id查询", notes = "快手-可选深度转化类型-通过id查询")
-	@GetMapping(value = "/queryById")
+    @GetMapping(value = "/queryById")
     public Result<KuaiShouConversionInfos> queryById(@RequestParam(name = "id", required = true) String id) {
     public Result<KuaiShouConversionInfos> queryById(@RequestParam(name = "id", required = true) String id) {
         Result<KuaiShouConversionInfos> result = new Result<KuaiShouConversionInfos>();
         Result<KuaiShouConversionInfos> result = new Result<KuaiShouConversionInfos>();
         KuaiShouConversionInfos kuaiShouConversionInfos = kuaiShouConversionInfosService.getById(id);
         KuaiShouConversionInfos kuaiShouConversionInfos = kuaiShouConversionInfosService.getById(id);
         if (kuaiShouConversionInfos == null) {
         if (kuaiShouConversionInfos == null) {
-			result.error500("未找到对应实体");
-		}else {
+            result.error500("未找到对应实体");
+        } else {
             result.setResult(kuaiShouConversionInfos);
             result.setResult(kuaiShouConversionInfos);
-			result.setSuccess(true);
-		}
-		return result;
-	}
+            result.setSuccess(true);
+        }
+        return result;
+    }
 
 
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouConversionInfos> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouConversionInfos kuaiShouConversionInfos = JSON.parseObject(deString, KuaiShouConversionInfos.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouConversionInfos, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouConversionInfos> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouConversionInfos kuaiShouConversionInfos = JSON.parseObject(deString, KuaiShouConversionInfos.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouConversionInfos, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
 
 
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouConversionInfos> pageList = kuaiShouConversionInfosService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "快手-可选深度转化类型列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouConversionInfos.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("快手-可选深度转化类型列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouConversionInfos> pageList = kuaiShouConversionInfosService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-可选深度转化类型列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouConversionInfos.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<KuaiShouConversionInfos> listKuaiShouConversionInfoss = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouConversionInfos.class, params);
-              kuaiShouConversionInfosService.saveBatch(listKuaiShouConversionInfoss);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouConversionInfoss.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("文件导入失败!");
-  }
+    /**
+     * 通过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<KuaiShouConversionInfos> listKuaiShouConversionInfoss = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouConversionInfos.class, params);
+                kuaiShouConversionInfosService.saveBatch(listKuaiShouConversionInfoss);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouConversionInfoss.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
 
 
 }
 }

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

@@ -1,6 +1,9 @@
 package org.jeecg.modules.kuaishou.controller;
 package org.jeecg.modules.kuaishou.controller;
 
 
 import cn.com.ctop.common.utils.Check;
 import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouConversionTypes;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouConversionTypesService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,15 +11,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import module.entity.CtopOauthToken;
+import module.service.ICtopOauthTokenService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.CtopOauthToken;
-import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
-import org.jeecg.modules.kuaishou.entity.KuaiShouConversionTypes;
-import org.jeecg.modules.kuaishou.service.IKuaiShouConversionTypesService;
-import org.jeecg.modules.kuaishou.service.IKuaishouInterfaceService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreateAppTemplateController.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.kuaishou.controller;
 package org.jeecg.modules.kuaishou.controller;
 
 
 import cn.com.ctop.common.utils.Check;
 import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreateAppTemplate;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreateAppTemplateService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,8 +16,6 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.kuaishou.entity.KuaiShouCreateAppTemplate;
-import org.jeecg.modules.kuaishou.service.IKuaiShouCreateAppTemplateService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreateController.java

@@ -1,10 +1,10 @@
 package org.jeecg.modules.kuaishou.controller;
 package org.jeecg.modules.kuaishou.controller;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateLog;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreateService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.kuaishou.entity.KuaiShouGroupCreateLog;
-import org.jeecg.modules.kuaishou.service.IKuaiShouCreateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreativeController.java

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

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreativeCreateController.java

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

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

@@ -1,5 +1,7 @@
 package org.jeecg.modules.kuaishou.controller;
 package org.jeecg.modules.kuaishou.controller;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupBid;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupBidService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,8 +13,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.kuaishou.entity.KuaiShouGroupBid;
-import org.jeecg.modules.kuaishou.service.IKuaiShouGroupBidService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -33,210 +33,216 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
- /**
+/**
  * @Description: 快手修改广告组出价
  * @Description: 快手修改广告组出价
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-09-11
+ * @Date: 2019-09-11
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 @Slf4j
 @Slf4j
-@Api(tags="快手修改广告组出价")
+@Api(tags = "快手修改广告组出价")
 @RestController
 @RestController
 @RequestMapping("/kuaishou/kuaiShouGroupBid")
 @RequestMapping("/kuaishou/kuaiShouGroupBid")
 public class KuaiShouGroupBidController {
 public class KuaiShouGroupBidController {
-	@Autowired
-	private IKuaiShouGroupBidService kuaiShouGroupBidService;
+    @Autowired
+    private IKuaiShouGroupBidService kuaiShouGroupBidService;
 
 
-     /**
-	  * 分页列表查询
-	 * @param kuaiShouGroupBid
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "快手修改广告组出价-分页列表查询")
-	@ApiOperation(value="快手修改广告组出价-分页列表查询", notes="快手修改广告组出价-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouGroupBid>> queryPageList(KuaiShouGroupBid kuaiShouGroupBid,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouGroupBid>> result = new Result<IPage<KuaiShouGroupBid>>();
-		QueryWrapper<KuaiShouGroupBid> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupBid, req.getParameterMap());
-		Page<KuaiShouGroupBid> page = new Page<KuaiShouGroupBid>(pageNo, pageSize);
-		IPage<KuaiShouGroupBid> pageList = kuaiShouGroupBidService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
+    /**
+     * 分页列表查询
+     *
+     * @param kuaiShouGroupBid
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "快手修改广告组出价-分页列表查询")
+    @ApiOperation(value = "快手修改广告组出价-分页列表查询", notes = "快手修改广告组出价-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<KuaiShouGroupBid>> queryPageList(KuaiShouGroupBid kuaiShouGroupBid,
+                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                         HttpServletRequest req) {
+        Result<IPage<KuaiShouGroupBid>> result = new Result<IPage<KuaiShouGroupBid>>();
+        QueryWrapper<KuaiShouGroupBid> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupBid, req.getParameterMap());
+        Page<KuaiShouGroupBid> page = new Page<KuaiShouGroupBid>(pageNo, pageSize);
+        IPage<KuaiShouGroupBid> pageList = kuaiShouGroupBidService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
 
 
-     /**
-	  *   添加
-	 * @param kuaiShouGroupBid
-	 * @return
-	 */
-	@AutoLog(value = "快手修改广告组出价-添加")
-	@ApiOperation(value="快手修改广告组出价-添加", notes="快手修改广告组出价-添加")
-	@PostMapping(value = "/add")
-	public Result<KuaiShouGroupBid> add(@RequestBody KuaiShouGroupBid kuaiShouGroupBid) {
-		Result<KuaiShouGroupBid> result = new Result<KuaiShouGroupBid>();
-		try {
-			kuaiShouGroupBidService.save(kuaiShouGroupBid);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
+    /**
+     * 添加
+     *
+     * @param kuaiShouGroupBid
+     * @return
+     */
+    @AutoLog(value = "快手修改广告组出价-添加")
+    @ApiOperation(value = "快手修改广告组出价-添加", notes = "快手修改广告组出价-添加")
+    @PostMapping(value = "/add")
+    public Result<KuaiShouGroupBid> add(@RequestBody KuaiShouGroupBid kuaiShouGroupBid) {
+        Result<KuaiShouGroupBid> result = new Result<KuaiShouGroupBid>();
+        try {
+            kuaiShouGroupBidService.save(kuaiShouGroupBid);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
 
 
-     /**
-	  *  编辑
-	 * @param kuaiShouGroupBid
-	 * @return
-	 */
-	@AutoLog(value = "快手修改广告组出价-编辑")
-	@ApiOperation(value="快手修改广告组出价-编辑", notes="快手修改广告组出价-编辑")
-	@PutMapping(value = "/edit")
-	public Result<KuaiShouGroupBid> edit(@RequestBody KuaiShouGroupBid kuaiShouGroupBid) {
-		Result<KuaiShouGroupBid> result = new Result<KuaiShouGroupBid>();
-		KuaiShouGroupBid kuaiShouGroupBidEntity = kuaiShouGroupBidService.getById(kuaiShouGroupBid.getId());
-		if(kuaiShouGroupBidEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = kuaiShouGroupBidService.updateById(kuaiShouGroupBid);
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
+    /**
+     * 编辑
+     *
+     * @param kuaiShouGroupBid
+     * @return
+     */
+    @AutoLog(value = "快手修改广告组出价-编辑")
+    @ApiOperation(value = "快手修改广告组出价-编辑", notes = "快手修改广告组出价-编辑")
+    @PutMapping(value = "/edit")
+    public Result<KuaiShouGroupBid> edit(@RequestBody KuaiShouGroupBid kuaiShouGroupBid) {
+        Result<KuaiShouGroupBid> result = new Result<KuaiShouGroupBid>();
+        KuaiShouGroupBid kuaiShouGroupBidEntity = kuaiShouGroupBidService.getById(kuaiShouGroupBid.getId());
+        if (kuaiShouGroupBidEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = kuaiShouGroupBidService.updateById(kuaiShouGroupBid);
+            //TODO 返回false说明什么?
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
 
 
         return result;
         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 {
-			kuaiShouGroupBidService.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
+    /**
+     * 通过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 {
+            kuaiShouGroupBidService.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<KuaiShouGroupBid> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouGroupBid> result = new Result<KuaiShouGroupBid>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.kuaiShouGroupBidService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "快手修改广告组出价-批量删除")
+    @ApiOperation(value = "快手修改广告组出价-批量删除", notes = "快手修改广告组出价-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<KuaiShouGroupBid> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouGroupBid> result = new Result<KuaiShouGroupBid>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.kuaiShouGroupBidService.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<KuaiShouGroupBid> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouGroupBid> result = new Result<KuaiShouGroupBid>();
-		KuaiShouGroupBid kuaiShouGroupBid = kuaiShouGroupBidService.getById(id);
-		if(kuaiShouGroupBid==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(kuaiShouGroupBid);
-			result.setSuccess(true);
-		}
-		return result;
-	}
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "快手修改广告组出价-通过id查询")
+    @ApiOperation(value = "快手修改广告组出价-通过id查询", notes = "快手修改广告组出价-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<KuaiShouGroupBid> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouGroupBid> result = new Result<KuaiShouGroupBid>();
+        KuaiShouGroupBid kuaiShouGroupBid = kuaiShouGroupBidService.getById(id);
+        if (kuaiShouGroupBid == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouGroupBid);
+            result.setSuccess(true);
+        }
+        return result;
+    }
 
 
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouGroupBid> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouGroupBid kuaiShouGroupBid = JSON.parseObject(deString, KuaiShouGroupBid.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupBid, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouGroupBid> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouGroupBid kuaiShouGroupBid = JSON.parseObject(deString, KuaiShouGroupBid.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupBid, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
 
 
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouGroupBid> pageList = kuaiShouGroupBidService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "快手修改广告组出价列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouGroupBid.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("快手修改广告组出价列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouGroupBid> pageList = kuaiShouGroupBidService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手修改广告组出价列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouGroupBid.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<KuaiShouGroupBid> listKuaiShouGroupBids = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouGroupBid.class, params);
-              kuaiShouGroupBidService.saveBatch(listKuaiShouGroupBids);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouGroupBids.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("文件导入失败!");
-  }
+    /**
+     * 通过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<KuaiShouGroupBid> listKuaiShouGroupBids = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouGroupBid.class, params);
+                kuaiShouGroupBidService.saveBatch(listKuaiShouGroupBids);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouGroupBids.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("文件导入失败!");
+    }
 
 
 }
 }

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupController.java

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

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupCreateLogController.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.kuaishou.controller;
 package org.jeecg.modules.kuaishou.controller;
 
 
 import cn.com.ctop.common.utils.Check;
 import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateLog;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupCreateLogService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,8 +16,6 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.kuaishou.entity.KuaiShouGroupCreateLog;
-import org.jeecg.modules.kuaishou.service.IKuaiShouGroupCreateLogService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;

+ 161 - 155
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupCreateTargetController.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.kuaishou.controller;
 package org.jeecg.modules.kuaishou.controller;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateTarget;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupCreateTargetService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,8 +13,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.kuaishou.entity.KuaiShouGroupCreateTarget;
-import org.jeecg.modules.kuaishou.service.IKuaiShouGroupCreateTargetService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -33,10 +33,10 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
- /**
-  * @Description: 快手-创建广告组定向信息
+/**
+ * @Description: 快手-创建广告组定向信息
  * @Author: jeecg-boot
  * @Author: jeecg-boot
-  * @Date: 2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 @Slf4j
 @Slf4j
@@ -44,20 +44,21 @@ import java.util.Map;
 @RestController
 @RestController
 @RequestMapping("/kuaishou/kuaiShouGroupCreateTarget")
 @RequestMapping("/kuaishou/kuaiShouGroupCreateTarget")
 public class KuaiShouGroupCreateTargetController {
 public class KuaiShouGroupCreateTargetController {
-	@Autowired
+    @Autowired
     private IKuaiShouGroupCreateTargetService kuaiShouGroupCreateTargetService;
     private IKuaiShouGroupCreateTargetService kuaiShouGroupCreateTargetService;
-	
-	/**
-	  * 分页列表查询
+
+    /**
+     * 分页列表查询
+     *
      * @param kuaiShouGroupCreateTarget
      * @param kuaiShouGroupCreateTarget
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
     @AutoLog(value = "快手-创建广告组定向信息-分页列表查询")
     @AutoLog(value = "快手-创建广告组定向信息-分页列表查询")
     @ApiOperation(value = "快手-创建广告组定向信息-分页列表查询", notes = "快手-创建广告组定向信息-分页列表查询")
     @ApiOperation(value = "快手-创建广告组定向信息-分页列表查询", notes = "快手-创建广告组定向信息-分页列表查询")
-	@GetMapping(value = "/list")
+    @GetMapping(value = "/list")
     public Result<IPage<KuaiShouGroupCreateTarget>> queryPageList(KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget,
     public Result<IPage<KuaiShouGroupCreateTarget>> queryPageList(KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget,
                                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -66,177 +67,182 @@ public class KuaiShouGroupCreateTargetController {
         QueryWrapper<KuaiShouGroupCreateTarget> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupCreateTarget, req.getParameterMap());
         QueryWrapper<KuaiShouGroupCreateTarget> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupCreateTarget, req.getParameterMap());
         Page<KuaiShouGroupCreateTarget> page = new Page<KuaiShouGroupCreateTarget>(pageNo, pageSize);
         Page<KuaiShouGroupCreateTarget> page = new Page<KuaiShouGroupCreateTarget>(pageNo, pageSize);
         IPage<KuaiShouGroupCreateTarget> pageList = kuaiShouGroupCreateTargetService.page(page, queryWrapper);
         IPage<KuaiShouGroupCreateTarget> pageList = kuaiShouGroupCreateTargetService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
      * @param kuaiShouGroupCreateTarget
      * @param kuaiShouGroupCreateTarget
-	 * @return
-	 */
+     * @return
+     */
     @AutoLog(value = "快手-创建广告组定向信息-添加")
     @AutoLog(value = "快手-创建广告组定向信息-添加")
     @ApiOperation(value = "快手-创建广告组定向信息-添加", notes = "快手-创建广告组定向信息-添加")
     @ApiOperation(value = "快手-创建广告组定向信息-添加", notes = "快手-创建广告组定向信息-添加")
-	@PostMapping(value = "/add")
+    @PostMapping(value = "/add")
     public Result<KuaiShouGroupCreateTarget> add(@RequestBody KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget) {
     public Result<KuaiShouGroupCreateTarget> add(@RequestBody KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget) {
         Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
         Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
-		try {
+        try {
             kuaiShouGroupCreateTargetService.save(kuaiShouGroupCreateTarget);
             kuaiShouGroupCreateTargetService.save(kuaiShouGroupCreateTarget);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
      * @param kuaiShouGroupCreateTarget
      * @param kuaiShouGroupCreateTarget
-	 * @return
-	 */
+     * @return
+     */
     @AutoLog(value = "快手-创建广告组定向信息-编辑")
     @AutoLog(value = "快手-创建广告组定向信息-编辑")
     @ApiOperation(value = "快手-创建广告组定向信息-编辑", notes = "快手-创建广告组定向信息-编辑")
     @ApiOperation(value = "快手-创建广告组定向信息-编辑", notes = "快手-创建广告组定向信息-编辑")
-	@PutMapping(value = "/edit")
+    @PutMapping(value = "/edit")
     public Result<KuaiShouGroupCreateTarget> edit(@RequestBody KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget) {
     public Result<KuaiShouGroupCreateTarget> edit(@RequestBody KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget) {
         Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
         Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
         KuaiShouGroupCreateTarget kuaiShouGroupCreateTargetEntity = kuaiShouGroupCreateTargetService.getById(kuaiShouGroupCreateTarget.getId());
         KuaiShouGroupCreateTarget kuaiShouGroupCreateTargetEntity = kuaiShouGroupCreateTargetService.getById(kuaiShouGroupCreateTarget.getId());
         if (kuaiShouGroupCreateTargetEntity == null) {
         if (kuaiShouGroupCreateTargetEntity == null) {
-			result.error500("未找到对应实体");
-		}else {
+            result.error500("未找到对应实体");
+        } else {
             boolean ok = kuaiShouGroupCreateTargetService.updateById(kuaiShouGroupCreateTarget);
             boolean ok = kuaiShouGroupCreateTargetService.updateById(kuaiShouGroupCreateTarget);
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
+            //TODO 返回false说明什么?
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
     @AutoLog(value = "快手-创建广告组定向信息-通过id删除")
     @AutoLog(value = "快手-创建广告组定向信息-通过id删除")
     @ApiOperation(value = "快手-创建广告组定向信息-通过id删除", notes = "快手-创建广告组定向信息-通过id删除")
     @ApiOperation(value = "快手-创建广告组定向信息-通过id删除", notes = "快手-创建广告组定向信息-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
             kuaiShouGroupCreateTargetService.removeById(id);
             kuaiShouGroupCreateTargetService.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
     @AutoLog(value = "快手-创建广告组定向信息-批量删除")
     @AutoLog(value = "快手-创建广告组定向信息-批量删除")
     @ApiOperation(value = "快手-创建广告组定向信息-批量删除", notes = "快手-创建广告组定向信息-批量删除")
     @ApiOperation(value = "快手-创建广告组定向信息-批量删除", notes = "快手-创建广告组定向信息-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
     public Result<KuaiShouGroupCreateTarget> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
     public Result<KuaiShouGroupCreateTarget> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
         Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
             this.kuaiShouGroupCreateTargetService.removeByIds(Arrays.asList(ids.split(",")));
             this.kuaiShouGroupCreateTargetService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
     @AutoLog(value = "快手-创建广告组定向信息-通过id查询")
     @AutoLog(value = "快手-创建广告组定向信息-通过id查询")
     @ApiOperation(value = "快手-创建广告组定向信息-通过id查询", notes = "快手-创建广告组定向信息-通过id查询")
     @ApiOperation(value = "快手-创建广告组定向信息-通过id查询", notes = "快手-创建广告组定向信息-通过id查询")
-	@GetMapping(value = "/queryById")
+    @GetMapping(value = "/queryById")
     public Result<KuaiShouGroupCreateTarget> queryById(@RequestParam(name = "id", required = true) String id) {
     public Result<KuaiShouGroupCreateTarget> queryById(@RequestParam(name = "id", required = true) String id) {
         Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
         Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
         KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget = kuaiShouGroupCreateTargetService.getById(id);
         KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget = kuaiShouGroupCreateTargetService.getById(id);
         if (kuaiShouGroupCreateTarget == null) {
         if (kuaiShouGroupCreateTarget == null) {
-			result.error500("未找到对应实体");
-		}else {
+            result.error500("未找到对应实体");
+        } else {
             result.setResult(kuaiShouGroupCreateTarget);
             result.setResult(kuaiShouGroupCreateTarget);
-			result.setSuccess(true);
-		}
-		return result;
-	}
+            result.setSuccess(true);
+        }
+        return result;
+    }
 
 
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouGroupCreateTarget> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget = JSON.parseObject(deString, KuaiShouGroupCreateTarget.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupCreateTarget, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouGroupCreateTarget> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget = JSON.parseObject(deString, KuaiShouGroupCreateTarget.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupCreateTarget, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
 
 
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouGroupCreateTarget> pageList = kuaiShouGroupCreateTargetService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "快手-创建广告组定向信息列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouGroupCreateTarget.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("快手-创建广告组定向信息列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouGroupCreateTarget> pageList = kuaiShouGroupCreateTargetService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-创建广告组定向信息列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouGroupCreateTarget.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("快手-创建广告组定向信息列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
 
 
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<KuaiShouGroupCreateTarget> listKuaiShouGroupCreateTargets = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouGroupCreateTarget.class, params);
-              kuaiShouGroupCreateTargetService.saveBatch(listKuaiShouGroupCreateTargets);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouGroupCreateTargets.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<KuaiShouGroupCreateTarget> listKuaiShouGroupCreateTargets = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouGroupCreateTarget.class, params);
+                kuaiShouGroupCreateTargetService.saveBatch(listKuaiShouGroupCreateTargets);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouGroupCreateTargets.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
 
 
 }
 }

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

@@ -1,5 +1,7 @@
 package org.jeecg.modules.kuaishou.controller;
 package org.jeecg.modules.kuaishou.controller;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupDayBudget;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupDayBudgetService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,8 +13,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.kuaishou.entity.KuaiShouGroupDayBudget;
-import org.jeecg.modules.kuaishou.service.IKuaiShouGroupDayBudgetService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -33,210 +33,216 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
- /**
+/**
  * @Description: 快手 修改广告组预算
  * @Description: 快手 修改广告组预算
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-09-11
+ * @Date: 2019-09-11
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 @Slf4j
 @Slf4j
-@Api(tags="快手 修改广告组预算")
+@Api(tags = "快手 修改广告组预算")
 @RestController
 @RestController
 @RequestMapping("/kuaishou/kuaiShouGroupDayBudget")
 @RequestMapping("/kuaishou/kuaiShouGroupDayBudget")
 public class KuaiShouGroupDayBudgetController {
 public class KuaiShouGroupDayBudgetController {
-	@Autowired
-	private IKuaiShouGroupDayBudgetService kuaiShouGroupDayBudgetService;
+    @Autowired
+    private IKuaiShouGroupDayBudgetService kuaiShouGroupDayBudgetService;
 
 
-     /**
-	  * 分页列表查询
-	 * @param kuaiShouGroupDayBudget
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "快手 修改广告组预算-分页列表查询")
-	@ApiOperation(value="快手 修改广告组预算-分页列表查询", notes="快手 修改广告组预算-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouGroupDayBudget>> queryPageList(KuaiShouGroupDayBudget kuaiShouGroupDayBudget,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouGroupDayBudget>> result = new Result<IPage<KuaiShouGroupDayBudget>>();
-		QueryWrapper<KuaiShouGroupDayBudget> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupDayBudget, req.getParameterMap());
-		Page<KuaiShouGroupDayBudget> page = new Page<KuaiShouGroupDayBudget>(pageNo, pageSize);
-		IPage<KuaiShouGroupDayBudget> pageList = kuaiShouGroupDayBudgetService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
+    /**
+     * 分页列表查询
+     *
+     * @param kuaiShouGroupDayBudget
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "快手 修改广告组预算-分页列表查询")
+    @ApiOperation(value = "快手 修改广告组预算-分页列表查询", notes = "快手 修改广告组预算-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<KuaiShouGroupDayBudget>> queryPageList(KuaiShouGroupDayBudget kuaiShouGroupDayBudget,
+                                                               @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                               HttpServletRequest req) {
+        Result<IPage<KuaiShouGroupDayBudget>> result = new Result<IPage<KuaiShouGroupDayBudget>>();
+        QueryWrapper<KuaiShouGroupDayBudget> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupDayBudget, req.getParameterMap());
+        Page<KuaiShouGroupDayBudget> page = new Page<KuaiShouGroupDayBudget>(pageNo, pageSize);
+        IPage<KuaiShouGroupDayBudget> pageList = kuaiShouGroupDayBudgetService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
 
 
-     /**
-	  *   添加
-	 * @param kuaiShouGroupDayBudget
-	 * @return
-	 */
-	@AutoLog(value = "快手 修改广告组预算-添加")
-	@ApiOperation(value="快手 修改广告组预算-添加", notes="快手 修改广告组预算-添加")
-	@PostMapping(value = "/add")
-	public Result<KuaiShouGroupDayBudget> add(@RequestBody KuaiShouGroupDayBudget kuaiShouGroupDayBudget) {
-		Result<KuaiShouGroupDayBudget> result = new Result<KuaiShouGroupDayBudget>();
-		try {
-			kuaiShouGroupDayBudgetService.save(kuaiShouGroupDayBudget);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
+    /**
+     * 添加
+     *
+     * @param kuaiShouGroupDayBudget
+     * @return
+     */
+    @AutoLog(value = "快手 修改广告组预算-添加")
+    @ApiOperation(value = "快手 修改广告组预算-添加", notes = "快手 修改广告组预算-添加")
+    @PostMapping(value = "/add")
+    public Result<KuaiShouGroupDayBudget> add(@RequestBody KuaiShouGroupDayBudget kuaiShouGroupDayBudget) {
+        Result<KuaiShouGroupDayBudget> result = new Result<KuaiShouGroupDayBudget>();
+        try {
+            kuaiShouGroupDayBudgetService.save(kuaiShouGroupDayBudget);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
 
 
-     /**
-	  *  编辑
-	 * @param kuaiShouGroupDayBudget
-	 * @return
-	 */
-	@AutoLog(value = "快手 修改广告组预算-编辑")
-	@ApiOperation(value="快手 修改广告组预算-编辑", notes="快手 修改广告组预算-编辑")
-	@PutMapping(value = "/edit")
-	public Result<KuaiShouGroupDayBudget> edit(@RequestBody KuaiShouGroupDayBudget kuaiShouGroupDayBudget) {
-		Result<KuaiShouGroupDayBudget> result = new Result<KuaiShouGroupDayBudget>();
-		KuaiShouGroupDayBudget kuaiShouGroupDayBudgetEntity = kuaiShouGroupDayBudgetService.getById(kuaiShouGroupDayBudget.getId());
-		if(kuaiShouGroupDayBudgetEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = kuaiShouGroupDayBudgetService.updateById(kuaiShouGroupDayBudget);
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
+    /**
+     * 编辑
+     *
+     * @param kuaiShouGroupDayBudget
+     * @return
+     */
+    @AutoLog(value = "快手 修改广告组预算-编辑")
+    @ApiOperation(value = "快手 修改广告组预算-编辑", notes = "快手 修改广告组预算-编辑")
+    @PutMapping(value = "/edit")
+    public Result<KuaiShouGroupDayBudget> edit(@RequestBody KuaiShouGroupDayBudget kuaiShouGroupDayBudget) {
+        Result<KuaiShouGroupDayBudget> result = new Result<KuaiShouGroupDayBudget>();
+        KuaiShouGroupDayBudget kuaiShouGroupDayBudgetEntity = kuaiShouGroupDayBudgetService.getById(kuaiShouGroupDayBudget.getId());
+        if (kuaiShouGroupDayBudgetEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = kuaiShouGroupDayBudgetService.updateById(kuaiShouGroupDayBudget);
+            //TODO 返回false说明什么?
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
 
 
         return result;
         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 {
-			kuaiShouGroupDayBudgetService.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
+    /**
+     * 通过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 {
+            kuaiShouGroupDayBudgetService.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<KuaiShouGroupDayBudget> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouGroupDayBudget> result = new Result<KuaiShouGroupDayBudget>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.kuaiShouGroupDayBudgetService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "快手 修改广告组预算-批量删除")
+    @ApiOperation(value = "快手 修改广告组预算-批量删除", notes = "快手 修改广告组预算-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<KuaiShouGroupDayBudget> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouGroupDayBudget> result = new Result<KuaiShouGroupDayBudget>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.kuaiShouGroupDayBudgetService.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<KuaiShouGroupDayBudget> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouGroupDayBudget> result = new Result<KuaiShouGroupDayBudget>();
-		KuaiShouGroupDayBudget kuaiShouGroupDayBudget = kuaiShouGroupDayBudgetService.getById(id);
-		if(kuaiShouGroupDayBudget==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(kuaiShouGroupDayBudget);
-			result.setSuccess(true);
-		}
-		return result;
-	}
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "快手 修改广告组预算-通过id查询")
+    @ApiOperation(value = "快手 修改广告组预算-通过id查询", notes = "快手 修改广告组预算-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<KuaiShouGroupDayBudget> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouGroupDayBudget> result = new Result<KuaiShouGroupDayBudget>();
+        KuaiShouGroupDayBudget kuaiShouGroupDayBudget = kuaiShouGroupDayBudgetService.getById(id);
+        if (kuaiShouGroupDayBudget == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouGroupDayBudget);
+            result.setSuccess(true);
+        }
+        return result;
+    }
 
 
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouGroupDayBudget> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouGroupDayBudget kuaiShouGroupDayBudget = JSON.parseObject(deString, KuaiShouGroupDayBudget.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupDayBudget, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouGroupDayBudget> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouGroupDayBudget kuaiShouGroupDayBudget = JSON.parseObject(deString, KuaiShouGroupDayBudget.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupDayBudget, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
 
 
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouGroupDayBudget> pageList = kuaiShouGroupDayBudgetService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "快手 修改广告组预算列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouGroupDayBudget.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("快手 修改广告组预算列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouGroupDayBudget> pageList = kuaiShouGroupDayBudgetService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手 修改广告组预算列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouGroupDayBudget.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<KuaiShouGroupDayBudget> listKuaiShouGroupDayBudgets = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouGroupDayBudget.class, params);
-              kuaiShouGroupDayBudgetService.saveBatch(listKuaiShouGroupDayBudgets);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouGroupDayBudgets.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("文件导入失败!");
-  }
+    /**
+     * 通过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<KuaiShouGroupDayBudget> listKuaiShouGroupDayBudgets = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouGroupDayBudget.class, params);
+                kuaiShouGroupDayBudgetService.saveBatch(listKuaiShouGroupDayBudgets);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouGroupDayBudgets.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("文件导入失败!");
+    }
 
 
 }
 }

+ 19 - 22
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouImageController.java

@@ -1,44 +1,41 @@
 package org.jeecg.modules.kuaishou.controller;
 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 cn.com.ctop.common.utils.Check;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImage;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageService;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.kuaishou.entity.KuaiShouImage;
-import org.jeecg.modules.kuaishou.service.IKuaiShouImageService;
-
-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.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 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: 快手-本地图片保存
  * @Description: 快手-本地图片保存

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouImageGetController.java

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

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouImageUploandController.java

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

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouRegionListChildrenController.java

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

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouRegionListParentController.java

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

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouScheduleController.java

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

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouVideoController.java

@@ -1,6 +1,9 @@
 package org.jeecg.modules.kuaishou.controller;
 package org.jeecg.modules.kuaishou.controller;
 
 
 import cn.com.ctop.common.utils.Check;
 import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideo;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -15,9 +18,6 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.kuaishou.entity.KuaiShouVideo;
-import org.jeecg.modules.kuaishou.service.IKuaiShouImageService;
-import org.jeecg.modules.kuaishou.service.IKuaiShouVideoService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouVideoGetController.java

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

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouVideoUploadController.java

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

+ 10 - 0
module-common/pom.xml

@@ -24,6 +24,16 @@
 
 
     <dependencies>
     <dependencies>
         <dependency>
         <dependency>
+            <groupId>cn.com.ctop</groupId>
+            <artifactId>module-toutiao</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.com.ctop</groupId>
+            <artifactId>module-kuaishou</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <artifactId>junit</artifactId>
             <version>4.11</version>
             <version>4.11</version>

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.ctop.entity;
+package module.entity;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -10,10 +10,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
-import org.jeecg.common.util.DateUtils;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
 
+import java.util.Calendar;
 import java.util.Date;
 import java.util.Date;
 
 
 /**
 /**
@@ -109,8 +109,8 @@ public class CtopOauthToken {
         this.accessToken = accessToken;
         this.accessToken = accessToken;
         this.refreshToken = refreshToken;
         this.refreshToken = refreshToken;
         Date now = new Date();
         Date now = new Date();
-        this.accessTokenExpiresIn = DateUtils.addSecond(now, expiresIn);
-        this.refreshTokenExpiresIn = DateUtils.addSecond(now, refreshTokenExpiresIn);
+        this.accessTokenExpiresIn = addSecond(now, expiresIn);
+        this.refreshTokenExpiresIn = addSecond(now, refreshTokenExpiresIn);
         this.createTime = now;
         this.createTime = now;
         this.updateTime = now;
         this.updateTime = now;
     }
     }
@@ -129,9 +129,16 @@ public class CtopOauthToken {
         this.accessToken = accessToken;
         this.accessToken = accessToken;
         this.refreshToken = refreshToken;
         this.refreshToken = refreshToken;
         Date now = new Date();
         Date now = new Date();
-        this.accessTokenExpiresIn = DateUtils.addSecond(now, expiresIn);
-        this.refreshTokenExpiresIn = DateUtils.addSecond(now, refreshTokenExpiresIn);
+        this.accessTokenExpiresIn = addSecond(now, expiresIn);
+        this.refreshTokenExpiresIn = addSecond(now, refreshTokenExpiresIn);
         this.createTime = now;
         this.createTime = now;
         this.updateTime = now;
         this.updateTime = now;
     }
     }
+
+    private static Date addSecond(Date date, int seconds) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.SECOND, seconds);
+        return calendar.getTime();
+    }
 }
 }

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/CtopOauthTokenMapper.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.ctop.mapper;
+package module.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.ctop.entity.CtopOauthToken;
+import module.entity.CtopOauthToken;
 
 
 import java.util.List;
 import java.util.List;
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/CtopOauthTokenMapper.xml → module-common/src/main/java/module/mapper/xml/CtopOauthTokenMapper.xml


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

@@ -1,7 +1,7 @@
-package org.jeecg.modules.ctop.service;
+package module.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.ctop.entity.CtopOauthToken;
+import module.entity.CtopOauthToken;
 
 
 import java.util.Map;
 import java.util.Map;
 
 

+ 6 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CtopOauthTokenServiceImpl.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.ctop.service.impl;
+package module.service.impl;
 
 
 import cn.com.ctop.common.utils.Check;
 import cn.com.ctop.common.utils.Check;
 import cn.com.ctop.common.utils.HttpUtils;
 import cn.com.ctop.common.utils.HttpUtils;
@@ -9,9 +9,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import constant.KuaishouInterfaceConstant;
 import constant.KuaishouInterfaceConstant;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.jeecg.modules.ctop.entity.CtopOauthToken;
-import org.jeecg.modules.ctop.mapper.CtopOauthTokenMapper;
-import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
+import module.entity.CtopOauthToken;
+import module.mapper.CtopOauthTokenMapper;
+import module.service.ICtopOauthTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -42,6 +42,7 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
 
 
     /**
     /**
      * 刷新token
      * 刷新token
+     *
      * @param accountId
      * @param accountId
      * @return
      * @return
      */
      */
@@ -81,6 +82,7 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
 
 
     /**
     /**
      * 快手 刷新token
      * 快手 刷新token
+     *
      * @param accountId
      * @param accountId
      * @param refreshToken
      * @param refreshToken
      * @return
      * @return

+ 11 - 0
module-ctop/pom.xml

@@ -24,6 +24,17 @@
 
 
     <dependencies>
     <dependencies>
         <dependency>
         <dependency>
+            <groupId>cn.com.ctop</groupId>
+            <artifactId>module-toutiao</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.com.ctop</groupId>
+            <artifactId>module-kuaishou</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+
+        <dependency>
             <groupId>junit</groupId>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <artifactId>junit</artifactId>
             <version>4.11</version>
             <version>4.11</version>

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.entity;
+package cn.com.ctop.kuaishou.modules.batch.entity;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.entity;
+package cn.com.ctop.kuaishou.modules.batch.entity;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.entity;
+package cn.com.ctop.kuaishou.modules.batch.entity;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.entity;
+package cn.com.ctop.kuaishou.modules.batch.entity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.entity;
+package cn.com.ctop.kuaishou.modules.batch.entity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.entity;
+package cn.com.ctop.kuaishou.modules.batch.entity;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;

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

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

+ 3 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouActionBarTextMapper.java

@@ -1,15 +1,12 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.kuaishou.entity.KuaiShouActionBarText;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouActionBarText;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**
  * @Description: 快手-行动号召文案
  * @Description: 快手-行动号召文案
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-08-15
+ * @Date: 2019-08-15
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 public interface KuaiShouActionBarTextMapper extends BaseMapper<KuaiShouActionBarText> {
 public interface KuaiShouActionBarTextMapper extends BaseMapper<KuaiShouActionBarText> {

+ 4 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouAdvertiserBaseInfoMapper.java

@@ -1,15 +1,13 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.kuaishou.entity.KuaiShouAdvertiserBaseInfo;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAdvertiserBaseInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**
  * 快手-广告主基本信息
  * 快手-广告主基本信息
+ *
  * @author: jeecg-boot
  * @author: jeecg-boot
- * @date:   2019-09-18
+ * @date: 2019-09-18
  * @cersion: V1.0
  * @cersion: V1.0
  */
  */
 public interface KuaiShouAdvertiserBaseInfoMapper extends BaseMapper<KuaiShouAdvertiserBaseInfo> {
 public interface KuaiShouAdvertiserBaseInfoMapper extends BaseMapper<KuaiShouAdvertiserBaseInfo> {

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouAppCreateMapper.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppCreate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.kuaishou.entity.KuaiShouAppCreate;
 
 
 /**
 /**
  * @Description: 创建应用
  * @Description: 创建应用

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouAppInfoMapper.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.kuaishou.entity.KuaiShouAppInfo;
 
 
 /**
 /**
  * @Description: 广告组-app信息
  * @Description: 广告组-app信息

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouAppListMapper.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppList;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.kuaishou.entity.KuaiShouAppList;
 
 
 /**
 /**
  * @Description: 快手-应用列表
  * @Description: 快手-应用列表

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouCampaignCreateMapper.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignCreate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.kuaishou.entity.KuaiShouCampaignCreate;
 
 
 /**
 /**
  * @Description: 快手-创建广告计划
  * @Description: 快手-创建广告计划

+ 3 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouCampaignDayBudgetMapper.java

@@ -1,15 +1,12 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.kuaishou.entity.KuaiShouCampaignDayBudget;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignDayBudget;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**
  * @Description: 快手-修改广告计划记录表
  * @Description: 快手-修改广告计划记录表
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-09-11
+ * @Date: 2019-09-11
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 public interface KuaiShouCampaignDayBudgetMapper extends BaseMapper<KuaiShouCampaignDayBudget> {
 public interface KuaiShouCampaignDayBudgetMapper extends BaseMapper<KuaiShouCampaignDayBudget> {

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouCampaignMapper.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaign;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.kuaishou.entity.KuaiShouCampaign;
 
 
 /**
 /**
  * @Description: 快手-获取广告计划信息
  * @Description: 快手-获取广告计划信息

+ 3 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouCampaignStatusMapper.java

@@ -1,15 +1,12 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.kuaishou.entity.KuaiShouCampaignStatus;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignStatus;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**
  * @Description: 快手-修改状态
  * @Description: 快手-修改状态
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-09-11
+ * @Date: 2019-09-11
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 public interface KuaiShouCampaignStatusMapper extends BaseMapper<KuaiShouCampaignStatus> {
 public interface KuaiShouCampaignStatusMapper extends BaseMapper<KuaiShouCampaignStatus> {

+ 3 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouCampaignTemplateMapper.java

@@ -1,15 +1,12 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.kuaishou.entity.KuaiShouCampaignTemplate;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignTemplate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**
  * @Description: 快手-创建广告计划模板
  * @Description: 快手-创建广告计划模板
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-08-06
+ * @Date: 2019-08-06
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 public interface KuaiShouCampaignTemplateMapper extends BaseMapper<KuaiShouCampaignTemplate> {
 public interface KuaiShouCampaignTemplateMapper extends BaseMapper<KuaiShouCampaignTemplate> {

+ 2 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouConversionInfosMapper.java

@@ -1,9 +1,6 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.kuaishou.entity.KuaiShouConversionInfos;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouConversionInfos;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouConversionTypesMapper.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouConversionTypes;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.kuaishou.entity.KuaiShouConversionTypes;
 
 
 /**
 /**
  * @Description: 快手-可选深度转化类型-详情
  * @Description: 快手-可选深度转化类型-详情

+ 3 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouCreateAppTemplateMapper.java

@@ -1,15 +1,12 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.kuaishou.entity.KuaiShouCreateAppTemplate;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreateAppTemplate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**
  * @Description: 创建应用
  * @Description: 创建应用
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-08-06
+ * @Date: 2019-08-06
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 public interface KuaiShouCreateAppTemplateMapper extends BaseMapper<KuaiShouCreateAppTemplate> {
 public interface KuaiShouCreateAppTemplateMapper extends BaseMapper<KuaiShouCreateAppTemplate> {

+ 2 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouCreativeCreateMapper.java

@@ -1,9 +1,6 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.kuaishou.entity.KuaiShouCreativeCreate;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreativeCreate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouCreativeMapper.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreative;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.kuaishou.entity.KuaiShouCreative;
 
 
 /**
 /**
  * @Description: 快手-创意信息
  * @Description: 快手-创意信息

+ 2 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouGroupBidMapper.java

@@ -1,9 +1,6 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.kuaishou.entity.KuaiShouGroupBid;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupBid;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouGroupCreateLogMapper.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.kuaishou.entity.KuaiShouGroupCreateLog;
 
 
 /**
 /**
  * @Description: 快手-批量创建广告组
  * @Description: 快手-批量创建广告组

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 3 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouGroupDayBudgetMapper.java

@@ -1,15 +1,12 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.kuaishou.entity.KuaiShouGroupDayBudget;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupDayBudget;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**
  * @Description: 快手 修改广告组预算
  * @Description: 快手 修改广告组预算
  * @Author: jeecg-boot
  * @Author: jeecg-boot
- * @Date:   2019-09-11
+ * @Date: 2019-09-11
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 public interface KuaiShouGroupDayBudgetMapper extends BaseMapper<KuaiShouGroupDayBudget> {
 public interface KuaiShouGroupDayBudgetMapper extends BaseMapper<KuaiShouGroupDayBudget> {

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouGroupMapper.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.kuaishou.entity.KuaiShouGroup;
 
 
 /**
 /**
  * @Description: 广告组信息
  * @Description: 广告组信息

+ 2 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouImageGetMapper.java

@@ -1,9 +1,6 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.kuaishou.entity.KuaiShouImageGet;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**

+ 3 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouImageMapper.java

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

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouImageUploandMapper.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageUploand;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.kuaishou.entity.KuaiShouImageUploand;
 
 
 /**
 /**
  * @Description: 快手-上传图片接口
  * @Description: 快手-上传图片接口

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouRegionListChildrenMapper.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouRegionListChildren;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.kuaishou.entity.KuaiShouRegionListChildren;
 
 
 /**
 /**
  * @Description: 快手-子级地域
  * @Description: 快手-子级地域

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouRegionListParentMapper.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouRegionListParent;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.kuaishou.entity.KuaiShouRegionListParent;
 
 
 /**
 /**
  * @Description: 快手-父级地域
  * @Description: 快手-父级地域

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouScheduleMapper.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.kuaishou.mapper;
+package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouSchedule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.kuaishou.entity.KuaiShouSchedule;
 
 
 /**
 /**
  * @Description: 广告组-时间段范围
  * @Description: 广告组-时间段范围

+ 0 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouVideoGetMapper.java


Some files were not shown because too many files changed in this diff