syh 5 лет назад
Родитель
Сommit
474b6e81bf
100 измененных файлов с 6483 добавлено и 6156 удалено
  1. 1 0
      jeecg-boot-base-common/.gitignore
  2. 1 0
      jeecg-boot-module-system/.gitignore
  3. 2 0
      jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java
  4. 2 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdCoverController.java
  5. 18 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdvertiserController.java
  6. 1 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AuthController.java
  7. 167 158
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertiserBudgetController.java
  8. 206 197
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertiserController.java
  9. 4 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertiserPostController.java
  10. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceBudgetTemplateController.java
  11. 167 158
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCampaignController.java
  12. 167 158
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCampaignTemplateController.java
  13. 167 158
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCreativeController.java
  14. 64 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouAdvertiserController.java
  15. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertiser.java
  16. 6 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertiserBudget.java
  17. 15 15
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCampaign.java
  18. 8 8
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCreativeMaterial.java
  19. 18 18
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceAdvertiserDataServiceImpl.java
  20. 206 197
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAppCreateController.java
  21. 44 44
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAppInfoController.java
  22. 206 197
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAppListController.java
  23. 44 44
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignController.java
  24. 206 197
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignCreateController.java
  25. 44 44
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouConversionInfosController.java
  26. 44 44
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouConversionTypesController.java
  27. 206 197
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreativeController.java
  28. 206 197
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreativeCreateController.java
  29. 206 197
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupController.java
  30. 44 44
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupCreateController.java
  31. 44 44
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupCreateTargetController.java
  32. 206 197
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouImageGetController.java
  33. 206 197
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouImageUploandController.java
  34. 206 197
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouRegionListChildrenController.java
  35. 206 197
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouRegionListParentController.java
  36. 206 197
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouScheduleController.java
  37. 206 197
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouVideoGetController.java
  38. 206 197
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouVideoUploadController.java
  39. 38 25
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouConversionInfos.java
  40. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouConversionInfosMapper.java
  41. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouConversionTypesMapper.java
  42. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouCreativeCreateMapper.java
  43. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouGroupCreateTargetMapper.java
  44. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouImageGetMapper.java
  45. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouRegionListChildrenMapper.java
  46. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouVideoGetMapper.java
  47. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouVideoUploadMapper.java
  48. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/xml/KuaiShouRegionListParentMapper.xml
  49. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouAppCreateService.java
  50. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouAppInfoService.java
  51. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouAppListService.java
  52. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouCampaignCreateService.java
  53. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouCampaignService.java
  54. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouConversionInfosService.java
  55. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouConversionTypesService.java
  56. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouCreativeCreateService.java
  57. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouCreativeService.java
  58. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouGroupCreateService.java
  59. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouGroupCreateTargetService.java
  60. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouGroupService.java
  61. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouImageGetService.java
  62. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouImageUploandService.java
  63. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouRegionListChildrenService.java
  64. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouRegionListParentService.java
  65. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouScheduleService.java
  66. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouVideoGetService.java
  67. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouVideoUploadService.java
  68. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouAppCreateServiceImpl.java
  69. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouAppInfoServiceImpl.java
  70. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouAppListServiceImpl.java
  71. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouCampaignCreateServiceImpl.java
  72. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouCampaignServiceImpl.java
  73. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouConversionTypesServiceImpl.java
  74. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouCreativeCreateServiceImpl.java
  75. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouCreativeServiceImpl.java
  76. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouGroupCreateServiceImpl.java
  77. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouGroupCreateTargetServiceImpl.java
  78. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouGroupServiceImpl.java
  79. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouImageGetServiceImpl.java
  80. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouImageUploandServiceImpl.java
  81. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouRegionListChildrenServiceImpl.java
  82. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouRegionListParentServiceImpl.java
  83. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouScheduleServiceImpl.java
  84. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouVideoGetServiceImpl.java
  85. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouVideoUploadServiceImpl.java
  86. 183 178
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouAppCreateList.vue
  87. 153 148
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouAppInfoList.vue
  88. 178 173
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouAppListList.vue
  89. 155 148
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouCampaignCreateList.vue
  90. 153 148
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouCampaignList.vue
  91. 133 128
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouConversionInfosList.vue
  92. 133 128
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouConversionTypesList.vue
  93. 173 168
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouCreativeCreateList.vue
  94. 198 193
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouCreativeList.vue
  95. 223 218
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouGroupCreateList.vue
  96. 188 183
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouGroupCreateTargetList.vue
  97. 233 228
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouGroupList.vue
  98. 163 158
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouImageGetList.vue
  99. 173 168
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouImageUploandList.vue
  100. 0 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouRegionListChildrenList.vue

+ 1 - 0
jeecg-boot-base-common/.gitignore

@@ -0,0 +1 @@
+/target/

+ 1 - 0
jeecg-boot-module-system/.gitignore

@@ -0,0 +1 @@
+/target/

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -89,12 +89,14 @@ public class ShiroConfig {
 		filterChainDefinitionMap.put("/auth/begin", "anon");
 		filterChainDefinitionMap.put("/ctop/syncdata/**", "anon");
 		//头条接口
+		filterChainDefinitionMap.put("/kuaishou", "anon");
 		filterChainDefinitionMap.put("/toutiao/dictitem/list", "anon");
 		filterChainDefinitionMap.put("/toutiao/advertiser/**", "anon");
         filterChainDefinitionMap.put("/template/**", "user");
 		//文件上传接口
 		filterChainDefinitionMap.put("/upload/**", "anon");
 
+
 		//爬虫接口
 		filterChainDefinitionMap.put("/graphql/video", "anon");
 

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

@@ -44,6 +44,7 @@ public class AdCoverController {
         String industry = paramMap.get("industry")!=null?sysCategoryService.getById(paramMap.get("industry")[0]).getName():null;
         String company = paramMap.get("company")!=null?paramMap.get("company")[0]:null;
         String product = paramMap.get("product")!=null?paramMap.get("product")[0]:null;
+        String userName = paramMap.get("userName") != null ? paramMap.get("userName")[0] : null;
         String start = paramMap.get("start")!=null?paramMap.get("start")[0]:null;
         String end = paramMap.get("end")!=null?paramMap.get("end")[0]:null;
         String orderByColumn = paramMap.get("orderByColumn")!=null?paramMap.get("orderByColumn")[0]:null;
@@ -53,7 +54,7 @@ public class AdCoverController {
 //        Integer pageSize = paramMap.get("pageSize")!=null?paramMap.get("orderByType")[0]:null;
         int pageStart = (pageNo-1)*pageSize;
         Page<AppAd> page = new Page<AppAd>(pageNo, pageSize);
-        List<AppAd> list = appAdService.queryAdFeeds(industry,company,product,start,end,orderByColumn,orderByType,pageStart,pageSize);
+        List<AppAd> list = appAdService.queryAdFeeds(userName, industry, company, product, start, end, orderByColumn, orderByType, pageStart, pageSize);
         result.setResult(list);
         result.setSuccess(true);
         return result;

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

@@ -1,8 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -14,12 +12,13 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.Advertiser;
 import org.jeecg.modules.ctop.service.IAdvertiserService;
-import java.util.Date;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.system.entity.SysCategory;
+import org.jeecg.modules.system.service.ISysCategoryService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -48,7 +47,8 @@ import io.swagger.annotations.ApiOperation;
 public class AdvertiserController {
 	@Autowired
 	private IAdvertiserService advertiserService;
-	
+     @Autowired
+     private ISysCategoryService sysCategoryService;
 	/**
 	  * 分页列表查询
 	 * @param advertiser
@@ -68,6 +68,19 @@ public class AdvertiserController {
 		QueryWrapper<Advertiser> queryWrapper = QueryGenerator.initQueryWrapper(advertiser, req.getParameterMap());
 		Page<Advertiser> page = new Page<Advertiser>(pageNo, pageSize);
 		IPage<Advertiser> pageList = advertiserService.page(page, queryWrapper);
+        if (pageList != null && pageList.getRecords() != null && pageList.getRecords().size() > 0) {
+            List<Advertiser> list = new ArrayList<>();
+            for (int i = 0; i < pageList.getRecords().size(); i++) {
+                Advertiser advertiserRecord = pageList.getRecords().get(i);
+                SysCategory sysCategory = sysCategoryService.getById(advertiserRecord.getIndustryId());
+
+                if (sysCategory != null) {
+                    advertiserRecord.setIndustryId(sysCategory.getName());
+                }
+                list.add(advertiserRecord);
+            }
+            pageList.setRecords(list);
+        }
 		result.setSuccess(true);
 		result.setResult(pageList);
 		return result;

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

@@ -76,7 +76,7 @@ public class AuthController {
     @GetMapping("bytedance/refreshtoken")
 
 
-    public String getByteDanceAccessToken(String authCode, String accountId){
+    public String getByteDanceAccessToken(String authCode, String accountId) {
         Map<String, Object> param = new HashMap<String, Object>();
         param.put("app_id",PropertiesUtils.getValue("bytedance_config","bytedance_appid"));
         param.put("secret",PropertiesUtils.getValue("bytedance_config","bytedance_secret"));
@@ -119,8 +119,6 @@ public class AuthController {
     }
 
 
-
-
     public String getByteDanceCodeUrl(String state) throws UnsupportedEncodingException {
         StringBuffer sb = new StringBuffer();
         sb.append(PropertiesUtils.getValue("bytedance_config","bytedance_auth_url"))

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

@@ -8,13 +8,16 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.ByteDanceAdvertiserBudget;
 import org.jeecg.modules.ctop.service.IByteDanceAdvertiserBudgetService;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,10 +38,10 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
-  * @Description: 今日头条广告主预算信息
+/**
+ * @Description: 今日头条广告主预算信息
  * @Author: jeecg-boot
-  * @Date: 2019-07-22
+ * @Date: 2019-07-22
  * @Version: V1.0
  */
 @Slf4j
@@ -46,199 +49,205 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 @RequestMapping("/ctop/byteDanceAdvertiserBudget")
 public class ByteDanceAdvertiserBudgetController {
-	@Autowired
+    @Autowired
     private IByteDanceAdvertiserBudgetService byteDanceAdvertiserBudgetService;
-	
-	/**
-	  * 分页列表查询
+
+    /**
+     * 分页列表查询
+     *
      * @param byteDanceAdvertiserBudget
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
     @AutoLog(value = "今日头条广告主预算信息-分页列表查询")
     @ApiOperation(value = "今日头条广告主预算信息-分页列表查询", notes = "今日头条广告主预算信息-分页列表查询")
-	@GetMapping(value = "/list")
+    @GetMapping(value = "/list")
     public Result<IPage<ByteDanceAdvertiserBudget>> queryPageList(ByteDanceAdvertiserBudget byteDanceAdvertiserBudget,
-                                                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                                   HttpServletRequest req) {
         Result<IPage<ByteDanceAdvertiserBudget>> result = new Result<IPage<ByteDanceAdvertiserBudget>>();
         QueryWrapper<ByteDanceAdvertiserBudget> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceAdvertiserBudget, req.getParameterMap());
         Page<ByteDanceAdvertiserBudget> page = new Page<ByteDanceAdvertiserBudget>(pageNo, pageSize);
         IPage<ByteDanceAdvertiserBudget> pageList = byteDanceAdvertiserBudgetService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
      * @param byteDanceAdvertiserBudget
-	 * @return
-	 */
+     * @return
+     */
     @AutoLog(value = "今日头条广告主预算信息-添加")
     @ApiOperation(value = "今日头条广告主预算信息-添加", notes = "今日头条广告主预算信息-添加")
-	@PostMapping(value = "/add")
+    @PostMapping(value = "/add")
     public Result<ByteDanceAdvertiserBudget> add(@RequestBody ByteDanceAdvertiserBudget byteDanceAdvertiserBudget) {
         Result<ByteDanceAdvertiserBudget> result = new Result<ByteDanceAdvertiserBudget>();
-		try {
+        try {
             byteDanceAdvertiserBudgetService.save(byteDanceAdvertiserBudget);
-			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 byteDanceAdvertiserBudget
-	 * @return
-	 */
+     * @return
+     */
     @AutoLog(value = "今日头条广告主预算信息-编辑")
     @ApiOperation(value = "今日头条广告主预算信息-编辑", notes = "今日头条广告主预算信息-编辑")
-	@PutMapping(value = "/edit")
+    @PutMapping(value = "/edit")
     public Result<ByteDanceAdvertiserBudget> edit(@RequestBody ByteDanceAdvertiserBudget byteDanceAdvertiserBudget) {
         Result<ByteDanceAdvertiserBudget> result = new Result<ByteDanceAdvertiserBudget>();
         ByteDanceAdvertiserBudget byteDanceAdvertiserBudgetEntity = byteDanceAdvertiserBudgetService.getById(byteDanceAdvertiserBudget.getId());
         if (byteDanceAdvertiserBudgetEntity == null) {
-			result.error500("未找到对应实体");
-		}else {
+            result.error500("未找到对应实体");
+        } else {
             boolean ok = byteDanceAdvertiserBudgetService.updateById(byteDanceAdvertiserBudget);
-			//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删除")
     @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 {
             byteDanceAdvertiserBudgetService.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 = "今日头条广告主预算信息-批量删除")
     @ApiOperation(value = "今日头条广告主预算信息-批量删除", notes = "今日头条广告主预算信息-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
     public Result<ByteDanceAdvertiserBudget> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         Result<ByteDanceAdvertiserBudget> result = new Result<ByteDanceAdvertiserBudget>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
             this.byteDanceAdvertiserBudgetService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
     @AutoLog(value = "今日头条广告主预算信息-通过id查询")
     @ApiOperation(value = "今日头条广告主预算信息-通过id查询", notes = "今日头条广告主预算信息-通过id查询")
-	@GetMapping(value = "/queryById")
+    @GetMapping(value = "/queryById")
     public Result<ByteDanceAdvertiserBudget> queryById(@RequestParam(name = "id", required = true) String id) {
         Result<ByteDanceAdvertiserBudget> result = new Result<ByteDanceAdvertiserBudget>();
         ByteDanceAdvertiserBudget byteDanceAdvertiserBudget = byteDanceAdvertiserBudgetService.getById(id);
         if (byteDanceAdvertiserBudget == null) {
-			result.error500("未找到对应实体");
-		}else {
+            result.error500("未找到对应实体");
+        } else {
             result.setResult(byteDanceAdvertiserBudget);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<ByteDanceAdvertiserBudget> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              ByteDanceAdvertiserBudget byteDanceAdvertiserBudget = JSON.parseObject(deString, ByteDanceAdvertiserBudget.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(byteDanceAdvertiserBudget, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<ByteDanceAdvertiserBudget> pageList = byteDanceAdvertiserBudgetService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条广告主预算信息列表");
-      mv.addObject(NormalExcelConstants.CLASS, ByteDanceAdvertiserBudget.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("今日头条广告主预算信息列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();// 获取上传文件对象
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<ByteDanceAdvertiserBudget> listByteDanceAdvertiserBudgets = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceAdvertiserBudget.class, params);
-              byteDanceAdvertiserBudgetService.saveBatch(listByteDanceAdvertiserBudgets);
-              return Result.ok("文件导入成功!数据行数:" + listByteDanceAdvertiserBudgets.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<ByteDanceAdvertiserBudget> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                ByteDanceAdvertiserBudget byteDanceAdvertiserBudget = JSON.parseObject(deString, ByteDanceAdvertiserBudget.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(byteDanceAdvertiserBudget, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<ByteDanceAdvertiserBudget> pageList = byteDanceAdvertiserBudgetService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条广告主预算信息列表");
+        mv.addObject(NormalExcelConstants.CLASS, ByteDanceAdvertiserBudget.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("今日头条广告主预算信息列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<ByteDanceAdvertiserBudget> listByteDanceAdvertiserBudgets = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceAdvertiserBudget.class, params);
+                byteDanceAdvertiserBudgetService.saveBatch(listByteDanceAdvertiserBudgets);
+                return Result.ok("文件导入成功!数据行数:" + listByteDanceAdvertiserBudgets.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
 
 }

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

@@ -8,13 +8,16 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.ByteDanceAdvertiser;
 import org.jeecg.modules.ctop.service.IByteDanceAdvertiserService;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,10 +38,10 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
-  * @Description: 今日头条广告主信息
+/**
+ * @Description: 今日头条广告主信息
  * @Author: jeecg-boot
-  * @Date: 2019-07-22
+ * @Date: 2019-07-22
  * @Version: V1.0
  */
 @Slf4j
@@ -46,199 +49,205 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 @RequestMapping("/ctop/byteDanceAdvertiser")
 public class ByteDanceAdvertiserController {
-	@Autowired
-	private IByteDanceAdvertiserService byteDanceAdvertiserService;
-	
-	/**
-	  * 分页列表查询
-	 * @param byteDanceAdvertiser
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "今日头条广告主信息-分页列表查询")
-	@ApiOperation(value = "今日头条广告主信息-分页列表查询", notes = "今日头条广告主信息-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<ByteDanceAdvertiser>> queryPageList(ByteDanceAdvertiser byteDanceAdvertiser,
-															@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-															@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-															HttpServletRequest req) {
-		Result<IPage<ByteDanceAdvertiser>> result = new Result<IPage<ByteDanceAdvertiser>>();
-		QueryWrapper<ByteDanceAdvertiser> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceAdvertiser, req.getParameterMap());
-		Page<ByteDanceAdvertiser> page = new Page<ByteDanceAdvertiser>(pageNo, pageSize);
-		IPage<ByteDanceAdvertiser> pageList = byteDanceAdvertiserService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param byteDanceAdvertiser
-	 * @return
-	 */
-	@AutoLog(value = "今日头条广告主信息-添加")
-	@ApiOperation(value = "今日头条广告主信息-添加", notes = "今日头条广告主信息-添加")
-	@PostMapping(value = "/add")
-	public Result<ByteDanceAdvertiser> add(@RequestBody ByteDanceAdvertiser byteDanceAdvertiser) {
-		Result<ByteDanceAdvertiser> result = new Result<ByteDanceAdvertiser>();
-		try {
-			byteDanceAdvertiserService.save(byteDanceAdvertiser);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param byteDanceAdvertiser
-	 * @return
-	 */
-	@AutoLog(value = "今日头条广告主信息-编辑")
-	@ApiOperation(value = "今日头条广告主信息-编辑", notes = "今日头条广告主信息-编辑")
-	@PutMapping(value = "/edit")
-	public Result<ByteDanceAdvertiser> edit(@RequestBody ByteDanceAdvertiser byteDanceAdvertiser) {
-		Result<ByteDanceAdvertiser> result = new Result<ByteDanceAdvertiser>();
-		ByteDanceAdvertiser byteDanceAdvertiserEntity = byteDanceAdvertiserService.getById(byteDanceAdvertiser.getId());
-		if (byteDanceAdvertiserEntity == null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = byteDanceAdvertiserService.updateById(byteDanceAdvertiser);
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "今日头条广告主信息-通过id删除")
-	@ApiOperation(value = "今日头条广告主信息-通过id删除", notes = "今日头条广告主信息-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
-			byteDanceAdvertiserService.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "今日头条广告主信息-批量删除")
-	@ApiOperation(value = "今日头条广告主信息-批量删除", notes = "今日头条广告主信息-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<ByteDanceAdvertiser> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-		Result<ByteDanceAdvertiser> result = new Result<ByteDanceAdvertiser>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.byteDanceAdvertiserService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "今日头条广告主信息-通过id查询")
-	@ApiOperation(value = "今日头条广告主信息-通过id查询", notes = "今日头条广告主信息-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<ByteDanceAdvertiser> queryById(@RequestParam(name = "id", required = true) String id) {
-		Result<ByteDanceAdvertiser> result = new Result<ByteDanceAdvertiser>();
-		ByteDanceAdvertiser byteDanceAdvertiser = byteDanceAdvertiserService.getById(id);
-		if (byteDanceAdvertiser == null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(byteDanceAdvertiser);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-	  QueryWrapper<ByteDanceAdvertiser> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-			  ByteDanceAdvertiser byteDanceAdvertiser = JSON.parseObject(deString, ByteDanceAdvertiser.class);
-			  queryWrapper = QueryGenerator.initQueryWrapper(byteDanceAdvertiser, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-	  List<ByteDanceAdvertiser> pageList = byteDanceAdvertiserService.list(queryWrapper);
-      //导出文件名称
-	  mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条广告主信息列表");
-	  mv.addObject(NormalExcelConstants.CLASS, ByteDanceAdvertiser.class);
-	  mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("今日头条广告主信息列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();// 获取上传文件对象
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-			  List<ByteDanceAdvertiser> listByteDanceAdvertisers = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceAdvertiser.class, params);
-			  byteDanceAdvertiserService.saveBatch(listByteDanceAdvertisers);
-			  return Result.ok("文件导入成功!数据行数:" + listByteDanceAdvertisers.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
+    @Autowired
+    private IByteDanceAdvertiserService byteDanceAdvertiserService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param byteDanceAdvertiser
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "今日头条广告主信息-分页列表查询")
+    @ApiOperation(value = "今日头条广告主信息-分页列表查询", notes = "今日头条广告主信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<ByteDanceAdvertiser>> queryPageList(ByteDanceAdvertiser byteDanceAdvertiser,
+                                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                            HttpServletRequest req) {
+        Result<IPage<ByteDanceAdvertiser>> result = new Result<IPage<ByteDanceAdvertiser>>();
+        QueryWrapper<ByteDanceAdvertiser> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceAdvertiser, req.getParameterMap());
+        Page<ByteDanceAdvertiser> page = new Page<ByteDanceAdvertiser>(pageNo, pageSize);
+        IPage<ByteDanceAdvertiser> pageList = byteDanceAdvertiserService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param byteDanceAdvertiser
+     * @return
+     */
+    @AutoLog(value = "今日头条广告主信息-添加")
+    @ApiOperation(value = "今日头条广告主信息-添加", notes = "今日头条广告主信息-添加")
+    @PostMapping(value = "/add")
+    public Result<ByteDanceAdvertiser> add(@RequestBody ByteDanceAdvertiser byteDanceAdvertiser) {
+        Result<ByteDanceAdvertiser> result = new Result<ByteDanceAdvertiser>();
+        try {
+            byteDanceAdvertiserService.save(byteDanceAdvertiser);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param byteDanceAdvertiser
+     * @return
+     */
+    @AutoLog(value = "今日头条广告主信息-编辑")
+    @ApiOperation(value = "今日头条广告主信息-编辑", notes = "今日头条广告主信息-编辑")
+    @PutMapping(value = "/edit")
+    public Result<ByteDanceAdvertiser> edit(@RequestBody ByteDanceAdvertiser byteDanceAdvertiser) {
+        Result<ByteDanceAdvertiser> result = new Result<ByteDanceAdvertiser>();
+        ByteDanceAdvertiser byteDanceAdvertiserEntity = byteDanceAdvertiserService.getById(byteDanceAdvertiser.getId());
+        if (byteDanceAdvertiserEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = byteDanceAdvertiserService.updateById(byteDanceAdvertiser);
+            //TODO 返回false说明什么?
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "今日头条广告主信息-通过id删除")
+    @ApiOperation(value = "今日头条广告主信息-通过id删除", notes = "今日头条广告主信息-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            byteDanceAdvertiserService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "今日头条广告主信息-批量删除")
+    @ApiOperation(value = "今日头条广告主信息-批量删除", notes = "今日头条广告主信息-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<ByteDanceAdvertiser> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<ByteDanceAdvertiser> result = new Result<ByteDanceAdvertiser>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.byteDanceAdvertiserService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "今日头条广告主信息-通过id查询")
+    @ApiOperation(value = "今日头条广告主信息-通过id查询", notes = "今日头条广告主信息-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<ByteDanceAdvertiser> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<ByteDanceAdvertiser> result = new Result<ByteDanceAdvertiser>();
+        ByteDanceAdvertiser byteDanceAdvertiser = byteDanceAdvertiserService.getById(id);
+        if (byteDanceAdvertiser == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(byteDanceAdvertiser);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<ByteDanceAdvertiser> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                ByteDanceAdvertiser byteDanceAdvertiser = JSON.parseObject(deString, ByteDanceAdvertiser.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(byteDanceAdvertiser, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<ByteDanceAdvertiser> pageList = byteDanceAdvertiserService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条广告主信息列表");
+        mv.addObject(NormalExcelConstants.CLASS, ByteDanceAdvertiser.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("今日头条广告主信息列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<ByteDanceAdvertiser> listByteDanceAdvertisers = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceAdvertiser.class, params);
+                byteDanceAdvertiserService.saveBatch(listByteDanceAdvertisers);
+                return Result.ok("文件导入成功!数据行数:" + listByteDanceAdvertisers.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
 
 }

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

@@ -19,6 +19,7 @@ import java.util.Map;
 
 /**
  * 头条广告主相关 2019年7月10日14:13:04
+ *
  * @author 宋英豪
  */
 @RestController
@@ -167,16 +168,16 @@ public class ByteDanceAdvertiserPostController {
 
 
     /**
-     * @功能:查询字典数据
      * @param sysDictItem
      * @param pageNo
      * @param pageSize
      * @param req
      * @return
+     * @功能:查询字典数据
      */
     @RequestMapping(value = "dictitem/list", method = RequestMethod.GET)
     public Result<IPage<SysDictItem>> dictitemPageList(SysDictItem sysDictItem, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                       @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
+                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
         Result<IPage<SysDictItem>> result = new Result<IPage<SysDictItem>>();
         QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
         queryWrapper.orderByAsc("sort_order");
@@ -186,6 +187,7 @@ public class ByteDanceAdvertiserPostController {
         result.setResult(pageList);
         return result;
     }
+
     @Autowired
     private ISysDictItemService sysDictItemService;
 }

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

@@ -61,8 +61,8 @@ public class ByteDanceBudgetTemplateController {
     @ApiOperation(value = "今日头条预算模板信息-分页列表查询", notes = "今日头条预算模板信息-分页列表查询")
 	@GetMapping(value = "/list")
     public Result<IPage<ByteDanceBudgetTemplate>> queryPageList(ByteDanceBudgetTemplate byteDanceBudgetTemplate,
-                                                                @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                                                @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                                @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                                 HttpServletRequest req) {
         Result<IPage<ByteDanceBudgetTemplate>> result = new Result<IPage<ByteDanceBudgetTemplate>>();
         QueryWrapper<ByteDanceBudgetTemplate> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceBudgetTemplate, req.getParameterMap());

+ 167 - 158
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCampaignController.java

@@ -8,13 +8,16 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.ByteDanceCampaign;
 import org.jeecg.modules.ctop.service.IByteDanceCampaignService;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,10 +38,10 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
-  * @Description: 今日头条广告组信息
+/**
+ * @Description: 今日头条广告组信息
  * @Author: jeecg-boot
-  * @Date: 2019-07-22
+ * @Date: 2019-07-22
  * @Version: V1.0
  */
 @Slf4j
@@ -46,199 +49,205 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 @RequestMapping("/ctop/byteDanceCampaign")
 public class ByteDanceCampaignController {
-	@Autowired
+    @Autowired
     private IByteDanceCampaignService byteDanceCampaignService;
-	
-	/**
-	  * 分页列表查询
+
+    /**
+     * 分页列表查询
+     *
      * @param byteDanceCampaign
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
     @AutoLog(value = "今日头条广告组信息-分页列表查询")
     @ApiOperation(value = "今日头条广告组信息-分页列表查询", notes = "今日头条广告组信息-分页列表查询")
-	@GetMapping(value = "/list")
+    @GetMapping(value = "/list")
     public Result<IPage<ByteDanceCampaign>> queryPageList(ByteDanceCampaign byteDanceCampaign,
-                                                          @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                                          @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                           HttpServletRequest req) {
         Result<IPage<ByteDanceCampaign>> result = new Result<IPage<ByteDanceCampaign>>();
         QueryWrapper<ByteDanceCampaign> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCampaign, req.getParameterMap());
         Page<ByteDanceCampaign> page = new Page<ByteDanceCampaign>(pageNo, pageSize);
         IPage<ByteDanceCampaign> pageList = byteDanceCampaignService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
      * @param byteDanceCampaign
-	 * @return
-	 */
+     * @return
+     */
     @AutoLog(value = "今日头条广告组信息-添加")
     @ApiOperation(value = "今日头条广告组信息-添加", notes = "今日头条广告组信息-添加")
-	@PostMapping(value = "/add")
+    @PostMapping(value = "/add")
     public Result<ByteDanceCampaign> add(@RequestBody ByteDanceCampaign byteDanceCampaign) {
         Result<ByteDanceCampaign> result = new Result<ByteDanceCampaign>();
-		try {
+        try {
             byteDanceCampaignService.save(byteDanceCampaign);
-			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 byteDanceCampaign
-	 * @return
-	 */
+     * @return
+     */
     @AutoLog(value = "今日头条广告组信息-编辑")
     @ApiOperation(value = "今日头条广告组信息-编辑", notes = "今日头条广告组信息-编辑")
-	@PutMapping(value = "/edit")
+    @PutMapping(value = "/edit")
     public Result<ByteDanceCampaign> edit(@RequestBody ByteDanceCampaign byteDanceCampaign) {
         Result<ByteDanceCampaign> result = new Result<ByteDanceCampaign>();
         ByteDanceCampaign byteDanceCampaignEntity = byteDanceCampaignService.getById(byteDanceCampaign.getId());
         if (byteDanceCampaignEntity == null) {
-			result.error500("未找到对应实体");
-		}else {
+            result.error500("未找到对应实体");
+        } else {
             boolean ok = byteDanceCampaignService.updateById(byteDanceCampaign);
-			//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删除")
     @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 {
             byteDanceCampaignService.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 = "今日头条广告组信息-批量删除")
     @ApiOperation(value = "今日头条广告组信息-批量删除", notes = "今日头条广告组信息-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
     public Result<ByteDanceCampaign> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         Result<ByteDanceCampaign> result = new Result<ByteDanceCampaign>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
             this.byteDanceCampaignService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
     @AutoLog(value = "今日头条广告组信息-通过id查询")
     @ApiOperation(value = "今日头条广告组信息-通过id查询", notes = "今日头条广告组信息-通过id查询")
-	@GetMapping(value = "/queryById")
+    @GetMapping(value = "/queryById")
     public Result<ByteDanceCampaign> queryById(@RequestParam(name = "id", required = true) String id) {
         Result<ByteDanceCampaign> result = new Result<ByteDanceCampaign>();
         ByteDanceCampaign byteDanceCampaign = byteDanceCampaignService.getById(id);
         if (byteDanceCampaign == null) {
-			result.error500("未找到对应实体");
-		}else {
+            result.error500("未找到对应实体");
+        } else {
             result.setResult(byteDanceCampaign);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<ByteDanceCampaign> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              ByteDanceCampaign byteDanceCampaign = JSON.parseObject(deString, ByteDanceCampaign.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCampaign, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<ByteDanceCampaign> pageList = byteDanceCampaignService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条广告组信息列表");
-      mv.addObject(NormalExcelConstants.CLASS, ByteDanceCampaign.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("今日头条广告组信息列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();// 获取上传文件对象
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<ByteDanceCampaign> listByteDanceCampaigns = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceCampaign.class, params);
-              byteDanceCampaignService.saveBatch(listByteDanceCampaigns);
-              return Result.ok("文件导入成功!数据行数:" + listByteDanceCampaigns.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<ByteDanceCampaign> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                ByteDanceCampaign byteDanceCampaign = JSON.parseObject(deString, ByteDanceCampaign.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCampaign, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<ByteDanceCampaign> pageList = byteDanceCampaignService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条广告组信息列表");
+        mv.addObject(NormalExcelConstants.CLASS, ByteDanceCampaign.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("今日头条广告组信息列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<ByteDanceCampaign> listByteDanceCampaigns = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceCampaign.class, params);
+                byteDanceCampaignService.saveBatch(listByteDanceCampaigns);
+                return Result.ok("文件导入成功!数据行数:" + listByteDanceCampaigns.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
 
 }

+ 167 - 158
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCampaignTemplateController.java

@@ -8,13 +8,16 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
 import org.jeecg.modules.ctop.service.IByteDanceCampaignTemplateService;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,10 +38,10 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
-  * @Description: 今日头条广告组模板信息
+/**
+ * @Description: 今日头条广告组模板信息
  * @Author: jeecg-boot
-  * @Date: 2019-07-22
+ * @Date: 2019-07-22
  * @Version: V1.0
  */
 @Slf4j
@@ -46,199 +49,205 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 @RequestMapping("/ctop/byteDanceCampaignTemplate")
 public class ByteDanceCampaignTemplateController {
-	@Autowired
+    @Autowired
     private IByteDanceCampaignTemplateService byteDanceCampaignTemplateService;
-	
-	/**
-	  * 分页列表查询
+
+    /**
+     * 分页列表查询
+     *
      * @param byteDanceCampaignTemplate
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
     @AutoLog(value = "今日头条广告组模板信息-分页列表查询")
     @ApiOperation(value = "今日头条广告组模板信息-分页列表查询", notes = "今日头条广告组模板信息-分页列表查询")
-	@GetMapping(value = "/list")
+    @GetMapping(value = "/list")
     public Result<IPage<ByteDanceCampaignTemplate>> queryPageList(ByteDanceCampaignTemplate byteDanceCampaignTemplate,
-                                                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                                   HttpServletRequest req) {
         Result<IPage<ByteDanceCampaignTemplate>> result = new Result<IPage<ByteDanceCampaignTemplate>>();
         QueryWrapper<ByteDanceCampaignTemplate> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCampaignTemplate, req.getParameterMap());
         Page<ByteDanceCampaignTemplate> page = new Page<ByteDanceCampaignTemplate>(pageNo, pageSize);
         IPage<ByteDanceCampaignTemplate> pageList = byteDanceCampaignTemplateService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
      * @param byteDanceCampaignTemplate
-	 * @return
-	 */
+     * @return
+     */
     @AutoLog(value = "今日头条广告组模板信息-添加")
     @ApiOperation(value = "今日头条广告组模板信息-添加", notes = "今日头条广告组模板信息-添加")
-	@PostMapping(value = "/add")
+    @PostMapping(value = "/add")
     public Result<ByteDanceCampaignTemplate> add(@RequestBody ByteDanceCampaignTemplate byteDanceCampaignTemplate) {
         Result<ByteDanceCampaignTemplate> result = new Result<ByteDanceCampaignTemplate>();
-		try {
+        try {
             byteDanceCampaignTemplateService.save(byteDanceCampaignTemplate);
-			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 byteDanceCampaignTemplate
-	 * @return
-	 */
+     * @return
+     */
     @AutoLog(value = "今日头条广告组模板信息-编辑")
     @ApiOperation(value = "今日头条广告组模板信息-编辑", notes = "今日头条广告组模板信息-编辑")
-	@PutMapping(value = "/edit")
+    @PutMapping(value = "/edit")
     public Result<ByteDanceCampaignTemplate> edit(@RequestBody ByteDanceCampaignTemplate byteDanceCampaignTemplate) {
         Result<ByteDanceCampaignTemplate> result = new Result<ByteDanceCampaignTemplate>();
         ByteDanceCampaignTemplate byteDanceCampaignTemplateEntity = byteDanceCampaignTemplateService.getById(byteDanceCampaignTemplate.getId());
         if (byteDanceCampaignTemplateEntity == null) {
-			result.error500("未找到对应实体");
-		}else {
+            result.error500("未找到对应实体");
+        } else {
             boolean ok = byteDanceCampaignTemplateService.updateById(byteDanceCampaignTemplate);
-			//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删除")
     @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 {
             byteDanceCampaignTemplateService.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 = "今日头条广告组模板信息-批量删除")
     @ApiOperation(value = "今日头条广告组模板信息-批量删除", notes = "今日头条广告组模板信息-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
     public Result<ByteDanceCampaignTemplate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         Result<ByteDanceCampaignTemplate> result = new Result<ByteDanceCampaignTemplate>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
             this.byteDanceCampaignTemplateService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
     @AutoLog(value = "今日头条广告组模板信息-通过id查询")
     @ApiOperation(value = "今日头条广告组模板信息-通过id查询", notes = "今日头条广告组模板信息-通过id查询")
-	@GetMapping(value = "/queryById")
+    @GetMapping(value = "/queryById")
     public Result<ByteDanceCampaignTemplate> queryById(@RequestParam(name = "id", required = true) String id) {
         Result<ByteDanceCampaignTemplate> result = new Result<ByteDanceCampaignTemplate>();
         ByteDanceCampaignTemplate byteDanceCampaignTemplate = byteDanceCampaignTemplateService.getById(id);
         if (byteDanceCampaignTemplate == null) {
-			result.error500("未找到对应实体");
-		}else {
+            result.error500("未找到对应实体");
+        } else {
             result.setResult(byteDanceCampaignTemplate);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<ByteDanceCampaignTemplate> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              ByteDanceCampaignTemplate byteDanceCampaignTemplate = JSON.parseObject(deString, ByteDanceCampaignTemplate.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCampaignTemplate, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<ByteDanceCampaignTemplate> pageList = byteDanceCampaignTemplateService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条广告组模板信息列表");
-      mv.addObject(NormalExcelConstants.CLASS, ByteDanceCampaignTemplate.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("今日头条广告组模板信息列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();// 获取上传文件对象
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<ByteDanceCampaignTemplate> listByteDanceCampaignTemplates = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceCampaignTemplate.class, params);
-              byteDanceCampaignTemplateService.saveBatch(listByteDanceCampaignTemplates);
-              return Result.ok("文件导入成功!数据行数:" + listByteDanceCampaignTemplates.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<ByteDanceCampaignTemplate> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                ByteDanceCampaignTemplate byteDanceCampaignTemplate = JSON.parseObject(deString, ByteDanceCampaignTemplate.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCampaignTemplate, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<ByteDanceCampaignTemplate> pageList = byteDanceCampaignTemplateService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条广告组模板信息列表");
+        mv.addObject(NormalExcelConstants.CLASS, ByteDanceCampaignTemplate.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("今日头条广告组模板信息列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<ByteDanceCampaignTemplate> listByteDanceCampaignTemplates = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceCampaignTemplate.class, params);
+                byteDanceCampaignTemplateService.saveBatch(listByteDanceCampaignTemplates);
+                return Result.ok("文件导入成功!数据行数:" + listByteDanceCampaignTemplates.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
 
 }

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

@@ -8,13 +8,16 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.ByteDanceCreative;
 import org.jeecg.modules.ctop.service.IByteDanceCreativeService;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,10 +38,10 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
-  * @Description: 今日头条创意信息
+/**
+ * @Description: 今日头条创意信息
  * @Author: jeecg-boot
-  * @Date: 2019-07-22
+ * @Date: 2019-07-22
  * @Version: V1.0
  */
 @Slf4j
@@ -46,199 +49,205 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 @RequestMapping("/ctop/byteDanceCreative")
 public class ByteDanceCreativeController {
-	@Autowired
+    @Autowired
     private IByteDanceCreativeService byteDanceCreativeService;
-	
-	/**
-	  * 分页列表查询
+
+    /**
+     * 分页列表查询
+     *
      * @param byteDanceCreative
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
     @AutoLog(value = "今日头条创意信息-分页列表查询")
     @ApiOperation(value = "今日头条创意信息-分页列表查询", notes = "今日头条创意信息-分页列表查询")
-	@GetMapping(value = "/list")
+    @GetMapping(value = "/list")
     public Result<IPage<ByteDanceCreative>> queryPageList(ByteDanceCreative byteDanceCreative,
-                                                          @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                                          @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                           HttpServletRequest req) {
         Result<IPage<ByteDanceCreative>> result = new Result<IPage<ByteDanceCreative>>();
         QueryWrapper<ByteDanceCreative> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCreative, req.getParameterMap());
         Page<ByteDanceCreative> page = new Page<ByteDanceCreative>(pageNo, pageSize);
         IPage<ByteDanceCreative> pageList = byteDanceCreativeService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
      * @param byteDanceCreative
-	 * @return
-	 */
+     * @return
+     */
     @AutoLog(value = "今日头条创意信息-添加")
     @ApiOperation(value = "今日头条创意信息-添加", notes = "今日头条创意信息-添加")
-	@PostMapping(value = "/add")
+    @PostMapping(value = "/add")
     public Result<ByteDanceCreative> add(@RequestBody ByteDanceCreative byteDanceCreative) {
         Result<ByteDanceCreative> result = new Result<ByteDanceCreative>();
-		try {
+        try {
             byteDanceCreativeService.save(byteDanceCreative);
-			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 byteDanceCreative
-	 * @return
-	 */
+     * @return
+     */
     @AutoLog(value = "今日头条创意信息-编辑")
     @ApiOperation(value = "今日头条创意信息-编辑", notes = "今日头条创意信息-编辑")
-	@PutMapping(value = "/edit")
+    @PutMapping(value = "/edit")
     public Result<ByteDanceCreative> edit(@RequestBody ByteDanceCreative byteDanceCreative) {
         Result<ByteDanceCreative> result = new Result<ByteDanceCreative>();
         ByteDanceCreative byteDanceCreativeEntity = byteDanceCreativeService.getById(byteDanceCreative.getId());
         if (byteDanceCreativeEntity == null) {
-			result.error500("未找到对应实体");
-		}else {
+            result.error500("未找到对应实体");
+        } else {
             boolean ok = byteDanceCreativeService.updateById(byteDanceCreative);
-			//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删除")
     @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 {
             byteDanceCreativeService.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 = "今日头条创意信息-批量删除")
     @ApiOperation(value = "今日头条创意信息-批量删除", notes = "今日头条创意信息-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
     public Result<ByteDanceCreative> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         Result<ByteDanceCreative> result = new Result<ByteDanceCreative>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
             this.byteDanceCreativeService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
     @AutoLog(value = "今日头条创意信息-通过id查询")
     @ApiOperation(value = "今日头条创意信息-通过id查询", notes = "今日头条创意信息-通过id查询")
-	@GetMapping(value = "/queryById")
+    @GetMapping(value = "/queryById")
     public Result<ByteDanceCreative> queryById(@RequestParam(name = "id", required = true) String id) {
         Result<ByteDanceCreative> result = new Result<ByteDanceCreative>();
         ByteDanceCreative byteDanceCreative = byteDanceCreativeService.getById(id);
         if (byteDanceCreative == null) {
-			result.error500("未找到对应实体");
-		}else {
+            result.error500("未找到对应实体");
+        } else {
             result.setResult(byteDanceCreative);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<ByteDanceCreative> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              ByteDanceCreative byteDanceCreative = JSON.parseObject(deString, ByteDanceCreative.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCreative, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<ByteDanceCreative> pageList = byteDanceCreativeService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条创意信息列表");
-      mv.addObject(NormalExcelConstants.CLASS, ByteDanceCreative.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("今日头条创意信息列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();// 获取上传文件对象
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<ByteDanceCreative> listByteDanceCreatives = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceCreative.class, params);
-              byteDanceCreativeService.saveBatch(listByteDanceCreatives);
-              return Result.ok("文件导入成功!数据行数:" + listByteDanceCreatives.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<ByteDanceCreative> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                ByteDanceCreative byteDanceCreative = JSON.parseObject(deString, ByteDanceCreative.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCreative, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<ByteDanceCreative> pageList = byteDanceCreativeService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "今日头条创意信息列表");
+        mv.addObject(NormalExcelConstants.CLASS, ByteDanceCreative.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("今日头条创意信息列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<ByteDanceCreative> listByteDanceCreatives = ExcelImportUtil.importExcel(file.getInputStream(), ByteDanceCreative.class, params);
+                byteDanceCreativeService.saveBatch(listByteDanceCreatives);
+                return Result.ok("文件导入成功!数据行数:" + listByteDanceCreatives.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
 
 }

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

@@ -13,6 +13,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.system.entity.SysCategory;
+import org.jeecg.modules.system.service.ISysCategoryService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -30,6 +32,7 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -40,6 +43,8 @@ import java.util.Map;
 public class KuaishouAdvertiserController {
     @Autowired
     private IKuaishouAdAccountService kuaishouAdAccountService;
+    @Autowired
+    private ISysCategoryService sysCategoryService;
     /**
      * 分页列表查询
      * @param kuaishouAdAccount
@@ -56,7 +61,46 @@ public class KuaishouAdvertiserController {
                                                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                           HttpServletRequest req) {
         Result<IPage<KuaishouAdAccount>> result = new Result<IPage<KuaishouAdAccount>>();
-        QueryWrapper<KuaishouAdAccount> queryWrapper = QueryGenerator.initQueryWrapper(kuaishouAdAccount, req.getParameterMap());
+        Map<String, String[]> paramMap = new HashMap<>(req.getParameterMap());
+        paramMap.remove("dataProcess");
+        paramMap.remove("industry");
+        paramMap.remove("name");
+        String industry = req.getParameter("industry");
+        String name = req.getParameter("name");
+        SysCategory sysCategory = sysCategoryService.getById(industry);
+        kuaishouAdAccount.setDataProcess(null);
+        kuaishouAdAccount.setIndustry(null);
+        QueryWrapper<KuaishouAdAccount> queryWrapper = QueryGenerator.initQueryWrapper(kuaishouAdAccount, paramMap);
+        String dataProcess = req.getParameter("dataProcess");
+        if (name != null) {
+            queryWrapper.like("name", "%" + name + "%");
+        }
+        if (sysCategory != null) {
+            queryWrapper.eq("industry_category", sysCategory.getName()).or()
+                    .eq("first_industry", sysCategory.getName()).or()
+                    .eq("second_industry", sysCategory.getName());
+        }
+        if (dataProcess != null) {
+            if (dataProcess.equals("industry")) {
+                queryWrapper.isNull("industry_category").or().isNull("first_industry").or().isNull("second_industry").isNull("industry_category").or().isNull("first_industry").or().isNull("second_industry").or().eq("second_industry", "").or().eq("second_industry", "").or().eq("second_industry", "");
+            } else if (dataProcess.equals("company")) {
+                queryWrapper.isNull("company").or().eq("company", "");
+            } else if (dataProcess.equals("product")) {
+                queryWrapper.isNull("product").or().eq("product", "");
+            } else if (dataProcess.equals("full")) {
+                queryWrapper.isNotNull("industry_category");
+                queryWrapper.ne("industry_category", "");
+                queryWrapper.isNotNull("first_industry");
+                queryWrapper.ne("first_industry", "");
+                queryWrapper.isNotNull("second_industry");
+                queryWrapper.ne("second_industry", "");
+                queryWrapper.isNotNull("company");
+                queryWrapper.ne("company", "");
+                queryWrapper.isNotNull("product");
+                queryWrapper.ne("product", "");
+            }
+        }
+
         Page<KuaishouAdAccount> page = new Page<KuaishouAdAccount>(pageNo, pageSize);
         IPage<KuaishouAdAccount> pageList = kuaishouAdAccountService.page(page, queryWrapper);
         result.setSuccess(true);
@@ -75,6 +119,13 @@ public class KuaishouAdvertiserController {
     public Result<KuaishouAdAccount> add(@RequestBody KuaishouAdAccount kuaishouAdAccount) {
         Result<KuaishouAdAccount> result = new Result<KuaishouAdAccount>();
         try {
+            String industry = kuaishouAdAccount.getIndustry();
+            SysCategory secondCategory = sysCategoryService.getById(industry);
+            kuaishouAdAccount.setSecondIndustry(secondCategory.getName());
+            SysCategory firstCategory = sysCategoryService.getById(secondCategory.getPid());
+            kuaishouAdAccount.setFirstIndustry(firstCategory.getName());
+            SysCategory industryCategory = sysCategoryService.getById(firstCategory.getPid());
+            kuaishouAdAccount.setIndustryCategory(industryCategory.getName());
             kuaishouAdAccountService.save(kuaishouAdAccount);
             result.success("添加成功!");
         } catch (Exception e) {
@@ -95,10 +146,21 @@ public class KuaishouAdvertiserController {
     public Result<KuaishouAdAccount> edit(@RequestBody KuaishouAdAccount kuaishouAdAccount) {
         Result<KuaishouAdAccount> result = new Result<KuaishouAdAccount>();
         KuaishouAdAccount kuaishouAdAccountEntity = kuaishouAdAccountService.getById(kuaishouAdAccount.getKsid());
+
         if(kuaishouAdAccountEntity==null) {
             result.error500("未找到对应实体");
         }else {
-            boolean ok = kuaishouAdAccountService.updateById(kuaishouAdAccount);
+            String industry = kuaishouAdAccount.getIndustry();
+            SysCategory secondCategory = sysCategoryService.getById(industry);
+            kuaishouAdAccount.setSecondIndustry(secondCategory.getName());
+            SysCategory firstCategory = sysCategoryService.getById(secondCategory.getPid());
+            kuaishouAdAccount.setFirstIndustry(firstCategory.getName());
+            SysCategory industryCategory = sysCategoryService.getById(firstCategory.getPid());
+            kuaishouAdAccount.setIndustryCategory(industryCategory.getName());
+            QueryWrapper<KuaishouAdAccount> queryWrapper = new QueryWrapper<KuaishouAdAccount>();
+            queryWrapper.eq("ksid", kuaishouAdAccount.getKsid());
+            boolean ok = kuaishouAdAccountService.update(kuaishouAdAccount, queryWrapper);
+//            boolean ok = kuaishouAdAccountService.updateById(kuaishouAdAccount);
             //TODO 返回false说明什么?
             if(ok) {
                 result.success("修改成功!");

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

@@ -140,7 +140,7 @@ public class ByteDanceAdvertiser {
     @ApiModelProperty(value = "updateTime")
 	private java.util.Date updateTime;
 
-	public ByteDanceAdvertiser(JSONObject dataObject, String accountId) {
+    public ByteDanceAdvertiser(JSONObject dataObject, String accountId) {
 		Long id = dataObject.getLong("id");
 		this.id=id;
 		this.advertiserId = accountId;
@@ -238,6 +238,6 @@ public class ByteDanceAdvertiser {
 		}
 	}
 
-	public ByteDanceAdvertiser() {
+    public ByteDanceAdvertiser() {
 	}
 }

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

@@ -34,11 +34,11 @@ public class ByteDanceAdvertiserBudget {
 	@Excel(name = "平台账号id", width = 15)
     @ApiModelProperty(value = "平台账号id")
 	private String advertiserId;
-	@Excel(name = "预算类型")
+    @Excel(name = "预算类型")
 	private java.lang.String budgetMode;
 	@Excel(name = "预算数量", width = 15)
     @ApiModelProperty(value = "预算数量")
-	private java.math.BigDecimal budget;
+    private java.math.BigDecimal budget;
 	/**createTime*/
     @ApiModelProperty(value = "createTime")
 	private java.util.Date createTime;
@@ -46,10 +46,10 @@ public class ByteDanceAdvertiserBudget {
     @ApiModelProperty(value = "updateTime")
 	private java.util.Date updateTime;
 
-	public ByteDanceAdvertiserBudget() {
-	}
+    public ByteDanceAdvertiserBudget() {
+    }
 
-	public ByteDanceAdvertiserBudget(JSONObject dataObject, String accountId) {
+    public ByteDanceAdvertiserBudget(JSONObject dataObject, String accountId) {
 		Long advertiserId = dataObject.getLong("advertiser_id");
 		this.id = advertiserId;
 		this.advertiserId = accountId;
@@ -57,7 +57,7 @@ public class ByteDanceAdvertiserBudget {
 		if (null!=budget_mode&&!"".equals(budget_mode.trim())){
 			this.budgetMode =budget_mode;
 		}
-		BigDecimal budget = dataObject.getBigDecimal("budget");
+        BigDecimal budget = dataObject.getBigDecimal("budget");
 		if (null!=budget){
 			this.budget =budget;
 		}

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

@@ -65,13 +65,13 @@ public class ByteDanceCampaign {
 	private String modifyTime;
 	@Excel(name = "广告组状态", width = 15)
     @ApiModelProperty(value = "广告组状态")
-	private java.lang.String status;
-	/**
-	 * optStatus
-	 */
-	@Excel(name = "optStatus", width = 15)
-	@ApiModelProperty(value = "optStatus")
-	private java.lang.String optStatus;
+    private java.lang.String status;
+    /**
+     * optStatus
+     */
+    @Excel(name = "optStatus", width = 15)
+    @ApiModelProperty(value = "optStatus")
+    private java.lang.String optStatus;
 	/**广告组创建时间*/
 	@Excel(name = "广告组创建时间", width = 15)
     @ApiModelProperty(value = "广告组创建时间")
@@ -87,10 +87,10 @@ public class ByteDanceCampaign {
     @ApiModelProperty(value = "updateTime")
 	private java.util.Date updateTime;
 
-	public ByteDanceCampaign() {
-	}
+    public ByteDanceCampaign() {
+    }
 
-	public ByteDanceCampaign(Long id, String advertiserId, Long toutiaoId, String name, BigDecimal budget, String budgetMode, String landingType, String modifyTime, String status, String optStatus, String campaignCreateTime, String campaignModifyTime, Date createTime, Date updateTime) {
+    public ByteDanceCampaign(Long id, String advertiserId, Long toutiaoId, String name, BigDecimal budget, String budgetMode, String landingType, String modifyTime, String status, String optStatus, String campaignCreateTime, String campaignModifyTime, Date createTime, Date updateTime) {
 		this.id = id;
 		this.advertiserId = advertiserId;
 		this.toutiaoId = toutiaoId;
@@ -105,9 +105,9 @@ public class ByteDanceCampaign {
 		this.campaignModifyTime = campaignModifyTime;
 		this.createTime = createTime;
 		this.updateTime = updateTime;
-	}
+    }
 
-	public ByteDanceCampaign(JSONObject dataObject, String accountId) {
+    public ByteDanceCampaign(JSONObject dataObject, String accountId) {
 		Long id = dataObject.getLong("id");
 		this.id = id;
 		this.advertiserId = accountId;
@@ -150,10 +150,10 @@ public class ByteDanceCampaign {
 		String campaign_modify_time = dataObject.getString("campaign_modify_time");
 		if (null!=campaign_modify_time&&!"".equals(campaign_modify_time.trim())){
 			this.campaignModifyTime =campaign_modify_time;
-		}
-	}
+        }
+    }
 
-	public ByteDanceCampaign(Long id, CTopOauthToken oauthToken, String campaignName, String budgetMode, Integer budget, String landingType) {
+    public ByteDanceCampaign(Long id, CTopOauthToken oauthToken, String campaignName, String budgetMode, Integer budget, String landingType) {
 		this.id = id;
 		this.advertiserId = oauthToken.getAdvertiserId();
 		this.name = campaignName;

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

@@ -53,13 +53,13 @@ public class ByteDanceCreativeMaterial {
 	/**创意状态*/
 	@Excel(name = "创意状态", width = 15)
     @ApiModelProperty(value = "创意状态")
-	private String status;
-	/**
-	 * 创意状态
-	 */
+    private String status;
+    /**
+     * 创意状态
+     */
 	@Excel(name = "创意状态", width = 15)
 	@ApiModelProperty(value = "创意状态")
-	private String optStatus;
+    private String optStatus;
 	/**创意类型*/
 	@Excel(name = "创意类型", width = 15)
     @ApiModelProperty(value = "创意类型")
@@ -75,10 +75,10 @@ public class ByteDanceCreativeMaterial {
     @ApiModelProperty(value = "updateTime")
 	private Date updateTime;
 
-	public ByteDanceCreativeMaterial() {
-	}
+    public ByteDanceCreativeMaterial() {
+    }
 
-	public ByteDanceCreativeMaterial(JSONObject dataObject, String accountId) {
+    public ByteDanceCreativeMaterial(JSONObject dataObject, String accountId) {
 		this.id = dataObject.getLong("id");
 		this.toutiaoId = dataObject.getLong("advertiser_id");
 

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

@@ -64,7 +64,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
             resultMap.put("message","广告主信息不存在");
             return resultMap;
         }
-        for (int i = 0; i<data.size(); i++){
+        for (int i = 0; i < data.size(); i++) {
             JSONObject dataObject = data.getJSONObject(i);
             ByteDanceAdvertiser advertiser = new ByteDanceAdvertiser(dataObject, accountId);
             //清除清数据,插入新数据
@@ -76,7 +76,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
         return resultMap;
     }
 
-    private void getAdvertiserPlanByPageNumber(String accountId, Integer pageNumber, String ids){
+    private void getAdvertiserPlanByPageNumber(String accountId, Integer pageNumber, String ids) {
         CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config","bytedance_api_url")+PropertiesUtils.getValue("bytedance_config","bytedance_v2_ad_get");
@@ -91,7 +91,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
         if(null!=ids&&!"".equals(ids.trim())){
             String[] idsArray = ids.split(",");
             JSONArray filterIdsArray = new JSONArray();
-            for (int i=0; i<idsArray.length; i++){
+            for (int i = 0; i < idsArray.length; i++) {
                 Long id = Long.parseLong(idsArray[i]);
                 filterIdsArray.add(id);
             }
@@ -112,7 +112,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
             logger.info("获取广告主广告计划信息不存在==》accountId:{},message:{}",accountId,jsonObject.getString("message"));
             return ;
         }
-        for (int i = 0; i<data.size(); i++){
+        for (int i = 0; i < data.size(); i++) {
             JSONObject dataObject = data.getJSONObject(i);
             ByteDanceAdvertisePlan advertisePlan = new ByteDanceAdvertisePlan(dataObject, accountId);
             //清除清数据,插入新数据
@@ -172,7 +172,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
             resultMap.put("message","获取广告主预算信息完成");
             return resultMap;
         }
-        for (int i = 0; i<data.size(); i++){
+        for (int i = 0; i < data.size(); i++) {
             JSONObject dataObject = data.getJSONObject(i);
             ByteDanceAdvertiserBudget advertiserBudget = new ByteDanceAdvertiserBudget(dataObject, accountId);
             //清除清数据,插入新数据
@@ -223,7 +223,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
             resultMap.put("message","获取广告主预算信息完成");
             return resultMap;
         }
-        for (int i = 0; i<data.size(); i++){
+        for (int i = 0; i < data.size(); i++) {
             JSONObject dataObject = data.getJSONObject(i);
             ByteDanceCreativeMaterial material = new ByteDanceCreativeMaterial(dataObject, accountId);
             //清除清数据,插入新数据
@@ -283,7 +283,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
         JSONArray ids = new JSONArray();
         String [] getIds = campaignIds.split(",");
         if(null!=getIds&&getIds.length>0){
-            for(int i = 0; i<getIds.length; i++){
+            for (int i = 0; i < getIds.length; i++) {
                 ids.add(Long.parseLong(getIds[i]));
             }
         }
@@ -317,7 +317,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
         }
         JSONArray getCampaignIds =  data.getJSONArray("campaign_ids");
         if(null!=getCampaignIds&&getCampaignIds.size()>0){
-            for(int i = 0; i<getCampaignIds.size(); i++){
+            for (int i = 0; i < getCampaignIds.size(); i++) {
                 Long id = getCampaignIds.getLong(i);
                 ByteDanceCampaign campaign = campaignMapper.selectById(id);
                 if(null!=campaign){
@@ -396,7 +396,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
         JSONArray ids = new JSONArray();
         String [] getIds = adIds.split(",");
         if(null!=getIds&&getIds.length>0){
-            for(int i = 0; i<getIds.length; i++){
+            for (int i = 0; i < getIds.length; i++) {
                 ids.add(Long.parseLong(getIds[i]));
             }
         }
@@ -446,7 +446,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
         String [] getadIds = adIds.split(",");
         String [] getBids = bids.split(",");
         if(null!=getadIds&&getadIds.length>0){
-            for(int i=0; i<getadIds.length; i++){
+            for (int i = 0; i < getadIds.length; i++) {
                 JSONObject object = new JSONObject();
                 Long ad_id = Long.parseLong(getadIds[i]);
                 Long bid = Long.parseLong(getBids[i]);
@@ -500,7 +500,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
         String [] getadIds = adIds.split(",");
         String [] getBudgets = budgets.split(",");
         if(null!=getadIds&&getadIds.length>0){
-            for(int i=0; i<getadIds.length; i++){
+            for (int i = 0; i < getadIds.length; i++) {
                 JSONObject object = new JSONObject();
                 Long ad_id = Long.parseLong(getadIds[i]);
                 Long budget = Long.parseLong(getBudgets[i]);
@@ -551,7 +551,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
         JSONArray ids = new JSONArray();
         String [] getCreativeIds = creativeIds.split(",");
         if(null!=getCreativeIds&&getCreativeIds.length>0){
-            for(int i=0; i<getCreativeIds.length; i++){
+            for (int i = 0; i < getCreativeIds.length; i++) {
                 ids.add(Long.parseLong(getCreativeIds[i]));
             }
         }
@@ -655,7 +655,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     @Autowired
     private ByteDanceCreativeMaterialMapper creativeMaterialMapper;
 
-    private void getAdvertiserCreativeByPageNumber(String accountId, Integer pageNumber, String ids){
+    private void getAdvertiserCreativeByPageNumber(String accountId, Integer pageNumber, String ids) {
         CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config","bytedance_api_url")+PropertiesUtils.getValue("bytedance_config","bytedance_v2_creative_get");
@@ -668,7 +668,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
         if(null!=ids&&!"".equals(ids.trim())){
             String[] idsArray = ids.split(",");
             JSONArray filterIdsArray = new JSONArray();
-            for (int i=0; i<idsArray.length; i++){
+            for (int i = 0; i < idsArray.length; i++) {
                 Long id = Long.parseLong(idsArray[i]);
                 filterIdsArray.add(id);
             }
@@ -690,7 +690,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
             logger.info("广告主广告创意信息不存在==》accountId:{},message:{}",accountId,jsonObject.getString("message"));
             return ;
         }
-        for (int i = 0; i<data.size(); i++){
+        for (int i = 0; i < data.size(); i++) {
             JSONObject dataObject = data.getJSONObject(i);
             ByteDanceCreative creative = new ByteDanceCreative(dataObject, accountId);
             //清除清数据,插入新数据
@@ -705,7 +705,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     @Autowired
     private ByteDanceAdvertiserBudgetMapper advertiserBudgetMapper;
 
-    private void getAdvertiserCampaignByPageNumber(String accountId, Integer pageNumber, String ids){
+    private void getAdvertiserCampaignByPageNumber(String accountId, Integer pageNumber, String ids) {
         CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config","bytedance_api_url")+PropertiesUtils.getValue("bytedance_config","bytedance_v2_campaign_get");
@@ -718,7 +718,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
         if(null!=ids&&!"".equals(ids.trim())){
             String[] idsArray = ids.split(",");
             JSONArray filterIdsArray = new JSONArray();
-            for (int i=0; i<idsArray.length; i++){
+            for (int i = 0; i < idsArray.length; i++) {
                 Long id = Long.parseLong(idsArray[i]);
                 filterIdsArray.add(id);
             }
@@ -740,7 +740,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
             logger.info("获取广告主广告组信息不存在==》accountId:{},message:{}",accountId,jsonObject.getString("message"));
             return ;
         }
-        for (int i = 0; i<data.size(); i++){
+        for (int i = 0; i < data.size(); i++) {
             JSONObject dataObject = data.getJSONObject(i);
             ByteDanceCampaign campaign = new ByteDanceCampaign(dataObject, accountId);
             //清除清数据,插入新数据

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

@@ -8,13 +8,16 @@ 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.KuaiShouAppCreate;
 import org.jeecg.modules.kuaishou.service.IKuaiShouAppCreateService;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,210 +38,216 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
+/**
  * @Description: 创建应用
  * @Author: jeecg-boot
- * @Date:   2019-07-26
+ * @Date: 2019-07-26
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="创建应用")
+@Api(tags = "创建应用")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouAppCreate")
 public class KuaiShouAppCreateController {
-	@Autowired
-	private IKuaiShouAppCreateService kuaiShouAppCreateService;
-	
-	/**
-	  * 分页列表查询
-	 * @param kuaiShouAppCreate
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "创建应用-分页列表查询")
-	@ApiOperation(value="创建应用-分页列表查询", notes="创建应用-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouAppCreate>> queryPageList(KuaiShouAppCreate kuaiShouAppCreate,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouAppCreate>> result = new Result<IPage<KuaiShouAppCreate>>();
-		QueryWrapper<KuaiShouAppCreate> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAppCreate, req.getParameterMap());
-		Page<KuaiShouAppCreate> page = new Page<KuaiShouAppCreate>(pageNo, pageSize);
-		IPage<KuaiShouAppCreate> pageList = kuaiShouAppCreateService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param kuaiShouAppCreate
-	 * @return
-	 */
-	@AutoLog(value = "创建应用-添加")
-	@ApiOperation(value="创建应用-添加", notes="创建应用-添加")
-	@PostMapping(value = "/add")
-	public Result<KuaiShouAppCreate> add(@RequestBody KuaiShouAppCreate kuaiShouAppCreate) {
-		Result<KuaiShouAppCreate> result = new Result<KuaiShouAppCreate>();
-		try {
-			kuaiShouAppCreateService.save(kuaiShouAppCreate);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param kuaiShouAppCreate
-	 * @return
-	 */
-	@AutoLog(value = "创建应用-编辑")
-	@ApiOperation(value="创建应用-编辑", notes="创建应用-编辑")
-	@PutMapping(value = "/edit")
-	public Result<KuaiShouAppCreate> edit(@RequestBody KuaiShouAppCreate kuaiShouAppCreate) {
-		Result<KuaiShouAppCreate> result = new Result<KuaiShouAppCreate>();
-		KuaiShouAppCreate kuaiShouAppCreateEntity = kuaiShouAppCreateService.getById(kuaiShouAppCreate.getId());
-		if(kuaiShouAppCreateEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = kuaiShouAppCreateService.updateById(kuaiShouAppCreate);
-			//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 {
-			kuaiShouAppCreateService.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "创建应用-批量删除")
-	@ApiOperation(value="创建应用-批量删除", notes="创建应用-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<KuaiShouAppCreate> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouAppCreate> result = new Result<KuaiShouAppCreate>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.kuaiShouAppCreateService.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<KuaiShouAppCreate> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouAppCreate> result = new Result<KuaiShouAppCreate>();
-		KuaiShouAppCreate kuaiShouAppCreate = kuaiShouAppCreateService.getById(id);
-		if(kuaiShouAppCreate==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(kuaiShouAppCreate);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouAppCreate> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouAppCreate kuaiShouAppCreate = JSON.parseObject(deString, KuaiShouAppCreate.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAppCreate, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouAppCreate> pageList = kuaiShouAppCreateService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "创建应用列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouAppCreate.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<KuaiShouAppCreate> listKuaiShouAppCreates = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouAppCreate.class, params);
-              kuaiShouAppCreateService.saveBatch(listKuaiShouAppCreates);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouAppCreates.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("文件导入失败!");
-  }
+    @Autowired
+    private IKuaiShouAppCreateService kuaiShouAppCreateService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param kuaiShouAppCreate
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "创建应用-分页列表查询")
+    @ApiOperation(value = "创建应用-分页列表查询", notes = "创建应用-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<KuaiShouAppCreate>> queryPageList(KuaiShouAppCreate kuaiShouAppCreate,
+                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                          HttpServletRequest req) {
+        Result<IPage<KuaiShouAppCreate>> result = new Result<IPage<KuaiShouAppCreate>>();
+        QueryWrapper<KuaiShouAppCreate> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAppCreate, req.getParameterMap());
+        Page<KuaiShouAppCreate> page = new Page<KuaiShouAppCreate>(pageNo, pageSize);
+        IPage<KuaiShouAppCreate> pageList = kuaiShouAppCreateService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param kuaiShouAppCreate
+     * @return
+     */
+    @AutoLog(value = "创建应用-添加")
+    @ApiOperation(value = "创建应用-添加", notes = "创建应用-添加")
+    @PostMapping(value = "/add")
+    public Result<KuaiShouAppCreate> add(@RequestBody KuaiShouAppCreate kuaiShouAppCreate) {
+        Result<KuaiShouAppCreate> result = new Result<KuaiShouAppCreate>();
+        try {
+            kuaiShouAppCreateService.save(kuaiShouAppCreate);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param kuaiShouAppCreate
+     * @return
+     */
+    @AutoLog(value = "创建应用-编辑")
+    @ApiOperation(value = "创建应用-编辑", notes = "创建应用-编辑")
+    @PutMapping(value = "/edit")
+    public Result<KuaiShouAppCreate> edit(@RequestBody KuaiShouAppCreate kuaiShouAppCreate) {
+        Result<KuaiShouAppCreate> result = new Result<KuaiShouAppCreate>();
+        KuaiShouAppCreate kuaiShouAppCreateEntity = kuaiShouAppCreateService.getById(kuaiShouAppCreate.getId());
+        if (kuaiShouAppCreateEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = kuaiShouAppCreateService.updateById(kuaiShouAppCreate);
+            //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 {
+            kuaiShouAppCreateService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "创建应用-批量删除")
+    @ApiOperation(value = "创建应用-批量删除", notes = "创建应用-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<KuaiShouAppCreate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouAppCreate> result = new Result<KuaiShouAppCreate>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.kuaiShouAppCreateService.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<KuaiShouAppCreate> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouAppCreate> result = new Result<KuaiShouAppCreate>();
+        KuaiShouAppCreate kuaiShouAppCreate = kuaiShouAppCreateService.getById(id);
+        if (kuaiShouAppCreate == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouAppCreate);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouAppCreate> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouAppCreate kuaiShouAppCreate = JSON.parseObject(deString, KuaiShouAppCreate.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAppCreate, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouAppCreate> pageList = kuaiShouAppCreateService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "创建应用列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouAppCreate.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<KuaiShouAppCreate> listKuaiShouAppCreates = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouAppCreate.class, params);
+                kuaiShouAppCreateService.saveBatch(listKuaiShouAppCreates);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouAppCreates.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("文件导入失败!");
+    }
 
 }

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

@@ -36,38 +36,38 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
  /**
- * @Description: 广告组-app信息
+  * @Description: 广告组-app信息
  * @Author: jeecg-boot
- * @Date:   2019-07-23
+  * @Date: 2019-07-23
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="广告组-app信息")
+@Api(tags = "广告组-app信息")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouAppInfo")
 public class KuaiShouAppInfoController {
 	@Autowired
-	private IKuaiShouAppInfoService kuaiShouAppInfoService;
+    private IKuaiShouAppInfoService kuaiShouAppInfoService;
 	
 	/**
 	  * 分页列表查询
-	 * @param kuaiShouAppInfo
+     * @param kuaiShouAppInfo
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "广告组-app信息-分页列表查询")
-	@ApiOperation(value="广告组-app信息-分页列表查询", notes="广告组-app信息-分页列表查询")
+    @AutoLog(value = "广告组-app信息-分页列表查询")
+    @ApiOperation(value = "广告组-app信息-分页列表查询", notes = "广告组-app信息-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouAppInfo>> queryPageList(KuaiShouAppInfo kuaiShouAppInfo,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouAppInfo>> result = new Result<IPage<KuaiShouAppInfo>>();
-		QueryWrapper<KuaiShouAppInfo> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAppInfo, req.getParameterMap());
-		Page<KuaiShouAppInfo> page = new Page<KuaiShouAppInfo>(pageNo, pageSize);
-		IPage<KuaiShouAppInfo> pageList = kuaiShouAppInfoService.page(page, queryWrapper);
+    public Result<IPage<KuaiShouAppInfo>> queryPageList(KuaiShouAppInfo kuaiShouAppInfo,
+                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                        HttpServletRequest req) {
+        Result<IPage<KuaiShouAppInfo>> result = new Result<IPage<KuaiShouAppInfo>>();
+        QueryWrapper<KuaiShouAppInfo> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAppInfo, req.getParameterMap());
+        Page<KuaiShouAppInfo> page = new Page<KuaiShouAppInfo>(pageNo, pageSize);
+        IPage<KuaiShouAppInfo> pageList = kuaiShouAppInfoService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		return result;
@@ -75,16 +75,16 @@ public class KuaiShouAppInfoController {
 	
 	/**
 	  *   添加
-	 * @param kuaiShouAppInfo
+     * @param kuaiShouAppInfo
 	 * @return
 	 */
-	@AutoLog(value = "广告组-app信息-添加")
-	@ApiOperation(value="广告组-app信息-添加", notes="广告组-app信息-添加")
+    @AutoLog(value = "广告组-app信息-添加")
+    @ApiOperation(value = "广告组-app信息-添加", notes = "广告组-app信息-添加")
 	@PostMapping(value = "/add")
-	public Result<KuaiShouAppInfo> add(@RequestBody KuaiShouAppInfo kuaiShouAppInfo) {
-		Result<KuaiShouAppInfo> result = new Result<KuaiShouAppInfo>();
+    public Result<KuaiShouAppInfo> add(@RequestBody KuaiShouAppInfo kuaiShouAppInfo) {
+        Result<KuaiShouAppInfo> result = new Result<KuaiShouAppInfo>();
 		try {
-			kuaiShouAppInfoService.save(kuaiShouAppInfo);
+            kuaiShouAppInfoService.save(kuaiShouAppInfo);
 			result.success("添加成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
@@ -95,19 +95,19 @@ public class KuaiShouAppInfoController {
 	
 	/**
 	  *  编辑
-	 * @param kuaiShouAppInfo
+     * @param kuaiShouAppInfo
 	 * @return
 	 */
-	@AutoLog(value = "广告组-app信息-编辑")
-	@ApiOperation(value="广告组-app信息-编辑", notes="广告组-app信息-编辑")
+    @AutoLog(value = "广告组-app信息-编辑")
+    @ApiOperation(value = "广告组-app信息-编辑", notes = "广告组-app信息-编辑")
 	@PutMapping(value = "/edit")
-	public Result<KuaiShouAppInfo> edit(@RequestBody KuaiShouAppInfo kuaiShouAppInfo) {
-		Result<KuaiShouAppInfo> result = new Result<KuaiShouAppInfo>();
-		KuaiShouAppInfo kuaiShouAppInfoEntity = kuaiShouAppInfoService.getById(kuaiShouAppInfo.getId());
-		if(kuaiShouAppInfoEntity==null) {
+    public Result<KuaiShouAppInfo> edit(@RequestBody KuaiShouAppInfo kuaiShouAppInfo) {
+        Result<KuaiShouAppInfo> result = new Result<KuaiShouAppInfo>();
+        KuaiShouAppInfo kuaiShouAppInfoEntity = kuaiShouAppInfoService.getById(kuaiShouAppInfo.getId());
+        if (kuaiShouAppInfoEntity == null) {
 			result.error500("未找到对应实体");
 		}else {
-			boolean ok = kuaiShouAppInfoService.updateById(kuaiShouAppInfo);
+            boolean ok = kuaiShouAppInfoService.updateById(kuaiShouAppInfo);
 			//TODO 返回false说明什么?
 			if(ok) {
 				result.success("修改成功!");
@@ -122,12 +122,12 @@ public class KuaiShouAppInfoController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "广告组-app信息-通过id删除")
-	@ApiOperation(value="广告组-app信息-通过id删除", notes="广告组-app信息-通过id删除")
+    @AutoLog(value = "广告组-app信息-通过id删除")
+    @ApiOperation(value = "广告组-app信息-通过id删除", notes = "广告组-app信息-通过id删除")
 	@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("删除失败!");
@@ -140,15 +140,15 @@ public class KuaiShouAppInfoController {
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "广告组-app信息-批量删除")
-	@ApiOperation(value="广告组-app信息-批量删除", notes="广告组-app信息-批量删除")
+    @AutoLog(value = "广告组-app信息-批量删除")
+    @ApiOperation(value = "广告组-app信息-批量删除", notes = "广告组-app信息-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
-	public Result<KuaiShouAppInfo> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouAppInfo> result = new Result<KuaiShouAppInfo>();
+    public Result<KuaiShouAppInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouAppInfo> result = new Result<KuaiShouAppInfo>();
 		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;
@@ -159,16 +159,16 @@ public class KuaiShouAppInfoController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "广告组-app信息-通过id查询")
-	@ApiOperation(value="广告组-app信息-通过id查询", notes="广告组-app信息-通过id查询")
+    @AutoLog(value = "广告组-app信息-通过id查询")
+    @ApiOperation(value = "广告组-app信息-通过id查询", notes = "广告组-app信息-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<KuaiShouAppInfo> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouAppInfo> result = new Result<KuaiShouAppInfo>();
-		KuaiShouAppInfo kuaiShouAppInfo = kuaiShouAppInfoService.getById(id);
-		if(kuaiShouAppInfo==null) {
+    public Result<KuaiShouAppInfo> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouAppInfo> result = new Result<KuaiShouAppInfo>();
+        KuaiShouAppInfo kuaiShouAppInfo = kuaiShouAppInfoService.getById(id);
+        if (kuaiShouAppInfo == null) {
 			result.error500("未找到对应实体");
 		}else {
-			result.setResult(kuaiShouAppInfo);
+            result.setResult(kuaiShouAppInfo);
 			result.setSuccess(true);
 		}
 		return result;

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

@@ -8,13 +8,16 @@ 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.KuaiShouAppList;
 import org.jeecg.modules.kuaishou.service.IKuaiShouAppListService;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,210 +38,216 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
+/**
  * @Description: 快手-应用列表
  * @Author: jeecg-boot
- * @Date:   2019-07-26
+ * @Date: 2019-07-26
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="快手-应用列表")
+@Api(tags = "快手-应用列表")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouAppList")
 public class KuaiShouAppListController {
-	@Autowired
-	private IKuaiShouAppListService kuaiShouAppListService;
-	
-	/**
-	  * 分页列表查询
-	 * @param kuaiShouAppList
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "快手-应用列表-分页列表查询")
-	@ApiOperation(value="快手-应用列表-分页列表查询", notes="快手-应用列表-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouAppList>> queryPageList(KuaiShouAppList kuaiShouAppList,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouAppList>> result = new Result<IPage<KuaiShouAppList>>();
-		QueryWrapper<KuaiShouAppList> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAppList, req.getParameterMap());
-		Page<KuaiShouAppList> page = new Page<KuaiShouAppList>(pageNo, pageSize);
-		IPage<KuaiShouAppList> pageList = kuaiShouAppListService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param kuaiShouAppList
-	 * @return
-	 */
-	@AutoLog(value = "快手-应用列表-添加")
-	@ApiOperation(value="快手-应用列表-添加", notes="快手-应用列表-添加")
-	@PostMapping(value = "/add")
-	public Result<KuaiShouAppList> add(@RequestBody KuaiShouAppList kuaiShouAppList) {
-		Result<KuaiShouAppList> result = new Result<KuaiShouAppList>();
-		try {
-			kuaiShouAppListService.save(kuaiShouAppList);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param kuaiShouAppList
-	 * @return
-	 */
-	@AutoLog(value = "快手-应用列表-编辑")
-	@ApiOperation(value="快手-应用列表-编辑", notes="快手-应用列表-编辑")
-	@PutMapping(value = "/edit")
-	public Result<KuaiShouAppList> edit(@RequestBody KuaiShouAppList kuaiShouAppList) {
-		Result<KuaiShouAppList> result = new Result<KuaiShouAppList>();
-		KuaiShouAppList kuaiShouAppListEntity = kuaiShouAppListService.getById(kuaiShouAppList.getId());
-		if(kuaiShouAppListEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = kuaiShouAppListService.updateById(kuaiShouAppList);
-			//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 {
-			kuaiShouAppListService.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<KuaiShouAppList> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouAppList> result = new Result<KuaiShouAppList>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.kuaiShouAppListService.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<KuaiShouAppList> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouAppList> result = new Result<KuaiShouAppList>();
-		KuaiShouAppList kuaiShouAppList = kuaiShouAppListService.getById(id);
-		if(kuaiShouAppList==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(kuaiShouAppList);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouAppList> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouAppList kuaiShouAppList = JSON.parseObject(deString, KuaiShouAppList.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAppList, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouAppList> pageList = kuaiShouAppListService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "快手-应用列表列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouAppList.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<KuaiShouAppList> listKuaiShouAppLists = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouAppList.class, params);
-              kuaiShouAppListService.saveBatch(listKuaiShouAppLists);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouAppLists.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("文件导入失败!");
-  }
+    @Autowired
+    private IKuaiShouAppListService kuaiShouAppListService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param kuaiShouAppList
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "快手-应用列表-分页列表查询")
+    @ApiOperation(value = "快手-应用列表-分页列表查询", notes = "快手-应用列表-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<KuaiShouAppList>> queryPageList(KuaiShouAppList kuaiShouAppList,
+                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                        HttpServletRequest req) {
+        Result<IPage<KuaiShouAppList>> result = new Result<IPage<KuaiShouAppList>>();
+        QueryWrapper<KuaiShouAppList> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAppList, req.getParameterMap());
+        Page<KuaiShouAppList> page = new Page<KuaiShouAppList>(pageNo, pageSize);
+        IPage<KuaiShouAppList> pageList = kuaiShouAppListService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param kuaiShouAppList
+     * @return
+     */
+    @AutoLog(value = "快手-应用列表-添加")
+    @ApiOperation(value = "快手-应用列表-添加", notes = "快手-应用列表-添加")
+    @PostMapping(value = "/add")
+    public Result<KuaiShouAppList> add(@RequestBody KuaiShouAppList kuaiShouAppList) {
+        Result<KuaiShouAppList> result = new Result<KuaiShouAppList>();
+        try {
+            kuaiShouAppListService.save(kuaiShouAppList);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param kuaiShouAppList
+     * @return
+     */
+    @AutoLog(value = "快手-应用列表-编辑")
+    @ApiOperation(value = "快手-应用列表-编辑", notes = "快手-应用列表-编辑")
+    @PutMapping(value = "/edit")
+    public Result<KuaiShouAppList> edit(@RequestBody KuaiShouAppList kuaiShouAppList) {
+        Result<KuaiShouAppList> result = new Result<KuaiShouAppList>();
+        KuaiShouAppList kuaiShouAppListEntity = kuaiShouAppListService.getById(kuaiShouAppList.getId());
+        if (kuaiShouAppListEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = kuaiShouAppListService.updateById(kuaiShouAppList);
+            //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 {
+            kuaiShouAppListService.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<KuaiShouAppList> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouAppList> result = new Result<KuaiShouAppList>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.kuaiShouAppListService.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<KuaiShouAppList> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouAppList> result = new Result<KuaiShouAppList>();
+        KuaiShouAppList kuaiShouAppList = kuaiShouAppListService.getById(id);
+        if (kuaiShouAppList == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouAppList);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouAppList> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouAppList kuaiShouAppList = JSON.parseObject(deString, KuaiShouAppList.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouAppList, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouAppList> pageList = kuaiShouAppListService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-应用列表列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouAppList.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<KuaiShouAppList> listKuaiShouAppLists = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouAppList.class, params);
+                kuaiShouAppListService.saveBatch(listKuaiShouAppLists);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouAppLists.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("文件导入失败!");
+    }
 
 }

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

@@ -36,38 +36,38 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
  /**
- * @Description: 快手-获取广告计划信息
+  * @Description: 快手-获取广告计划信息
  * @Author: jeecg-boot
- * @Date:   2019-07-23
+  * @Date: 2019-07-23
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="快手-获取广告计划信息")
+@Api(tags = "快手-获取广告计划信息")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouCampaign")
 public class KuaiShouCampaignController {
 	@Autowired
-	private IKuaiShouCampaignService kuaiShouCampaignService;
+    private IKuaiShouCampaignService kuaiShouCampaignService;
 	
 	/**
 	  * 分页列表查询
-	 * @param kuaiShouCampaign
+     * @param kuaiShouCampaign
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "快手-获取广告计划信息-分页列表查询")
-	@ApiOperation(value="快手-获取广告计划信息-分页列表查询", notes="快手-获取广告计划信息-分页列表查询")
+    @AutoLog(value = "快手-获取广告计划信息-分页列表查询")
+    @ApiOperation(value = "快手-获取广告计划信息-分页列表查询", notes = "快手-获取广告计划信息-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouCampaign>> queryPageList(KuaiShouCampaign kuaiShouCampaign,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouCampaign>> result = new Result<IPage<KuaiShouCampaign>>();
-		QueryWrapper<KuaiShouCampaign> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaign, req.getParameterMap());
-		Page<KuaiShouCampaign> page = new Page<KuaiShouCampaign>(pageNo, pageSize);
-		IPage<KuaiShouCampaign> pageList = kuaiShouCampaignService.page(page, queryWrapper);
+    public Result<IPage<KuaiShouCampaign>> queryPageList(KuaiShouCampaign kuaiShouCampaign,
+                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                         HttpServletRequest req) {
+        Result<IPage<KuaiShouCampaign>> result = new Result<IPage<KuaiShouCampaign>>();
+        QueryWrapper<KuaiShouCampaign> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaign, req.getParameterMap());
+        Page<KuaiShouCampaign> page = new Page<KuaiShouCampaign>(pageNo, pageSize);
+        IPage<KuaiShouCampaign> pageList = kuaiShouCampaignService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		return result;
@@ -75,16 +75,16 @@ public class KuaiShouCampaignController {
 	
 	/**
 	  *   添加
-	 * @param kuaiShouCampaign
+     * @param kuaiShouCampaign
 	 * @return
 	 */
-	@AutoLog(value = "快手-获取广告计划信息-添加")
-	@ApiOperation(value="快手-获取广告计划信息-添加", notes="快手-获取广告计划信息-添加")
+    @AutoLog(value = "快手-获取广告计划信息-添加")
+    @ApiOperation(value = "快手-获取广告计划信息-添加", notes = "快手-获取广告计划信息-添加")
 	@PostMapping(value = "/add")
-	public Result<KuaiShouCampaign> add(@RequestBody KuaiShouCampaign kuaiShouCampaign) {
-		Result<KuaiShouCampaign> result = new Result<KuaiShouCampaign>();
+    public Result<KuaiShouCampaign> add(@RequestBody KuaiShouCampaign kuaiShouCampaign) {
+        Result<KuaiShouCampaign> result = new Result<KuaiShouCampaign>();
 		try {
-			kuaiShouCampaignService.save(kuaiShouCampaign);
+            kuaiShouCampaignService.save(kuaiShouCampaign);
 			result.success("添加成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
@@ -95,19 +95,19 @@ public class KuaiShouCampaignController {
 	
 	/**
 	  *  编辑
-	 * @param kuaiShouCampaign
+     * @param kuaiShouCampaign
 	 * @return
 	 */
-	@AutoLog(value = "快手-获取广告计划信息-编辑")
-	@ApiOperation(value="快手-获取广告计划信息-编辑", notes="快手-获取广告计划信息-编辑")
+    @AutoLog(value = "快手-获取广告计划信息-编辑")
+    @ApiOperation(value = "快手-获取广告计划信息-编辑", notes = "快手-获取广告计划信息-编辑")
 	@PutMapping(value = "/edit")
-	public Result<KuaiShouCampaign> edit(@RequestBody KuaiShouCampaign kuaiShouCampaign) {
-		Result<KuaiShouCampaign> result = new Result<KuaiShouCampaign>();
-		KuaiShouCampaign kuaiShouCampaignEntity = kuaiShouCampaignService.getById(kuaiShouCampaign.getId());
-		if(kuaiShouCampaignEntity==null) {
+    public Result<KuaiShouCampaign> edit(@RequestBody KuaiShouCampaign kuaiShouCampaign) {
+        Result<KuaiShouCampaign> result = new Result<KuaiShouCampaign>();
+        KuaiShouCampaign kuaiShouCampaignEntity = kuaiShouCampaignService.getById(kuaiShouCampaign.getId());
+        if (kuaiShouCampaignEntity == null) {
 			result.error500("未找到对应实体");
 		}else {
-			boolean ok = kuaiShouCampaignService.updateById(kuaiShouCampaign);
+            boolean ok = kuaiShouCampaignService.updateById(kuaiShouCampaign);
 			//TODO 返回false说明什么?
 			if(ok) {
 				result.success("修改成功!");
@@ -122,12 +122,12 @@ public class KuaiShouCampaignController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "快手-获取广告计划信息-通过id删除")
-	@ApiOperation(value="快手-获取广告计划信息-通过id删除", notes="快手-获取广告计划信息-通过id删除")
+    @AutoLog(value = "快手-获取广告计划信息-通过id删除")
+    @ApiOperation(value = "快手-获取广告计划信息-通过id删除", notes = "快手-获取广告计划信息-通过id删除")
 	@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("删除失败!");
@@ -140,15 +140,15 @@ public class KuaiShouCampaignController {
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "快手-获取广告计划信息-批量删除")
-	@ApiOperation(value="快手-获取广告计划信息-批量删除", notes="快手-获取广告计划信息-批量删除")
+    @AutoLog(value = "快手-获取广告计划信息-批量删除")
+    @ApiOperation(value = "快手-获取广告计划信息-批量删除", notes = "快手-获取广告计划信息-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
-	public Result<KuaiShouCampaign> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouCampaign> result = new Result<KuaiShouCampaign>();
+    public Result<KuaiShouCampaign> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouCampaign> result = new Result<KuaiShouCampaign>();
 		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;
@@ -159,16 +159,16 @@ public class KuaiShouCampaignController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "快手-获取广告计划信息-通过id查询")
-	@ApiOperation(value="快手-获取广告计划信息-通过id查询", notes="快手-获取广告计划信息-通过id查询")
+    @AutoLog(value = "快手-获取广告计划信息-通过id查询")
+    @ApiOperation(value = "快手-获取广告计划信息-通过id查询", notes = "快手-获取广告计划信息-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<KuaiShouCampaign> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouCampaign> result = new Result<KuaiShouCampaign>();
-		KuaiShouCampaign kuaiShouCampaign = kuaiShouCampaignService.getById(id);
-		if(kuaiShouCampaign==null) {
+    public Result<KuaiShouCampaign> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouCampaign> result = new Result<KuaiShouCampaign>();
+        KuaiShouCampaign kuaiShouCampaign = kuaiShouCampaignService.getById(id);
+        if (kuaiShouCampaign == null) {
 			result.error500("未找到对应实体");
 		}else {
-			result.setResult(kuaiShouCampaign);
+            result.setResult(kuaiShouCampaign);
 			result.setSuccess(true);
 		}
 		return result;

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

@@ -8,13 +8,16 @@ 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.KuaiShouCampaignCreate;
 import org.jeecg.modules.kuaishou.service.IKuaiShouCampaignCreateService;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,210 +38,216 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
+/**
  * @Description: 快手-创建广告计划
  * @Author: jeecg-boot
- * @Date:   2019-07-23
+ * @Date: 2019-07-23
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="快手-创建广告计划")
+@Api(tags = "快手-创建广告计划")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouCampaignCreate")
 public class KuaiShouCampaignCreateController {
-	@Autowired
-	private IKuaiShouCampaignCreateService kuaiShouCampaignCreateService;
-	
-	/**
-	  * 分页列表查询
-	 * @param kuaiShouCampaignCreate
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "快手-创建广告计划-分页列表查询")
-	@ApiOperation(value="快手-创建广告计划-分页列表查询", notes="快手-创建广告计划-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouCampaignCreate>> queryPageList(KuaiShouCampaignCreate kuaiShouCampaignCreate,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouCampaignCreate>> result = new Result<IPage<KuaiShouCampaignCreate>>();
-		QueryWrapper<KuaiShouCampaignCreate> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaignCreate, req.getParameterMap());
-		Page<KuaiShouCampaignCreate> page = new Page<KuaiShouCampaignCreate>(pageNo, pageSize);
-		IPage<KuaiShouCampaignCreate> pageList = kuaiShouCampaignCreateService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param kuaiShouCampaignCreate
-	 * @return
-	 */
-	@AutoLog(value = "快手-创建广告计划-添加")
-	@ApiOperation(value="快手-创建广告计划-添加", notes="快手-创建广告计划-添加")
-	@PostMapping(value = "/add")
-	public Result<KuaiShouCampaignCreate> add(@RequestBody KuaiShouCampaignCreate kuaiShouCampaignCreate) {
-		Result<KuaiShouCampaignCreate> result = new Result<KuaiShouCampaignCreate>();
-		try {
-			kuaiShouCampaignCreateService.save(kuaiShouCampaignCreate);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param kuaiShouCampaignCreate
-	 * @return
-	 */
-	@AutoLog(value = "快手-创建广告计划-编辑")
-	@ApiOperation(value="快手-创建广告计划-编辑", notes="快手-创建广告计划-编辑")
-	@PutMapping(value = "/edit")
-	public Result<KuaiShouCampaignCreate> edit(@RequestBody KuaiShouCampaignCreate kuaiShouCampaignCreate) {
-		Result<KuaiShouCampaignCreate> result = new Result<KuaiShouCampaignCreate>();
-		KuaiShouCampaignCreate kuaiShouCampaignCreateEntity = kuaiShouCampaignCreateService.getById(kuaiShouCampaignCreate.getId());
-		if(kuaiShouCampaignCreateEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = kuaiShouCampaignCreateService.updateById(kuaiShouCampaignCreate);
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "快手-创建广告计划-通过id删除")
-	@ApiOperation(value="快手-创建广告计划-通过id删除", notes="快手-创建广告计划-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
-			kuaiShouCampaignCreateService.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "快手-创建广告计划-批量删除")
-	@ApiOperation(value="快手-创建广告计划-批量删除", notes="快手-创建广告计划-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<KuaiShouCampaignCreate> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouCampaignCreate> result = new Result<KuaiShouCampaignCreate>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.kuaiShouCampaignCreateService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "快手-创建广告计划-通过id查询")
-	@ApiOperation(value="快手-创建广告计划-通过id查询", notes="快手-创建广告计划-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<KuaiShouCampaignCreate> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouCampaignCreate> result = new Result<KuaiShouCampaignCreate>();
-		KuaiShouCampaignCreate kuaiShouCampaignCreate = kuaiShouCampaignCreateService.getById(id);
-		if(kuaiShouCampaignCreate==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(kuaiShouCampaignCreate);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouCampaignCreate> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouCampaignCreate kuaiShouCampaignCreate = JSON.parseObject(deString, KuaiShouCampaignCreate.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaignCreate, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouCampaignCreate> pageList = kuaiShouCampaignCreateService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "快手-创建广告计划列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouCampaignCreate.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("快手-创建广告计划列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();// 获取上传文件对象
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<KuaiShouCampaignCreate> listKuaiShouCampaignCreates = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouCampaignCreate.class, params);
-              kuaiShouCampaignCreateService.saveBatch(listKuaiShouCampaignCreates);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouCampaignCreates.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
+    @Autowired
+    private IKuaiShouCampaignCreateService kuaiShouCampaignCreateService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param kuaiShouCampaignCreate
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "快手-创建广告计划-分页列表查询")
+    @ApiOperation(value = "快手-创建广告计划-分页列表查询", notes = "快手-创建广告计划-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<KuaiShouCampaignCreate>> queryPageList(KuaiShouCampaignCreate kuaiShouCampaignCreate,
+                                                               @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                               HttpServletRequest req) {
+        Result<IPage<KuaiShouCampaignCreate>> result = new Result<IPage<KuaiShouCampaignCreate>>();
+        QueryWrapper<KuaiShouCampaignCreate> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaignCreate, req.getParameterMap());
+        Page<KuaiShouCampaignCreate> page = new Page<KuaiShouCampaignCreate>(pageNo, pageSize);
+        IPage<KuaiShouCampaignCreate> pageList = kuaiShouCampaignCreateService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param kuaiShouCampaignCreate
+     * @return
+     */
+    @AutoLog(value = "快手-创建广告计划-添加")
+    @ApiOperation(value = "快手-创建广告计划-添加", notes = "快手-创建广告计划-添加")
+    @PostMapping(value = "/add")
+    public Result<KuaiShouCampaignCreate> add(@RequestBody KuaiShouCampaignCreate kuaiShouCampaignCreate) {
+        Result<KuaiShouCampaignCreate> result = new Result<KuaiShouCampaignCreate>();
+        try {
+            kuaiShouCampaignCreateService.save(kuaiShouCampaignCreate);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param kuaiShouCampaignCreate
+     * @return
+     */
+    @AutoLog(value = "快手-创建广告计划-编辑")
+    @ApiOperation(value = "快手-创建广告计划-编辑", notes = "快手-创建广告计划-编辑")
+    @PutMapping(value = "/edit")
+    public Result<KuaiShouCampaignCreate> edit(@RequestBody KuaiShouCampaignCreate kuaiShouCampaignCreate) {
+        Result<KuaiShouCampaignCreate> result = new Result<KuaiShouCampaignCreate>();
+        KuaiShouCampaignCreate kuaiShouCampaignCreateEntity = kuaiShouCampaignCreateService.getById(kuaiShouCampaignCreate.getId());
+        if (kuaiShouCampaignCreateEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = kuaiShouCampaignCreateService.updateById(kuaiShouCampaignCreate);
+            //TODO 返回false说明什么?
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "快手-创建广告计划-通过id删除")
+    @ApiOperation(value = "快手-创建广告计划-通过id删除", notes = "快手-创建广告计划-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            kuaiShouCampaignCreateService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "快手-创建广告计划-批量删除")
+    @ApiOperation(value = "快手-创建广告计划-批量删除", notes = "快手-创建广告计划-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<KuaiShouCampaignCreate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouCampaignCreate> result = new Result<KuaiShouCampaignCreate>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.kuaiShouCampaignCreateService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "快手-创建广告计划-通过id查询")
+    @ApiOperation(value = "快手-创建广告计划-通过id查询", notes = "快手-创建广告计划-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<KuaiShouCampaignCreate> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouCampaignCreate> result = new Result<KuaiShouCampaignCreate>();
+        KuaiShouCampaignCreate kuaiShouCampaignCreate = kuaiShouCampaignCreateService.getById(id);
+        if (kuaiShouCampaignCreate == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouCampaignCreate);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouCampaignCreate> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouCampaignCreate kuaiShouCampaignCreate = JSON.parseObject(deString, KuaiShouCampaignCreate.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaignCreate, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouCampaignCreate> pageList = kuaiShouCampaignCreateService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-创建广告计划列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouCampaignCreate.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("快手-创建广告计划列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<KuaiShouCampaignCreate> listKuaiShouCampaignCreates = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouCampaignCreate.class, params);
+                kuaiShouCampaignCreateService.saveBatch(listKuaiShouCampaignCreates);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouCampaignCreates.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
 
 }

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

@@ -36,38 +36,38 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
  /**
- * @Description: 快手-可选深度转化类型
+  * @Description: 快手-可选深度转化类型
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+  * @Date: 2019-07-24
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="快手-可选深度转化类型")
+@Api(tags = "快手-可选深度转化类型")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouConversionInfos")
 public class KuaiShouConversionInfosController {
 	@Autowired
-	private IKuaiShouConversionInfosService kuaiShouConversionInfosService;
+    private IKuaiShouConversionInfosService kuaiShouConversionInfosService;
 	
 	/**
 	  * 分页列表查询
-	 * @param kuaiShouConversionInfos
+     * @param kuaiShouConversionInfos
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "快手-可选深度转化类型-分页列表查询")
-	@ApiOperation(value="快手-可选深度转化类型-分页列表查询", notes="快手-可选深度转化类型-分页列表查询")
+    @AutoLog(value = "快手-可选深度转化类型-分页列表查询")
+    @ApiOperation(value = "快手-可选深度转化类型-分页列表查询", notes = "快手-可选深度转化类型-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouConversionInfos>> queryPageList(KuaiShouConversionInfos kuaiShouConversionInfos,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouConversionInfos>> result = new Result<IPage<KuaiShouConversionInfos>>();
-		QueryWrapper<KuaiShouConversionInfos> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouConversionInfos, req.getParameterMap());
-		Page<KuaiShouConversionInfos> page = new Page<KuaiShouConversionInfos>(pageNo, pageSize);
-		IPage<KuaiShouConversionInfos> pageList = kuaiShouConversionInfosService.page(page, queryWrapper);
+    public Result<IPage<KuaiShouConversionInfos>> queryPageList(KuaiShouConversionInfos kuaiShouConversionInfos,
+                                                                @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                HttpServletRequest req) {
+        Result<IPage<KuaiShouConversionInfos>> result = new Result<IPage<KuaiShouConversionInfos>>();
+        QueryWrapper<KuaiShouConversionInfos> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouConversionInfos, req.getParameterMap());
+        Page<KuaiShouConversionInfos> page = new Page<KuaiShouConversionInfos>(pageNo, pageSize);
+        IPage<KuaiShouConversionInfos> pageList = kuaiShouConversionInfosService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		return result;
@@ -75,16 +75,16 @@ public class KuaiShouConversionInfosController {
 	
 	/**
 	  *   添加
-	 * @param kuaiShouConversionInfos
+     * @param kuaiShouConversionInfos
 	 * @return
 	 */
-	@AutoLog(value = "快手-可选深度转化类型-添加")
-	@ApiOperation(value="快手-可选深度转化类型-添加", notes="快手-可选深度转化类型-添加")
+    @AutoLog(value = "快手-可选深度转化类型-添加")
+    @ApiOperation(value = "快手-可选深度转化类型-添加", notes = "快手-可选深度转化类型-添加")
 	@PostMapping(value = "/add")
-	public Result<KuaiShouConversionInfos> add(@RequestBody KuaiShouConversionInfos kuaiShouConversionInfos) {
-		Result<KuaiShouConversionInfos> result = new Result<KuaiShouConversionInfos>();
+    public Result<KuaiShouConversionInfos> add(@RequestBody KuaiShouConversionInfos kuaiShouConversionInfos) {
+        Result<KuaiShouConversionInfos> result = new Result<KuaiShouConversionInfos>();
 		try {
-			kuaiShouConversionInfosService.save(kuaiShouConversionInfos);
+            kuaiShouConversionInfosService.save(kuaiShouConversionInfos);
 			result.success("添加成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
@@ -95,19 +95,19 @@ public class KuaiShouConversionInfosController {
 	
 	/**
 	  *  编辑
-	 * @param kuaiShouConversionInfos
+     * @param kuaiShouConversionInfos
 	 * @return
 	 */
-	@AutoLog(value = "快手-可选深度转化类型-编辑")
-	@ApiOperation(value="快手-可选深度转化类型-编辑", notes="快手-可选深度转化类型-编辑")
+    @AutoLog(value = "快手-可选深度转化类型-编辑")
+    @ApiOperation(value = "快手-可选深度转化类型-编辑", notes = "快手-可选深度转化类型-编辑")
 	@PutMapping(value = "/edit")
-	public Result<KuaiShouConversionInfos> edit(@RequestBody KuaiShouConversionInfos kuaiShouConversionInfos) {
-		Result<KuaiShouConversionInfos> result = new Result<KuaiShouConversionInfos>();
-		KuaiShouConversionInfos kuaiShouConversionInfosEntity = kuaiShouConversionInfosService.getById(kuaiShouConversionInfos.getId());
-		if(kuaiShouConversionInfosEntity==null) {
+    public Result<KuaiShouConversionInfos> edit(@RequestBody KuaiShouConversionInfos kuaiShouConversionInfos) {
+        Result<KuaiShouConversionInfos> result = new Result<KuaiShouConversionInfos>();
+        KuaiShouConversionInfos kuaiShouConversionInfosEntity = kuaiShouConversionInfosService.getById(kuaiShouConversionInfos.getId());
+        if (kuaiShouConversionInfosEntity == null) {
 			result.error500("未找到对应实体");
 		}else {
-			boolean ok = kuaiShouConversionInfosService.updateById(kuaiShouConversionInfos);
+            boolean ok = kuaiShouConversionInfosService.updateById(kuaiShouConversionInfos);
 			//TODO 返回false说明什么?
 			if(ok) {
 				result.success("修改成功!");
@@ -122,12 +122,12 @@ public class KuaiShouConversionInfosController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "快手-可选深度转化类型-通过id删除")
-	@ApiOperation(value="快手-可选深度转化类型-通过id删除", notes="快手-可选深度转化类型-通过id删除")
+    @AutoLog(value = "快手-可选深度转化类型-通过id删除")
+    @ApiOperation(value = "快手-可选深度转化类型-通过id删除", notes = "快手-可选深度转化类型-通过id删除")
 	@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("删除失败!");
@@ -140,15 +140,15 @@ public class KuaiShouConversionInfosController {
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "快手-可选深度转化类型-批量删除")
-	@ApiOperation(value="快手-可选深度转化类型-批量删除", notes="快手-可选深度转化类型-批量删除")
+    @AutoLog(value = "快手-可选深度转化类型-批量删除")
+    @ApiOperation(value = "快手-可选深度转化类型-批量删除", notes = "快手-可选深度转化类型-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
-	public Result<KuaiShouConversionInfos> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouConversionInfos> result = new Result<KuaiShouConversionInfos>();
+    public Result<KuaiShouConversionInfos> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouConversionInfos> result = new Result<KuaiShouConversionInfos>();
 		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;
@@ -159,16 +159,16 @@ public class KuaiShouConversionInfosController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "快手-可选深度转化类型-通过id查询")
-	@ApiOperation(value="快手-可选深度转化类型-通过id查询", notes="快手-可选深度转化类型-通过id查询")
+    @AutoLog(value = "快手-可选深度转化类型-通过id查询")
+    @ApiOperation(value = "快手-可选深度转化类型-通过id查询", notes = "快手-可选深度转化类型-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<KuaiShouConversionInfos> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouConversionInfos> result = new Result<KuaiShouConversionInfos>();
-		KuaiShouConversionInfos kuaiShouConversionInfos = kuaiShouConversionInfosService.getById(id);
-		if(kuaiShouConversionInfos==null) {
+    public Result<KuaiShouConversionInfos> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouConversionInfos> result = new Result<KuaiShouConversionInfos>();
+        KuaiShouConversionInfos kuaiShouConversionInfos = kuaiShouConversionInfosService.getById(id);
+        if (kuaiShouConversionInfos == null) {
 			result.error500("未找到对应实体");
 		}else {
-			result.setResult(kuaiShouConversionInfos);
+            result.setResult(kuaiShouConversionInfos);
 			result.setSuccess(true);
 		}
 		return result;

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

@@ -36,38 +36,38 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
  /**
- * @Description: 快手-可选深度转化类型-详情
+  * @Description: 快手-可选深度转化类型-详情
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+  * @Date: 2019-07-24
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="快手-可选深度转化类型-详情")
+@Api(tags = "快手-可选深度转化类型-详情")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouConversionTypes")
 public class KuaiShouConversionTypesController {
 	@Autowired
-	private IKuaiShouConversionTypesService kuaiShouConversionTypesService;
+    private IKuaiShouConversionTypesService kuaiShouConversionTypesService;
 	
 	/**
 	  * 分页列表查询
-	 * @param kuaiShouConversionTypes
+     * @param kuaiShouConversionTypes
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "快手-可选深度转化类型-详情-分页列表查询")
-	@ApiOperation(value="快手-可选深度转化类型-详情-分页列表查询", notes="快手-可选深度转化类型-详情-分页列表查询")
+    @AutoLog(value = "快手-可选深度转化类型-详情-分页列表查询")
+    @ApiOperation(value = "快手-可选深度转化类型-详情-分页列表查询", notes = "快手-可选深度转化类型-详情-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouConversionTypes>> queryPageList(KuaiShouConversionTypes kuaiShouConversionTypes,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouConversionTypes>> result = new Result<IPage<KuaiShouConversionTypes>>();
-		QueryWrapper<KuaiShouConversionTypes> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouConversionTypes, req.getParameterMap());
-		Page<KuaiShouConversionTypes> page = new Page<KuaiShouConversionTypes>(pageNo, pageSize);
-		IPage<KuaiShouConversionTypes> pageList = kuaiShouConversionTypesService.page(page, queryWrapper);
+    public Result<IPage<KuaiShouConversionTypes>> queryPageList(KuaiShouConversionTypes kuaiShouConversionTypes,
+                                                                @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                HttpServletRequest req) {
+        Result<IPage<KuaiShouConversionTypes>> result = new Result<IPage<KuaiShouConversionTypes>>();
+        QueryWrapper<KuaiShouConversionTypes> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouConversionTypes, req.getParameterMap());
+        Page<KuaiShouConversionTypes> page = new Page<KuaiShouConversionTypes>(pageNo, pageSize);
+        IPage<KuaiShouConversionTypes> pageList = kuaiShouConversionTypesService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		return result;
@@ -75,16 +75,16 @@ public class KuaiShouConversionTypesController {
 	
 	/**
 	  *   添加
-	 * @param kuaiShouConversionTypes
+     * @param kuaiShouConversionTypes
 	 * @return
 	 */
-	@AutoLog(value = "快手-可选深度转化类型-详情-添加")
-	@ApiOperation(value="快手-可选深度转化类型-详情-添加", notes="快手-可选深度转化类型-详情-添加")
+    @AutoLog(value = "快手-可选深度转化类型-详情-添加")
+    @ApiOperation(value = "快手-可选深度转化类型-详情-添加", notes = "快手-可选深度转化类型-详情-添加")
 	@PostMapping(value = "/add")
-	public Result<KuaiShouConversionTypes> add(@RequestBody KuaiShouConversionTypes kuaiShouConversionTypes) {
-		Result<KuaiShouConversionTypes> result = new Result<KuaiShouConversionTypes>();
+    public Result<KuaiShouConversionTypes> add(@RequestBody KuaiShouConversionTypes kuaiShouConversionTypes) {
+        Result<KuaiShouConversionTypes> result = new Result<KuaiShouConversionTypes>();
 		try {
-			kuaiShouConversionTypesService.save(kuaiShouConversionTypes);
+            kuaiShouConversionTypesService.save(kuaiShouConversionTypes);
 			result.success("添加成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
@@ -95,19 +95,19 @@ public class KuaiShouConversionTypesController {
 	
 	/**
 	  *  编辑
-	 * @param kuaiShouConversionTypes
+     * @param kuaiShouConversionTypes
 	 * @return
 	 */
-	@AutoLog(value = "快手-可选深度转化类型-详情-编辑")
-	@ApiOperation(value="快手-可选深度转化类型-详情-编辑", notes="快手-可选深度转化类型-详情-编辑")
+    @AutoLog(value = "快手-可选深度转化类型-详情-编辑")
+    @ApiOperation(value = "快手-可选深度转化类型-详情-编辑", notes = "快手-可选深度转化类型-详情-编辑")
 	@PutMapping(value = "/edit")
-	public Result<KuaiShouConversionTypes> edit(@RequestBody KuaiShouConversionTypes kuaiShouConversionTypes) {
-		Result<KuaiShouConversionTypes> result = new Result<KuaiShouConversionTypes>();
-		KuaiShouConversionTypes kuaiShouConversionTypesEntity = kuaiShouConversionTypesService.getById(kuaiShouConversionTypes.getId());
-		if(kuaiShouConversionTypesEntity==null) {
+    public Result<KuaiShouConversionTypes> edit(@RequestBody KuaiShouConversionTypes kuaiShouConversionTypes) {
+        Result<KuaiShouConversionTypes> result = new Result<KuaiShouConversionTypes>();
+        KuaiShouConversionTypes kuaiShouConversionTypesEntity = kuaiShouConversionTypesService.getById(kuaiShouConversionTypes.getId());
+        if (kuaiShouConversionTypesEntity == null) {
 			result.error500("未找到对应实体");
 		}else {
-			boolean ok = kuaiShouConversionTypesService.updateById(kuaiShouConversionTypes);
+            boolean ok = kuaiShouConversionTypesService.updateById(kuaiShouConversionTypes);
 			//TODO 返回false说明什么?
 			if(ok) {
 				result.success("修改成功!");
@@ -122,12 +122,12 @@ public class KuaiShouConversionTypesController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "快手-可选深度转化类型-详情-通过id删除")
-	@ApiOperation(value="快手-可选深度转化类型-详情-通过id删除", notes="快手-可选深度转化类型-详情-通过id删除")
+    @AutoLog(value = "快手-可选深度转化类型-详情-通过id删除")
+    @ApiOperation(value = "快手-可选深度转化类型-详情-通过id删除", notes = "快手-可选深度转化类型-详情-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		try {
-			kuaiShouConversionTypesService.removeById(id);
+            kuaiShouConversionTypesService.removeById(id);
 		} catch (Exception e) {
 			log.error("删除失败",e.getMessage());
 			return Result.error("删除失败!");
@@ -140,15 +140,15 @@ public class KuaiShouConversionTypesController {
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "快手-可选深度转化类型-详情-批量删除")
-	@ApiOperation(value="快手-可选深度转化类型-详情-批量删除", notes="快手-可选深度转化类型-详情-批量删除")
+    @AutoLog(value = "快手-可选深度转化类型-详情-批量删除")
+    @ApiOperation(value = "快手-可选深度转化类型-详情-批量删除", notes = "快手-可选深度转化类型-详情-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
-	public Result<KuaiShouConversionTypes> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouConversionTypes> result = new Result<KuaiShouConversionTypes>();
+    public Result<KuaiShouConversionTypes> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouConversionTypes> result = new Result<KuaiShouConversionTypes>();
 		if(ids==null || "".equals(ids.trim())) {
 			result.error500("参数不识别!");
 		}else {
-			this.kuaiShouConversionTypesService.removeByIds(Arrays.asList(ids.split(",")));
+            this.kuaiShouConversionTypesService.removeByIds(Arrays.asList(ids.split(",")));
 			result.success("删除成功!");
 		}
 		return result;
@@ -159,16 +159,16 @@ public class KuaiShouConversionTypesController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "快手-可选深度转化类型-详情-通过id查询")
-	@ApiOperation(value="快手-可选深度转化类型-详情-通过id查询", notes="快手-可选深度转化类型-详情-通过id查询")
+    @AutoLog(value = "快手-可选深度转化类型-详情-通过id查询")
+    @ApiOperation(value = "快手-可选深度转化类型-详情-通过id查询", notes = "快手-可选深度转化类型-详情-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<KuaiShouConversionTypes> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouConversionTypes> result = new Result<KuaiShouConversionTypes>();
-		KuaiShouConversionTypes kuaiShouConversionTypes = kuaiShouConversionTypesService.getById(id);
-		if(kuaiShouConversionTypes==null) {
+    public Result<KuaiShouConversionTypes> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouConversionTypes> result = new Result<KuaiShouConversionTypes>();
+        KuaiShouConversionTypes kuaiShouConversionTypes = kuaiShouConversionTypesService.getById(id);
+        if (kuaiShouConversionTypes == null) {
 			result.error500("未找到对应实体");
 		}else {
-			result.setResult(kuaiShouConversionTypes);
+            result.setResult(kuaiShouConversionTypes);
 			result.setSuccess(true);
 		}
 		return result;

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

@@ -8,13 +8,16 @@ 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.KuaiShouCreative;
 import org.jeecg.modules.kuaishou.service.IKuaiShouCreativeService;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,210 +38,216 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
+/**
  * @Description: 快手-创意信息
  * @Author: jeecg-boot
- * @Date:   2019-07-23
+ * @Date: 2019-07-23
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="快手-创意信息")
+@Api(tags = "快手-创意信息")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouCreative")
 public class KuaiShouCreativeController {
-	@Autowired
-	private IKuaiShouCreativeService kuaiShouCreativeService;
-	
-	/**
-	  * 分页列表查询
-	 * @param kuaiShouCreative
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "快手-创意信息-分页列表查询")
-	@ApiOperation(value="快手-创意信息-分页列表查询", notes="快手-创意信息-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouCreative>> queryPageList(KuaiShouCreative kuaiShouCreative,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouCreative>> result = new Result<IPage<KuaiShouCreative>>();
-		QueryWrapper<KuaiShouCreative> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCreative, req.getParameterMap());
-		Page<KuaiShouCreative> page = new Page<KuaiShouCreative>(pageNo, pageSize);
-		IPage<KuaiShouCreative> pageList = kuaiShouCreativeService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param kuaiShouCreative
-	 * @return
-	 */
-	@AutoLog(value = "快手-创意信息-添加")
-	@ApiOperation(value="快手-创意信息-添加", notes="快手-创意信息-添加")
-	@PostMapping(value = "/add")
-	public Result<KuaiShouCreative> add(@RequestBody KuaiShouCreative kuaiShouCreative) {
-		Result<KuaiShouCreative> result = new Result<KuaiShouCreative>();
-		try {
-			kuaiShouCreativeService.save(kuaiShouCreative);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param kuaiShouCreative
-	 * @return
-	 */
-	@AutoLog(value = "快手-创意信息-编辑")
-	@ApiOperation(value="快手-创意信息-编辑", notes="快手-创意信息-编辑")
-	@PutMapping(value = "/edit")
-	public Result<KuaiShouCreative> edit(@RequestBody KuaiShouCreative kuaiShouCreative) {
-		Result<KuaiShouCreative> result = new Result<KuaiShouCreative>();
-		KuaiShouCreative kuaiShouCreativeEntity = kuaiShouCreativeService.getById(kuaiShouCreative.getId());
-		if(kuaiShouCreativeEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = kuaiShouCreativeService.updateById(kuaiShouCreative);
-			//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 {
-			kuaiShouCreativeService.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<KuaiShouCreative> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouCreative> result = new Result<KuaiShouCreative>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.kuaiShouCreativeService.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<KuaiShouCreative> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouCreative> result = new Result<KuaiShouCreative>();
-		KuaiShouCreative kuaiShouCreative = kuaiShouCreativeService.getById(id);
-		if(kuaiShouCreative==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(kuaiShouCreative);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouCreative> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouCreative kuaiShouCreative = JSON.parseObject(deString, KuaiShouCreative.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCreative, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouCreative> pageList = kuaiShouCreativeService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "快手-创意信息列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouCreative.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<KuaiShouCreative> listKuaiShouCreatives = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouCreative.class, params);
-              kuaiShouCreativeService.saveBatch(listKuaiShouCreatives);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouCreatives.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("文件导入失败!");
-  }
+    @Autowired
+    private IKuaiShouCreativeService kuaiShouCreativeService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param kuaiShouCreative
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "快手-创意信息-分页列表查询")
+    @ApiOperation(value = "快手-创意信息-分页列表查询", notes = "快手-创意信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<KuaiShouCreative>> queryPageList(KuaiShouCreative kuaiShouCreative,
+                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                         HttpServletRequest req) {
+        Result<IPage<KuaiShouCreative>> result = new Result<IPage<KuaiShouCreative>>();
+        QueryWrapper<KuaiShouCreative> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCreative, req.getParameterMap());
+        Page<KuaiShouCreative> page = new Page<KuaiShouCreative>(pageNo, pageSize);
+        IPage<KuaiShouCreative> pageList = kuaiShouCreativeService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param kuaiShouCreative
+     * @return
+     */
+    @AutoLog(value = "快手-创意信息-添加")
+    @ApiOperation(value = "快手-创意信息-添加", notes = "快手-创意信息-添加")
+    @PostMapping(value = "/add")
+    public Result<KuaiShouCreative> add(@RequestBody KuaiShouCreative kuaiShouCreative) {
+        Result<KuaiShouCreative> result = new Result<KuaiShouCreative>();
+        try {
+            kuaiShouCreativeService.save(kuaiShouCreative);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param kuaiShouCreative
+     * @return
+     */
+    @AutoLog(value = "快手-创意信息-编辑")
+    @ApiOperation(value = "快手-创意信息-编辑", notes = "快手-创意信息-编辑")
+    @PutMapping(value = "/edit")
+    public Result<KuaiShouCreative> edit(@RequestBody KuaiShouCreative kuaiShouCreative) {
+        Result<KuaiShouCreative> result = new Result<KuaiShouCreative>();
+        KuaiShouCreative kuaiShouCreativeEntity = kuaiShouCreativeService.getById(kuaiShouCreative.getId());
+        if (kuaiShouCreativeEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = kuaiShouCreativeService.updateById(kuaiShouCreative);
+            //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 {
+            kuaiShouCreativeService.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<KuaiShouCreative> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouCreative> result = new Result<KuaiShouCreative>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.kuaiShouCreativeService.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<KuaiShouCreative> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouCreative> result = new Result<KuaiShouCreative>();
+        KuaiShouCreative kuaiShouCreative = kuaiShouCreativeService.getById(id);
+        if (kuaiShouCreative == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouCreative);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouCreative> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouCreative kuaiShouCreative = JSON.parseObject(deString, KuaiShouCreative.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCreative, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouCreative> pageList = kuaiShouCreativeService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-创意信息列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouCreative.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<KuaiShouCreative> listKuaiShouCreatives = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouCreative.class, params);
+                kuaiShouCreativeService.saveBatch(listKuaiShouCreatives);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouCreatives.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("文件导入失败!");
+    }
 
 }

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

@@ -8,13 +8,16 @@ 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.KuaiShouCreativeCreate;
 import org.jeecg.modules.kuaishou.service.IKuaiShouCreativeCreateService;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,210 +38,216 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
+/**
  * @Description: 快手-创建创意信息
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="快手-创建创意信息")
+@Api(tags = "快手-创建创意信息")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouCreativeCreate")
 public class KuaiShouCreativeCreateController {
-	@Autowired
-	private IKuaiShouCreativeCreateService kuaiShouCreativeCreateService;
-	
-	/**
-	  * 分页列表查询
-	 * @param kuaiShouCreativeCreate
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "快手-创建创意信息-分页列表查询")
-	@ApiOperation(value="快手-创建创意信息-分页列表查询", notes="快手-创建创意信息-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouCreativeCreate>> queryPageList(KuaiShouCreativeCreate kuaiShouCreativeCreate,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouCreativeCreate>> result = new Result<IPage<KuaiShouCreativeCreate>>();
-		QueryWrapper<KuaiShouCreativeCreate> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCreativeCreate, req.getParameterMap());
-		Page<KuaiShouCreativeCreate> page = new Page<KuaiShouCreativeCreate>(pageNo, pageSize);
-		IPage<KuaiShouCreativeCreate> pageList = kuaiShouCreativeCreateService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param kuaiShouCreativeCreate
-	 * @return
-	 */
-	@AutoLog(value = "快手-创建创意信息-添加")
-	@ApiOperation(value="快手-创建创意信息-添加", notes="快手-创建创意信息-添加")
-	@PostMapping(value = "/add")
-	public Result<KuaiShouCreativeCreate> add(@RequestBody KuaiShouCreativeCreate kuaiShouCreativeCreate) {
-		Result<KuaiShouCreativeCreate> result = new Result<KuaiShouCreativeCreate>();
-		try {
-			kuaiShouCreativeCreateService.save(kuaiShouCreativeCreate);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param kuaiShouCreativeCreate
-	 * @return
-	 */
-	@AutoLog(value = "快手-创建创意信息-编辑")
-	@ApiOperation(value="快手-创建创意信息-编辑", notes="快手-创建创意信息-编辑")
-	@PutMapping(value = "/edit")
-	public Result<KuaiShouCreativeCreate> edit(@RequestBody KuaiShouCreativeCreate kuaiShouCreativeCreate) {
-		Result<KuaiShouCreativeCreate> result = new Result<KuaiShouCreativeCreate>();
-		KuaiShouCreativeCreate kuaiShouCreativeCreateEntity = kuaiShouCreativeCreateService.getById(kuaiShouCreativeCreate.getId());
-		if(kuaiShouCreativeCreateEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = kuaiShouCreativeCreateService.updateById(kuaiShouCreativeCreate);
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "快手-创建创意信息-通过id删除")
-	@ApiOperation(value="快手-创建创意信息-通过id删除", notes="快手-创建创意信息-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
-			kuaiShouCreativeCreateService.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "快手-创建创意信息-批量删除")
-	@ApiOperation(value="快手-创建创意信息-批量删除", notes="快手-创建创意信息-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<KuaiShouCreativeCreate> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouCreativeCreate> result = new Result<KuaiShouCreativeCreate>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.kuaiShouCreativeCreateService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "快手-创建创意信息-通过id查询")
-	@ApiOperation(value="快手-创建创意信息-通过id查询", notes="快手-创建创意信息-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<KuaiShouCreativeCreate> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouCreativeCreate> result = new Result<KuaiShouCreativeCreate>();
-		KuaiShouCreativeCreate kuaiShouCreativeCreate = kuaiShouCreativeCreateService.getById(id);
-		if(kuaiShouCreativeCreate==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(kuaiShouCreativeCreate);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouCreativeCreate> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouCreativeCreate kuaiShouCreativeCreate = JSON.parseObject(deString, KuaiShouCreativeCreate.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCreativeCreate, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouCreativeCreate> pageList = kuaiShouCreativeCreateService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "快手-创建创意信息列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouCreativeCreate.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("快手-创建创意信息列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();// 获取上传文件对象
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<KuaiShouCreativeCreate> listKuaiShouCreativeCreates = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouCreativeCreate.class, params);
-              kuaiShouCreativeCreateService.saveBatch(listKuaiShouCreativeCreates);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouCreativeCreates.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
+    @Autowired
+    private IKuaiShouCreativeCreateService kuaiShouCreativeCreateService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param kuaiShouCreativeCreate
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "快手-创建创意信息-分页列表查询")
+    @ApiOperation(value = "快手-创建创意信息-分页列表查询", notes = "快手-创建创意信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<KuaiShouCreativeCreate>> queryPageList(KuaiShouCreativeCreate kuaiShouCreativeCreate,
+                                                               @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                               HttpServletRequest req) {
+        Result<IPage<KuaiShouCreativeCreate>> result = new Result<IPage<KuaiShouCreativeCreate>>();
+        QueryWrapper<KuaiShouCreativeCreate> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCreativeCreate, req.getParameterMap());
+        Page<KuaiShouCreativeCreate> page = new Page<KuaiShouCreativeCreate>(pageNo, pageSize);
+        IPage<KuaiShouCreativeCreate> pageList = kuaiShouCreativeCreateService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param kuaiShouCreativeCreate
+     * @return
+     */
+    @AutoLog(value = "快手-创建创意信息-添加")
+    @ApiOperation(value = "快手-创建创意信息-添加", notes = "快手-创建创意信息-添加")
+    @PostMapping(value = "/add")
+    public Result<KuaiShouCreativeCreate> add(@RequestBody KuaiShouCreativeCreate kuaiShouCreativeCreate) {
+        Result<KuaiShouCreativeCreate> result = new Result<KuaiShouCreativeCreate>();
+        try {
+            kuaiShouCreativeCreateService.save(kuaiShouCreativeCreate);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param kuaiShouCreativeCreate
+     * @return
+     */
+    @AutoLog(value = "快手-创建创意信息-编辑")
+    @ApiOperation(value = "快手-创建创意信息-编辑", notes = "快手-创建创意信息-编辑")
+    @PutMapping(value = "/edit")
+    public Result<KuaiShouCreativeCreate> edit(@RequestBody KuaiShouCreativeCreate kuaiShouCreativeCreate) {
+        Result<KuaiShouCreativeCreate> result = new Result<KuaiShouCreativeCreate>();
+        KuaiShouCreativeCreate kuaiShouCreativeCreateEntity = kuaiShouCreativeCreateService.getById(kuaiShouCreativeCreate.getId());
+        if (kuaiShouCreativeCreateEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = kuaiShouCreativeCreateService.updateById(kuaiShouCreativeCreate);
+            //TODO 返回false说明什么?
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "快手-创建创意信息-通过id删除")
+    @ApiOperation(value = "快手-创建创意信息-通过id删除", notes = "快手-创建创意信息-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            kuaiShouCreativeCreateService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "快手-创建创意信息-批量删除")
+    @ApiOperation(value = "快手-创建创意信息-批量删除", notes = "快手-创建创意信息-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<KuaiShouCreativeCreate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouCreativeCreate> result = new Result<KuaiShouCreativeCreate>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.kuaiShouCreativeCreateService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "快手-创建创意信息-通过id查询")
+    @ApiOperation(value = "快手-创建创意信息-通过id查询", notes = "快手-创建创意信息-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<KuaiShouCreativeCreate> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouCreativeCreate> result = new Result<KuaiShouCreativeCreate>();
+        KuaiShouCreativeCreate kuaiShouCreativeCreate = kuaiShouCreativeCreateService.getById(id);
+        if (kuaiShouCreativeCreate == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouCreativeCreate);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouCreativeCreate> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouCreativeCreate kuaiShouCreativeCreate = JSON.parseObject(deString, KuaiShouCreativeCreate.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCreativeCreate, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouCreativeCreate> pageList = kuaiShouCreativeCreateService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-创建创意信息列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouCreativeCreate.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("快手-创建创意信息列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<KuaiShouCreativeCreate> listKuaiShouCreativeCreates = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouCreativeCreate.class, params);
+                kuaiShouCreativeCreateService.saveBatch(listKuaiShouCreativeCreates);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouCreativeCreates.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
 
 }

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

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

+ 44 - 44
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupCreateController.java

@@ -36,38 +36,38 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
  /**
- * @Description: 快手-创建广告组信息
+  * @Description: 快手-创建广告组信息
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+  * @Date: 2019-07-24
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="快手-创建广告组信息")
+@Api(tags = "快手-创建广告组信息")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouGroupCreate")
 public class KuaiShouGroupCreateController {
 	@Autowired
-	private IKuaiShouGroupCreateService kuaiShouGroupCreateService;
+    private IKuaiShouGroupCreateService kuaiShouGroupCreateService;
 	
 	/**
 	  * 分页列表查询
-	 * @param kuaiShouGroupCreate
+     * @param kuaiShouGroupCreate
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "快手-创建广告组信息-分页列表查询")
-	@ApiOperation(value="快手-创建广告组信息-分页列表查询", notes="快手-创建广告组信息-分页列表查询")
+    @AutoLog(value = "快手-创建广告组信息-分页列表查询")
+    @ApiOperation(value = "快手-创建广告组信息-分页列表查询", notes = "快手-创建广告组信息-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouGroupCreate>> queryPageList(KuaiShouGroupCreate kuaiShouGroupCreate,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouGroupCreate>> result = new Result<IPage<KuaiShouGroupCreate>>();
-		QueryWrapper<KuaiShouGroupCreate> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupCreate, req.getParameterMap());
-		Page<KuaiShouGroupCreate> page = new Page<KuaiShouGroupCreate>(pageNo, pageSize);
-		IPage<KuaiShouGroupCreate> pageList = kuaiShouGroupCreateService.page(page, queryWrapper);
+    public Result<IPage<KuaiShouGroupCreate>> queryPageList(KuaiShouGroupCreate kuaiShouGroupCreate,
+                                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                            HttpServletRequest req) {
+        Result<IPage<KuaiShouGroupCreate>> result = new Result<IPage<KuaiShouGroupCreate>>();
+        QueryWrapper<KuaiShouGroupCreate> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupCreate, req.getParameterMap());
+        Page<KuaiShouGroupCreate> page = new Page<KuaiShouGroupCreate>(pageNo, pageSize);
+        IPage<KuaiShouGroupCreate> pageList = kuaiShouGroupCreateService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		return result;
@@ -75,16 +75,16 @@ public class KuaiShouGroupCreateController {
 	
 	/**
 	  *   添加
-	 * @param kuaiShouGroupCreate
+     * @param kuaiShouGroupCreate
 	 * @return
 	 */
-	@AutoLog(value = "快手-创建广告组信息-添加")
-	@ApiOperation(value="快手-创建广告组信息-添加", notes="快手-创建广告组信息-添加")
+    @AutoLog(value = "快手-创建广告组信息-添加")
+    @ApiOperation(value = "快手-创建广告组信息-添加", notes = "快手-创建广告组信息-添加")
 	@PostMapping(value = "/add")
-	public Result<KuaiShouGroupCreate> add(@RequestBody KuaiShouGroupCreate kuaiShouGroupCreate) {
-		Result<KuaiShouGroupCreate> result = new Result<KuaiShouGroupCreate>();
+    public Result<KuaiShouGroupCreate> add(@RequestBody KuaiShouGroupCreate kuaiShouGroupCreate) {
+        Result<KuaiShouGroupCreate> result = new Result<KuaiShouGroupCreate>();
 		try {
-			kuaiShouGroupCreateService.save(kuaiShouGroupCreate);
+            kuaiShouGroupCreateService.save(kuaiShouGroupCreate);
 			result.success("添加成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
@@ -95,19 +95,19 @@ public class KuaiShouGroupCreateController {
 	
 	/**
 	  *  编辑
-	 * @param kuaiShouGroupCreate
+     * @param kuaiShouGroupCreate
 	 * @return
 	 */
-	@AutoLog(value = "快手-创建广告组信息-编辑")
-	@ApiOperation(value="快手-创建广告组信息-编辑", notes="快手-创建广告组信息-编辑")
+    @AutoLog(value = "快手-创建广告组信息-编辑")
+    @ApiOperation(value = "快手-创建广告组信息-编辑", notes = "快手-创建广告组信息-编辑")
 	@PutMapping(value = "/edit")
-	public Result<KuaiShouGroupCreate> edit(@RequestBody KuaiShouGroupCreate kuaiShouGroupCreate) {
-		Result<KuaiShouGroupCreate> result = new Result<KuaiShouGroupCreate>();
-		KuaiShouGroupCreate kuaiShouGroupCreateEntity = kuaiShouGroupCreateService.getById(kuaiShouGroupCreate.getId());
-		if(kuaiShouGroupCreateEntity==null) {
+    public Result<KuaiShouGroupCreate> edit(@RequestBody KuaiShouGroupCreate kuaiShouGroupCreate) {
+        Result<KuaiShouGroupCreate> result = new Result<KuaiShouGroupCreate>();
+        KuaiShouGroupCreate kuaiShouGroupCreateEntity = kuaiShouGroupCreateService.getById(kuaiShouGroupCreate.getId());
+        if (kuaiShouGroupCreateEntity == null) {
 			result.error500("未找到对应实体");
 		}else {
-			boolean ok = kuaiShouGroupCreateService.updateById(kuaiShouGroupCreate);
+            boolean ok = kuaiShouGroupCreateService.updateById(kuaiShouGroupCreate);
 			//TODO 返回false说明什么?
 			if(ok) {
 				result.success("修改成功!");
@@ -122,12 +122,12 @@ public class KuaiShouGroupCreateController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "快手-创建广告组信息-通过id删除")
-	@ApiOperation(value="快手-创建广告组信息-通过id删除", notes="快手-创建广告组信息-通过id删除")
+    @AutoLog(value = "快手-创建广告组信息-通过id删除")
+    @ApiOperation(value = "快手-创建广告组信息-通过id删除", notes = "快手-创建广告组信息-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		try {
-			kuaiShouGroupCreateService.removeById(id);
+            kuaiShouGroupCreateService.removeById(id);
 		} catch (Exception e) {
 			log.error("删除失败",e.getMessage());
 			return Result.error("删除失败!");
@@ -140,15 +140,15 @@ public class KuaiShouGroupCreateController {
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "快手-创建广告组信息-批量删除")
-	@ApiOperation(value="快手-创建广告组信息-批量删除", notes="快手-创建广告组信息-批量删除")
+    @AutoLog(value = "快手-创建广告组信息-批量删除")
+    @ApiOperation(value = "快手-创建广告组信息-批量删除", notes = "快手-创建广告组信息-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
-	public Result<KuaiShouGroupCreate> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouGroupCreate> result = new Result<KuaiShouGroupCreate>();
+    public Result<KuaiShouGroupCreate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouGroupCreate> result = new Result<KuaiShouGroupCreate>();
 		if(ids==null || "".equals(ids.trim())) {
 			result.error500("参数不识别!");
 		}else {
-			this.kuaiShouGroupCreateService.removeByIds(Arrays.asList(ids.split(",")));
+            this.kuaiShouGroupCreateService.removeByIds(Arrays.asList(ids.split(",")));
 			result.success("删除成功!");
 		}
 		return result;
@@ -159,16 +159,16 @@ public class KuaiShouGroupCreateController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "快手-创建广告组信息-通过id查询")
-	@ApiOperation(value="快手-创建广告组信息-通过id查询", notes="快手-创建广告组信息-通过id查询")
+    @AutoLog(value = "快手-创建广告组信息-通过id查询")
+    @ApiOperation(value = "快手-创建广告组信息-通过id查询", notes = "快手-创建广告组信息-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<KuaiShouGroupCreate> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouGroupCreate> result = new Result<KuaiShouGroupCreate>();
-		KuaiShouGroupCreate kuaiShouGroupCreate = kuaiShouGroupCreateService.getById(id);
-		if(kuaiShouGroupCreate==null) {
+    public Result<KuaiShouGroupCreate> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouGroupCreate> result = new Result<KuaiShouGroupCreate>();
+        KuaiShouGroupCreate kuaiShouGroupCreate = kuaiShouGroupCreateService.getById(id);
+        if (kuaiShouGroupCreate == null) {
 			result.error500("未找到对应实体");
 		}else {
-			result.setResult(kuaiShouGroupCreate);
+            result.setResult(kuaiShouGroupCreate);
 			result.setSuccess(true);
 		}
 		return result;

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

@@ -36,38 +36,38 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
  /**
- * @Description: 快手-创建广告组定向信息
+  * @Description: 快手-创建广告组定向信息
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+  * @Date: 2019-07-24
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="快手-创建广告组定向信息")
+@Api(tags = "快手-创建广告组定向信息")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouGroupCreateTarget")
 public class KuaiShouGroupCreateTargetController {
 	@Autowired
-	private IKuaiShouGroupCreateTargetService kuaiShouGroupCreateTargetService;
+    private IKuaiShouGroupCreateTargetService kuaiShouGroupCreateTargetService;
 	
 	/**
 	  * 分页列表查询
-	 * @param kuaiShouGroupCreateTarget
+     * @param kuaiShouGroupCreateTarget
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "快手-创建广告组定向信息-分页列表查询")
-	@ApiOperation(value="快手-创建广告组定向信息-分页列表查询", notes="快手-创建广告组定向信息-分页列表查询")
+    @AutoLog(value = "快手-创建广告组定向信息-分页列表查询")
+    @ApiOperation(value = "快手-创建广告组定向信息-分页列表查询", notes = "快手-创建广告组定向信息-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouGroupCreateTarget>> queryPageList(KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouGroupCreateTarget>> result = new Result<IPage<KuaiShouGroupCreateTarget>>();
-		QueryWrapper<KuaiShouGroupCreateTarget> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupCreateTarget, req.getParameterMap());
-		Page<KuaiShouGroupCreateTarget> page = new Page<KuaiShouGroupCreateTarget>(pageNo, pageSize);
-		IPage<KuaiShouGroupCreateTarget> pageList = kuaiShouGroupCreateTargetService.page(page, queryWrapper);
+    public Result<IPage<KuaiShouGroupCreateTarget>> queryPageList(KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget,
+                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                  HttpServletRequest req) {
+        Result<IPage<KuaiShouGroupCreateTarget>> result = new Result<IPage<KuaiShouGroupCreateTarget>>();
+        QueryWrapper<KuaiShouGroupCreateTarget> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupCreateTarget, req.getParameterMap());
+        Page<KuaiShouGroupCreateTarget> page = new Page<KuaiShouGroupCreateTarget>(pageNo, pageSize);
+        IPage<KuaiShouGroupCreateTarget> pageList = kuaiShouGroupCreateTargetService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		return result;
@@ -75,16 +75,16 @@ public class KuaiShouGroupCreateTargetController {
 	
 	/**
 	  *   添加
-	 * @param kuaiShouGroupCreateTarget
+     * @param kuaiShouGroupCreateTarget
 	 * @return
 	 */
-	@AutoLog(value = "快手-创建广告组定向信息-添加")
-	@ApiOperation(value="快手-创建广告组定向信息-添加", notes="快手-创建广告组定向信息-添加")
+    @AutoLog(value = "快手-创建广告组定向信息-添加")
+    @ApiOperation(value = "快手-创建广告组定向信息-添加", notes = "快手-创建广告组定向信息-添加")
 	@PostMapping(value = "/add")
-	public Result<KuaiShouGroupCreateTarget> add(@RequestBody KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget) {
-		Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
+    public Result<KuaiShouGroupCreateTarget> add(@RequestBody KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget) {
+        Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
 		try {
-			kuaiShouGroupCreateTargetService.save(kuaiShouGroupCreateTarget);
+            kuaiShouGroupCreateTargetService.save(kuaiShouGroupCreateTarget);
 			result.success("添加成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
@@ -95,19 +95,19 @@ public class KuaiShouGroupCreateTargetController {
 	
 	/**
 	  *  编辑
-	 * @param kuaiShouGroupCreateTarget
+     * @param kuaiShouGroupCreateTarget
 	 * @return
 	 */
-	@AutoLog(value = "快手-创建广告组定向信息-编辑")
-	@ApiOperation(value="快手-创建广告组定向信息-编辑", notes="快手-创建广告组定向信息-编辑")
+    @AutoLog(value = "快手-创建广告组定向信息-编辑")
+    @ApiOperation(value = "快手-创建广告组定向信息-编辑", notes = "快手-创建广告组定向信息-编辑")
 	@PutMapping(value = "/edit")
-	public Result<KuaiShouGroupCreateTarget> edit(@RequestBody KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget) {
-		Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
-		KuaiShouGroupCreateTarget kuaiShouGroupCreateTargetEntity = kuaiShouGroupCreateTargetService.getById(kuaiShouGroupCreateTarget.getId());
-		if(kuaiShouGroupCreateTargetEntity==null) {
+    public Result<KuaiShouGroupCreateTarget> edit(@RequestBody KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget) {
+        Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
+        KuaiShouGroupCreateTarget kuaiShouGroupCreateTargetEntity = kuaiShouGroupCreateTargetService.getById(kuaiShouGroupCreateTarget.getId());
+        if (kuaiShouGroupCreateTargetEntity == null) {
 			result.error500("未找到对应实体");
 		}else {
-			boolean ok = kuaiShouGroupCreateTargetService.updateById(kuaiShouGroupCreateTarget);
+            boolean ok = kuaiShouGroupCreateTargetService.updateById(kuaiShouGroupCreateTarget);
 			//TODO 返回false说明什么?
 			if(ok) {
 				result.success("修改成功!");
@@ -122,12 +122,12 @@ public class KuaiShouGroupCreateTargetController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "快手-创建广告组定向信息-通过id删除")
-	@ApiOperation(value="快手-创建广告组定向信息-通过id删除", notes="快手-创建广告组定向信息-通过id删除")
+    @AutoLog(value = "快手-创建广告组定向信息-通过id删除")
+    @ApiOperation(value = "快手-创建广告组定向信息-通过id删除", notes = "快手-创建广告组定向信息-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		try {
-			kuaiShouGroupCreateTargetService.removeById(id);
+            kuaiShouGroupCreateTargetService.removeById(id);
 		} catch (Exception e) {
 			log.error("删除失败",e.getMessage());
 			return Result.error("删除失败!");
@@ -140,15 +140,15 @@ public class KuaiShouGroupCreateTargetController {
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "快手-创建广告组定向信息-批量删除")
-	@ApiOperation(value="快手-创建广告组定向信息-批量删除", notes="快手-创建广告组定向信息-批量删除")
+    @AutoLog(value = "快手-创建广告组定向信息-批量删除")
+    @ApiOperation(value = "快手-创建广告组定向信息-批量删除", notes = "快手-创建广告组定向信息-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
-	public Result<KuaiShouGroupCreateTarget> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
+    public Result<KuaiShouGroupCreateTarget> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
 		if(ids==null || "".equals(ids.trim())) {
 			result.error500("参数不识别!");
 		}else {
-			this.kuaiShouGroupCreateTargetService.removeByIds(Arrays.asList(ids.split(",")));
+            this.kuaiShouGroupCreateTargetService.removeByIds(Arrays.asList(ids.split(",")));
 			result.success("删除成功!");
 		}
 		return result;
@@ -159,16 +159,16 @@ public class KuaiShouGroupCreateTargetController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "快手-创建广告组定向信息-通过id查询")
-	@ApiOperation(value="快手-创建广告组定向信息-通过id查询", notes="快手-创建广告组定向信息-通过id查询")
+    @AutoLog(value = "快手-创建广告组定向信息-通过id查询")
+    @ApiOperation(value = "快手-创建广告组定向信息-通过id查询", notes = "快手-创建广告组定向信息-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<KuaiShouGroupCreateTarget> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
-		KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget = kuaiShouGroupCreateTargetService.getById(id);
-		if(kuaiShouGroupCreateTarget==null) {
+    public Result<KuaiShouGroupCreateTarget> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouGroupCreateTarget> result = new Result<KuaiShouGroupCreateTarget>();
+        KuaiShouGroupCreateTarget kuaiShouGroupCreateTarget = kuaiShouGroupCreateTargetService.getById(id);
+        if (kuaiShouGroupCreateTarget == null) {
 			result.error500("未找到对应实体");
 		}else {
-			result.setResult(kuaiShouGroupCreateTarget);
+            result.setResult(kuaiShouGroupCreateTarget);
 			result.setSuccess(true);
 		}
 		return result;

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

@@ -8,13 +8,16 @@ 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.KuaiShouImageGet;
 import org.jeecg.modules.kuaishou.service.IKuaiShouImageGetService;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,210 +38,216 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
+/**
  * @Description: 快手-获取图片接口
  * @Author: jeecg-boot
- * @Date:   2019-07-25
+ * @Date: 2019-07-25
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="快手-获取图片接口")
+@Api(tags = "快手-获取图片接口")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouImageGet")
 public class KuaiShouImageGetController {
-	@Autowired
-	private IKuaiShouImageGetService kuaiShouImageGetService;
-	
-	/**
-	  * 分页列表查询
-	 * @param kuaiShouImageGet
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "快手-获取图片接口-分页列表查询")
-	@ApiOperation(value="快手-获取图片接口-分页列表查询", notes="快手-获取图片接口-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouImageGet>> queryPageList(KuaiShouImageGet kuaiShouImageGet,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouImageGet>> result = new Result<IPage<KuaiShouImageGet>>();
-		QueryWrapper<KuaiShouImageGet> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImageGet, req.getParameterMap());
-		Page<KuaiShouImageGet> page = new Page<KuaiShouImageGet>(pageNo, pageSize);
-		IPage<KuaiShouImageGet> pageList = kuaiShouImageGetService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param kuaiShouImageGet
-	 * @return
-	 */
-	@AutoLog(value = "快手-获取图片接口-添加")
-	@ApiOperation(value="快手-获取图片接口-添加", notes="快手-获取图片接口-添加")
-	@PostMapping(value = "/add")
-	public Result<KuaiShouImageGet> add(@RequestBody KuaiShouImageGet kuaiShouImageGet) {
-		Result<KuaiShouImageGet> result = new Result<KuaiShouImageGet>();
-		try {
-			kuaiShouImageGetService.save(kuaiShouImageGet);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param kuaiShouImageGet
-	 * @return
-	 */
-	@AutoLog(value = "快手-获取图片接口-编辑")
-	@ApiOperation(value="快手-获取图片接口-编辑", notes="快手-获取图片接口-编辑")
-	@PutMapping(value = "/edit")
-	public Result<KuaiShouImageGet> edit(@RequestBody KuaiShouImageGet kuaiShouImageGet) {
-		Result<KuaiShouImageGet> result = new Result<KuaiShouImageGet>();
-		KuaiShouImageGet kuaiShouImageGetEntity = kuaiShouImageGetService.getById(kuaiShouImageGet.getId());
-		if(kuaiShouImageGetEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = kuaiShouImageGetService.updateById(kuaiShouImageGet);
-			//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 {
-			kuaiShouImageGetService.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<KuaiShouImageGet> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouImageGet> result = new Result<KuaiShouImageGet>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.kuaiShouImageGetService.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<KuaiShouImageGet> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouImageGet> result = new Result<KuaiShouImageGet>();
-		KuaiShouImageGet kuaiShouImageGet = kuaiShouImageGetService.getById(id);
-		if(kuaiShouImageGet==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(kuaiShouImageGet);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouImageGet> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouImageGet kuaiShouImageGet = JSON.parseObject(deString, KuaiShouImageGet.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImageGet, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouImageGet> pageList = kuaiShouImageGetService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "快手-获取图片接口列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouImageGet.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<KuaiShouImageGet> listKuaiShouImageGets = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouImageGet.class, params);
-              kuaiShouImageGetService.saveBatch(listKuaiShouImageGets);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouImageGets.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("文件导入失败!");
-  }
+    @Autowired
+    private IKuaiShouImageGetService kuaiShouImageGetService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param kuaiShouImageGet
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "快手-获取图片接口-分页列表查询")
+    @ApiOperation(value = "快手-获取图片接口-分页列表查询", notes = "快手-获取图片接口-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<KuaiShouImageGet>> queryPageList(KuaiShouImageGet kuaiShouImageGet,
+                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                         HttpServletRequest req) {
+        Result<IPage<KuaiShouImageGet>> result = new Result<IPage<KuaiShouImageGet>>();
+        QueryWrapper<KuaiShouImageGet> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImageGet, req.getParameterMap());
+        Page<KuaiShouImageGet> page = new Page<KuaiShouImageGet>(pageNo, pageSize);
+        IPage<KuaiShouImageGet> pageList = kuaiShouImageGetService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param kuaiShouImageGet
+     * @return
+     */
+    @AutoLog(value = "快手-获取图片接口-添加")
+    @ApiOperation(value = "快手-获取图片接口-添加", notes = "快手-获取图片接口-添加")
+    @PostMapping(value = "/add")
+    public Result<KuaiShouImageGet> add(@RequestBody KuaiShouImageGet kuaiShouImageGet) {
+        Result<KuaiShouImageGet> result = new Result<KuaiShouImageGet>();
+        try {
+            kuaiShouImageGetService.save(kuaiShouImageGet);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param kuaiShouImageGet
+     * @return
+     */
+    @AutoLog(value = "快手-获取图片接口-编辑")
+    @ApiOperation(value = "快手-获取图片接口-编辑", notes = "快手-获取图片接口-编辑")
+    @PutMapping(value = "/edit")
+    public Result<KuaiShouImageGet> edit(@RequestBody KuaiShouImageGet kuaiShouImageGet) {
+        Result<KuaiShouImageGet> result = new Result<KuaiShouImageGet>();
+        KuaiShouImageGet kuaiShouImageGetEntity = kuaiShouImageGetService.getById(kuaiShouImageGet.getId());
+        if (kuaiShouImageGetEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = kuaiShouImageGetService.updateById(kuaiShouImageGet);
+            //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 {
+            kuaiShouImageGetService.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<KuaiShouImageGet> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouImageGet> result = new Result<KuaiShouImageGet>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.kuaiShouImageGetService.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<KuaiShouImageGet> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouImageGet> result = new Result<KuaiShouImageGet>();
+        KuaiShouImageGet kuaiShouImageGet = kuaiShouImageGetService.getById(id);
+        if (kuaiShouImageGet == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouImageGet);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouImageGet> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouImageGet kuaiShouImageGet = JSON.parseObject(deString, KuaiShouImageGet.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImageGet, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouImageGet> pageList = kuaiShouImageGetService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-获取图片接口列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouImageGet.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<KuaiShouImageGet> listKuaiShouImageGets = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouImageGet.class, params);
+                kuaiShouImageGetService.saveBatch(listKuaiShouImageGets);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouImageGets.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("文件导入失败!");
+    }
 
 }

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

@@ -8,13 +8,16 @@ 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.KuaiShouImageUploand;
 import org.jeecg.modules.kuaishou.service.IKuaiShouImageUploandService;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,210 +38,216 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
+/**
  * @Description: 快手-上传图片接口
  * @Author: jeecg-boot
- * @Date:   2019-07-26
+ * @Date: 2019-07-26
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="快手-上传图片接口")
+@Api(tags = "快手-上传图片接口")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouImageUploand")
 public class KuaiShouImageUploandController {
-	@Autowired
-	private IKuaiShouImageUploandService kuaiShouImageUploandService;
-	
-	/**
-	  * 分页列表查询
-	 * @param kuaiShouImageUploand
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "快手-上传图片接口-分页列表查询")
-	@ApiOperation(value="快手-上传图片接口-分页列表查询", notes="快手-上传图片接口-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouImageUploand>> queryPageList(KuaiShouImageUploand kuaiShouImageUploand,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouImageUploand>> result = new Result<IPage<KuaiShouImageUploand>>();
-		QueryWrapper<KuaiShouImageUploand> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImageUploand, req.getParameterMap());
-		Page<KuaiShouImageUploand> page = new Page<KuaiShouImageUploand>(pageNo, pageSize);
-		IPage<KuaiShouImageUploand> pageList = kuaiShouImageUploandService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param kuaiShouImageUploand
-	 * @return
-	 */
-	@AutoLog(value = "快手-上传图片接口-添加")
-	@ApiOperation(value="快手-上传图片接口-添加", notes="快手-上传图片接口-添加")
-	@PostMapping(value = "/add")
-	public Result<KuaiShouImageUploand> add(@RequestBody KuaiShouImageUploand kuaiShouImageUploand) {
-		Result<KuaiShouImageUploand> result = new Result<KuaiShouImageUploand>();
-		try {
-			kuaiShouImageUploandService.save(kuaiShouImageUploand);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param kuaiShouImageUploand
-	 * @return
-	 */
-	@AutoLog(value = "快手-上传图片接口-编辑")
-	@ApiOperation(value="快手-上传图片接口-编辑", notes="快手-上传图片接口-编辑")
-	@PutMapping(value = "/edit")
-	public Result<KuaiShouImageUploand> edit(@RequestBody KuaiShouImageUploand kuaiShouImageUploand) {
-		Result<KuaiShouImageUploand> result = new Result<KuaiShouImageUploand>();
-		KuaiShouImageUploand kuaiShouImageUploandEntity = kuaiShouImageUploandService.getById(kuaiShouImageUploand.getId());
-		if(kuaiShouImageUploandEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = kuaiShouImageUploandService.updateById(kuaiShouImageUploand);
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "快手-上传图片接口-通过id删除")
-	@ApiOperation(value="快手-上传图片接口-通过id删除", notes="快手-上传图片接口-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
-			kuaiShouImageUploandService.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "快手-上传图片接口-批量删除")
-	@ApiOperation(value="快手-上传图片接口-批量删除", notes="快手-上传图片接口-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<KuaiShouImageUploand> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouImageUploand> result = new Result<KuaiShouImageUploand>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.kuaiShouImageUploandService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "快手-上传图片接口-通过id查询")
-	@ApiOperation(value="快手-上传图片接口-通过id查询", notes="快手-上传图片接口-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<KuaiShouImageUploand> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouImageUploand> result = new Result<KuaiShouImageUploand>();
-		KuaiShouImageUploand kuaiShouImageUploand = kuaiShouImageUploandService.getById(id);
-		if(kuaiShouImageUploand==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(kuaiShouImageUploand);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouImageUploand> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouImageUploand kuaiShouImageUploand = JSON.parseObject(deString, KuaiShouImageUploand.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImageUploand, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouImageUploand> pageList = kuaiShouImageUploandService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "快手-上传图片接口列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouImageUploand.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("快手-上传图片接口列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();// 获取上传文件对象
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<KuaiShouImageUploand> listKuaiShouImageUploands = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouImageUploand.class, params);
-              kuaiShouImageUploandService.saveBatch(listKuaiShouImageUploands);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouImageUploands.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
+    @Autowired
+    private IKuaiShouImageUploandService kuaiShouImageUploandService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param kuaiShouImageUploand
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "快手-上传图片接口-分页列表查询")
+    @ApiOperation(value = "快手-上传图片接口-分页列表查询", notes = "快手-上传图片接口-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<KuaiShouImageUploand>> queryPageList(KuaiShouImageUploand kuaiShouImageUploand,
+                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                             HttpServletRequest req) {
+        Result<IPage<KuaiShouImageUploand>> result = new Result<IPage<KuaiShouImageUploand>>();
+        QueryWrapper<KuaiShouImageUploand> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImageUploand, req.getParameterMap());
+        Page<KuaiShouImageUploand> page = new Page<KuaiShouImageUploand>(pageNo, pageSize);
+        IPage<KuaiShouImageUploand> pageList = kuaiShouImageUploandService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param kuaiShouImageUploand
+     * @return
+     */
+    @AutoLog(value = "快手-上传图片接口-添加")
+    @ApiOperation(value = "快手-上传图片接口-添加", notes = "快手-上传图片接口-添加")
+    @PostMapping(value = "/add")
+    public Result<KuaiShouImageUploand> add(@RequestBody KuaiShouImageUploand kuaiShouImageUploand) {
+        Result<KuaiShouImageUploand> result = new Result<KuaiShouImageUploand>();
+        try {
+            kuaiShouImageUploandService.save(kuaiShouImageUploand);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param kuaiShouImageUploand
+     * @return
+     */
+    @AutoLog(value = "快手-上传图片接口-编辑")
+    @ApiOperation(value = "快手-上传图片接口-编辑", notes = "快手-上传图片接口-编辑")
+    @PutMapping(value = "/edit")
+    public Result<KuaiShouImageUploand> edit(@RequestBody KuaiShouImageUploand kuaiShouImageUploand) {
+        Result<KuaiShouImageUploand> result = new Result<KuaiShouImageUploand>();
+        KuaiShouImageUploand kuaiShouImageUploandEntity = kuaiShouImageUploandService.getById(kuaiShouImageUploand.getId());
+        if (kuaiShouImageUploandEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = kuaiShouImageUploandService.updateById(kuaiShouImageUploand);
+            //TODO 返回false说明什么?
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "快手-上传图片接口-通过id删除")
+    @ApiOperation(value = "快手-上传图片接口-通过id删除", notes = "快手-上传图片接口-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            kuaiShouImageUploandService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "快手-上传图片接口-批量删除")
+    @ApiOperation(value = "快手-上传图片接口-批量删除", notes = "快手-上传图片接口-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<KuaiShouImageUploand> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouImageUploand> result = new Result<KuaiShouImageUploand>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.kuaiShouImageUploandService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "快手-上传图片接口-通过id查询")
+    @ApiOperation(value = "快手-上传图片接口-通过id查询", notes = "快手-上传图片接口-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<KuaiShouImageUploand> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouImageUploand> result = new Result<KuaiShouImageUploand>();
+        KuaiShouImageUploand kuaiShouImageUploand = kuaiShouImageUploandService.getById(id);
+        if (kuaiShouImageUploand == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouImageUploand);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouImageUploand> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouImageUploand kuaiShouImageUploand = JSON.parseObject(deString, KuaiShouImageUploand.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImageUploand, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouImageUploand> pageList = kuaiShouImageUploandService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-上传图片接口列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouImageUploand.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("快手-上传图片接口列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<KuaiShouImageUploand> listKuaiShouImageUploands = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouImageUploand.class, params);
+                kuaiShouImageUploandService.saveBatch(listKuaiShouImageUploands);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouImageUploands.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
 
 }

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

@@ -8,13 +8,16 @@ 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.KuaiShouRegionListChildren;
 import org.jeecg.modules.kuaishou.service.IKuaiShouRegionListChildrenService;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,210 +38,216 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
+/**
  * @Description: 快手-子级地域
  * @Author: jeecg-boot
- * @Date:   2019-07-25
+ * @Date: 2019-07-25
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="快手-子级地域")
+@Api(tags = "快手-子级地域")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouRegionListChildren")
 public class KuaiShouRegionListChildrenController {
-	@Autowired
-	private IKuaiShouRegionListChildrenService kuaiShouRegionListChildrenService;
-	
-	/**
-	  * 分页列表查询
-	 * @param kuaiShouRegionListChildren
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "快手-子级地域-分页列表查询")
-	@ApiOperation(value="快手-子级地域-分页列表查询", notes="快手-子级地域-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouRegionListChildren>> queryPageList(KuaiShouRegionListChildren kuaiShouRegionListChildren,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouRegionListChildren>> result = new Result<IPage<KuaiShouRegionListChildren>>();
-		QueryWrapper<KuaiShouRegionListChildren> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouRegionListChildren, req.getParameterMap());
-		Page<KuaiShouRegionListChildren> page = new Page<KuaiShouRegionListChildren>(pageNo, pageSize);
-		IPage<KuaiShouRegionListChildren> pageList = kuaiShouRegionListChildrenService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param kuaiShouRegionListChildren
-	 * @return
-	 */
-	@AutoLog(value = "快手-子级地域-添加")
-	@ApiOperation(value="快手-子级地域-添加", notes="快手-子级地域-添加")
-	@PostMapping(value = "/add")
-	public Result<KuaiShouRegionListChildren> add(@RequestBody KuaiShouRegionListChildren kuaiShouRegionListChildren) {
-		Result<KuaiShouRegionListChildren> result = new Result<KuaiShouRegionListChildren>();
-		try {
-			kuaiShouRegionListChildrenService.save(kuaiShouRegionListChildren);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param kuaiShouRegionListChildren
-	 * @return
-	 */
-	@AutoLog(value = "快手-子级地域-编辑")
-	@ApiOperation(value="快手-子级地域-编辑", notes="快手-子级地域-编辑")
-	@PutMapping(value = "/edit")
-	public Result<KuaiShouRegionListChildren> edit(@RequestBody KuaiShouRegionListChildren kuaiShouRegionListChildren) {
-		Result<KuaiShouRegionListChildren> result = new Result<KuaiShouRegionListChildren>();
-		KuaiShouRegionListChildren kuaiShouRegionListChildrenEntity = kuaiShouRegionListChildrenService.getById(kuaiShouRegionListChildren.getId());
-		if(kuaiShouRegionListChildrenEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = kuaiShouRegionListChildrenService.updateById(kuaiShouRegionListChildren);
-			//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 {
-			kuaiShouRegionListChildrenService.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<KuaiShouRegionListChildren> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouRegionListChildren> result = new Result<KuaiShouRegionListChildren>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.kuaiShouRegionListChildrenService.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<KuaiShouRegionListChildren> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouRegionListChildren> result = new Result<KuaiShouRegionListChildren>();
-		KuaiShouRegionListChildren kuaiShouRegionListChildren = kuaiShouRegionListChildrenService.getById(id);
-		if(kuaiShouRegionListChildren==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(kuaiShouRegionListChildren);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouRegionListChildren> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouRegionListChildren kuaiShouRegionListChildren = JSON.parseObject(deString, KuaiShouRegionListChildren.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouRegionListChildren, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouRegionListChildren> pageList = kuaiShouRegionListChildrenService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "快手-子级地域列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouRegionListChildren.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<KuaiShouRegionListChildren> listKuaiShouRegionListChildrens = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouRegionListChildren.class, params);
-              kuaiShouRegionListChildrenService.saveBatch(listKuaiShouRegionListChildrens);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouRegionListChildrens.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("文件导入失败!");
-  }
+    @Autowired
+    private IKuaiShouRegionListChildrenService kuaiShouRegionListChildrenService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param kuaiShouRegionListChildren
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "快手-子级地域-分页列表查询")
+    @ApiOperation(value = "快手-子级地域-分页列表查询", notes = "快手-子级地域-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<KuaiShouRegionListChildren>> queryPageList(KuaiShouRegionListChildren kuaiShouRegionListChildren,
+                                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                   HttpServletRequest req) {
+        Result<IPage<KuaiShouRegionListChildren>> result = new Result<IPage<KuaiShouRegionListChildren>>();
+        QueryWrapper<KuaiShouRegionListChildren> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouRegionListChildren, req.getParameterMap());
+        Page<KuaiShouRegionListChildren> page = new Page<KuaiShouRegionListChildren>(pageNo, pageSize);
+        IPage<KuaiShouRegionListChildren> pageList = kuaiShouRegionListChildrenService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param kuaiShouRegionListChildren
+     * @return
+     */
+    @AutoLog(value = "快手-子级地域-添加")
+    @ApiOperation(value = "快手-子级地域-添加", notes = "快手-子级地域-添加")
+    @PostMapping(value = "/add")
+    public Result<KuaiShouRegionListChildren> add(@RequestBody KuaiShouRegionListChildren kuaiShouRegionListChildren) {
+        Result<KuaiShouRegionListChildren> result = new Result<KuaiShouRegionListChildren>();
+        try {
+            kuaiShouRegionListChildrenService.save(kuaiShouRegionListChildren);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param kuaiShouRegionListChildren
+     * @return
+     */
+    @AutoLog(value = "快手-子级地域-编辑")
+    @ApiOperation(value = "快手-子级地域-编辑", notes = "快手-子级地域-编辑")
+    @PutMapping(value = "/edit")
+    public Result<KuaiShouRegionListChildren> edit(@RequestBody KuaiShouRegionListChildren kuaiShouRegionListChildren) {
+        Result<KuaiShouRegionListChildren> result = new Result<KuaiShouRegionListChildren>();
+        KuaiShouRegionListChildren kuaiShouRegionListChildrenEntity = kuaiShouRegionListChildrenService.getById(kuaiShouRegionListChildren.getId());
+        if (kuaiShouRegionListChildrenEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = kuaiShouRegionListChildrenService.updateById(kuaiShouRegionListChildren);
+            //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 {
+            kuaiShouRegionListChildrenService.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<KuaiShouRegionListChildren> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouRegionListChildren> result = new Result<KuaiShouRegionListChildren>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.kuaiShouRegionListChildrenService.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<KuaiShouRegionListChildren> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouRegionListChildren> result = new Result<KuaiShouRegionListChildren>();
+        KuaiShouRegionListChildren kuaiShouRegionListChildren = kuaiShouRegionListChildrenService.getById(id);
+        if (kuaiShouRegionListChildren == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouRegionListChildren);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouRegionListChildren> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouRegionListChildren kuaiShouRegionListChildren = JSON.parseObject(deString, KuaiShouRegionListChildren.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouRegionListChildren, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouRegionListChildren> pageList = kuaiShouRegionListChildrenService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-子级地域列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouRegionListChildren.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<KuaiShouRegionListChildren> listKuaiShouRegionListChildrens = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouRegionListChildren.class, params);
+                kuaiShouRegionListChildrenService.saveBatch(listKuaiShouRegionListChildrens);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouRegionListChildrens.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("文件导入失败!");
+    }
 
 }

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

@@ -8,13 +8,16 @@ 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.KuaiShouRegionListParent;
 import org.jeecg.modules.kuaishou.service.IKuaiShouRegionListParentService;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,210 +38,216 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
+/**
  * @Description: 快手-父级地域
  * @Author: jeecg-boot
- * @Date:   2019-07-25
+ * @Date: 2019-07-25
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="快手-父级地域")
+@Api(tags = "快手-父级地域")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouRegionListParent")
 public class KuaiShouRegionListParentController {
-	@Autowired
-	private IKuaiShouRegionListParentService kuaiShouRegionListParentService;
-	
-	/**
-	  * 分页列表查询
-	 * @param kuaiShouRegionListParent
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "快手-父级地域-分页列表查询")
-	@ApiOperation(value="快手-父级地域-分页列表查询", notes="快手-父级地域-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouRegionListParent>> queryPageList(KuaiShouRegionListParent kuaiShouRegionListParent,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouRegionListParent>> result = new Result<IPage<KuaiShouRegionListParent>>();
-		QueryWrapper<KuaiShouRegionListParent> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouRegionListParent, req.getParameterMap());
-		Page<KuaiShouRegionListParent> page = new Page<KuaiShouRegionListParent>(pageNo, pageSize);
-		IPage<KuaiShouRegionListParent> pageList = kuaiShouRegionListParentService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param kuaiShouRegionListParent
-	 * @return
-	 */
-	@AutoLog(value = "快手-父级地域-添加")
-	@ApiOperation(value="快手-父级地域-添加", notes="快手-父级地域-添加")
-	@PostMapping(value = "/add")
-	public Result<KuaiShouRegionListParent> add(@RequestBody KuaiShouRegionListParent kuaiShouRegionListParent) {
-		Result<KuaiShouRegionListParent> result = new Result<KuaiShouRegionListParent>();
-		try {
-			kuaiShouRegionListParentService.save(kuaiShouRegionListParent);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param kuaiShouRegionListParent
-	 * @return
-	 */
-	@AutoLog(value = "快手-父级地域-编辑")
-	@ApiOperation(value="快手-父级地域-编辑", notes="快手-父级地域-编辑")
-	@PutMapping(value = "/edit")
-	public Result<KuaiShouRegionListParent> edit(@RequestBody KuaiShouRegionListParent kuaiShouRegionListParent) {
-		Result<KuaiShouRegionListParent> result = new Result<KuaiShouRegionListParent>();
-		KuaiShouRegionListParent kuaiShouRegionListParentEntity = kuaiShouRegionListParentService.getById(kuaiShouRegionListParent.getId());
-		if(kuaiShouRegionListParentEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = kuaiShouRegionListParentService.updateById(kuaiShouRegionListParent);
-			//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 {
-			kuaiShouRegionListParentService.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<KuaiShouRegionListParent> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouRegionListParent> result = new Result<KuaiShouRegionListParent>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.kuaiShouRegionListParentService.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<KuaiShouRegionListParent> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouRegionListParent> result = new Result<KuaiShouRegionListParent>();
-		KuaiShouRegionListParent kuaiShouRegionListParent = kuaiShouRegionListParentService.getById(id);
-		if(kuaiShouRegionListParent==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(kuaiShouRegionListParent);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouRegionListParent> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouRegionListParent kuaiShouRegionListParent = JSON.parseObject(deString, KuaiShouRegionListParent.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouRegionListParent, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouRegionListParent> pageList = kuaiShouRegionListParentService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "快手-父级地域列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouRegionListParent.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<KuaiShouRegionListParent> listKuaiShouRegionListParents = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouRegionListParent.class, params);
-              kuaiShouRegionListParentService.saveBatch(listKuaiShouRegionListParents);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouRegionListParents.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("文件导入失败!");
-  }
+    @Autowired
+    private IKuaiShouRegionListParentService kuaiShouRegionListParentService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param kuaiShouRegionListParent
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "快手-父级地域-分页列表查询")
+    @ApiOperation(value = "快手-父级地域-分页列表查询", notes = "快手-父级地域-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<KuaiShouRegionListParent>> queryPageList(KuaiShouRegionListParent kuaiShouRegionListParent,
+                                                                 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                 HttpServletRequest req) {
+        Result<IPage<KuaiShouRegionListParent>> result = new Result<IPage<KuaiShouRegionListParent>>();
+        QueryWrapper<KuaiShouRegionListParent> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouRegionListParent, req.getParameterMap());
+        Page<KuaiShouRegionListParent> page = new Page<KuaiShouRegionListParent>(pageNo, pageSize);
+        IPage<KuaiShouRegionListParent> pageList = kuaiShouRegionListParentService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param kuaiShouRegionListParent
+     * @return
+     */
+    @AutoLog(value = "快手-父级地域-添加")
+    @ApiOperation(value = "快手-父级地域-添加", notes = "快手-父级地域-添加")
+    @PostMapping(value = "/add")
+    public Result<KuaiShouRegionListParent> add(@RequestBody KuaiShouRegionListParent kuaiShouRegionListParent) {
+        Result<KuaiShouRegionListParent> result = new Result<KuaiShouRegionListParent>();
+        try {
+            kuaiShouRegionListParentService.save(kuaiShouRegionListParent);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param kuaiShouRegionListParent
+     * @return
+     */
+    @AutoLog(value = "快手-父级地域-编辑")
+    @ApiOperation(value = "快手-父级地域-编辑", notes = "快手-父级地域-编辑")
+    @PutMapping(value = "/edit")
+    public Result<KuaiShouRegionListParent> edit(@RequestBody KuaiShouRegionListParent kuaiShouRegionListParent) {
+        Result<KuaiShouRegionListParent> result = new Result<KuaiShouRegionListParent>();
+        KuaiShouRegionListParent kuaiShouRegionListParentEntity = kuaiShouRegionListParentService.getById(kuaiShouRegionListParent.getId());
+        if (kuaiShouRegionListParentEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = kuaiShouRegionListParentService.updateById(kuaiShouRegionListParent);
+            //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 {
+            kuaiShouRegionListParentService.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<KuaiShouRegionListParent> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouRegionListParent> result = new Result<KuaiShouRegionListParent>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.kuaiShouRegionListParentService.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<KuaiShouRegionListParent> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouRegionListParent> result = new Result<KuaiShouRegionListParent>();
+        KuaiShouRegionListParent kuaiShouRegionListParent = kuaiShouRegionListParentService.getById(id);
+        if (kuaiShouRegionListParent == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouRegionListParent);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouRegionListParent> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouRegionListParent kuaiShouRegionListParent = JSON.parseObject(deString, KuaiShouRegionListParent.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouRegionListParent, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouRegionListParent> pageList = kuaiShouRegionListParentService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-父级地域列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouRegionListParent.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<KuaiShouRegionListParent> listKuaiShouRegionListParents = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouRegionListParent.class, params);
+                kuaiShouRegionListParentService.saveBatch(listKuaiShouRegionListParents);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouRegionListParents.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("文件导入失败!");
+    }
 
 }

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

@@ -8,13 +8,16 @@ 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.KuaiShouSchedule;
 import org.jeecg.modules.kuaishou.service.IKuaiShouScheduleService;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,210 +38,216 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
+/**
  * @Description: 广告组-时间段范围
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="广告组-时间段范围")
+@Api(tags = "广告组-时间段范围")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouSchedule")
 public class KuaiShouScheduleController {
-	@Autowired
-	private IKuaiShouScheduleService kuaiShouScheduleService;
-	
-	/**
-	  * 分页列表查询
-	 * @param kuaiShouSchedule
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "广告组-时间段范围-分页列表查询")
-	@ApiOperation(value="广告组-时间段范围-分页列表查询", notes="广告组-时间段范围-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouSchedule>> queryPageList(KuaiShouSchedule kuaiShouSchedule,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouSchedule>> result = new Result<IPage<KuaiShouSchedule>>();
-		QueryWrapper<KuaiShouSchedule> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouSchedule, req.getParameterMap());
-		Page<KuaiShouSchedule> page = new Page<KuaiShouSchedule>(pageNo, pageSize);
-		IPage<KuaiShouSchedule> pageList = kuaiShouScheduleService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param kuaiShouSchedule
-	 * @return
-	 */
-	@AutoLog(value = "广告组-时间段范围-添加")
-	@ApiOperation(value="广告组-时间段范围-添加", notes="广告组-时间段范围-添加")
-	@PostMapping(value = "/add")
-	public Result<KuaiShouSchedule> add(@RequestBody KuaiShouSchedule kuaiShouSchedule) {
-		Result<KuaiShouSchedule> result = new Result<KuaiShouSchedule>();
-		try {
-			kuaiShouScheduleService.save(kuaiShouSchedule);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param kuaiShouSchedule
-	 * @return
-	 */
-	@AutoLog(value = "广告组-时间段范围-编辑")
-	@ApiOperation(value="广告组-时间段范围-编辑", notes="广告组-时间段范围-编辑")
-	@PutMapping(value = "/edit")
-	public Result<KuaiShouSchedule> edit(@RequestBody KuaiShouSchedule kuaiShouSchedule) {
-		Result<KuaiShouSchedule> result = new Result<KuaiShouSchedule>();
-		KuaiShouSchedule kuaiShouScheduleEntity = kuaiShouScheduleService.getById(kuaiShouSchedule.getId());
-		if(kuaiShouScheduleEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = kuaiShouScheduleService.updateById(kuaiShouSchedule);
-			//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 {
-			kuaiShouScheduleService.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<KuaiShouSchedule> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouSchedule> result = new Result<KuaiShouSchedule>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.kuaiShouScheduleService.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<KuaiShouSchedule> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouSchedule> result = new Result<KuaiShouSchedule>();
-		KuaiShouSchedule kuaiShouSchedule = kuaiShouScheduleService.getById(id);
-		if(kuaiShouSchedule==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(kuaiShouSchedule);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouSchedule> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouSchedule kuaiShouSchedule = JSON.parseObject(deString, KuaiShouSchedule.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouSchedule, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouSchedule> pageList = kuaiShouScheduleService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "广告组-时间段范围列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouSchedule.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<KuaiShouSchedule> listKuaiShouSchedules = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouSchedule.class, params);
-              kuaiShouScheduleService.saveBatch(listKuaiShouSchedules);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouSchedules.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("文件导入失败!");
-  }
+    @Autowired
+    private IKuaiShouScheduleService kuaiShouScheduleService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param kuaiShouSchedule
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "广告组-时间段范围-分页列表查询")
+    @ApiOperation(value = "广告组-时间段范围-分页列表查询", notes = "广告组-时间段范围-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<KuaiShouSchedule>> queryPageList(KuaiShouSchedule kuaiShouSchedule,
+                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                         HttpServletRequest req) {
+        Result<IPage<KuaiShouSchedule>> result = new Result<IPage<KuaiShouSchedule>>();
+        QueryWrapper<KuaiShouSchedule> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouSchedule, req.getParameterMap());
+        Page<KuaiShouSchedule> page = new Page<KuaiShouSchedule>(pageNo, pageSize);
+        IPage<KuaiShouSchedule> pageList = kuaiShouScheduleService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param kuaiShouSchedule
+     * @return
+     */
+    @AutoLog(value = "广告组-时间段范围-添加")
+    @ApiOperation(value = "广告组-时间段范围-添加", notes = "广告组-时间段范围-添加")
+    @PostMapping(value = "/add")
+    public Result<KuaiShouSchedule> add(@RequestBody KuaiShouSchedule kuaiShouSchedule) {
+        Result<KuaiShouSchedule> result = new Result<KuaiShouSchedule>();
+        try {
+            kuaiShouScheduleService.save(kuaiShouSchedule);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param kuaiShouSchedule
+     * @return
+     */
+    @AutoLog(value = "广告组-时间段范围-编辑")
+    @ApiOperation(value = "广告组-时间段范围-编辑", notes = "广告组-时间段范围-编辑")
+    @PutMapping(value = "/edit")
+    public Result<KuaiShouSchedule> edit(@RequestBody KuaiShouSchedule kuaiShouSchedule) {
+        Result<KuaiShouSchedule> result = new Result<KuaiShouSchedule>();
+        KuaiShouSchedule kuaiShouScheduleEntity = kuaiShouScheduleService.getById(kuaiShouSchedule.getId());
+        if (kuaiShouScheduleEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = kuaiShouScheduleService.updateById(kuaiShouSchedule);
+            //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 {
+            kuaiShouScheduleService.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<KuaiShouSchedule> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouSchedule> result = new Result<KuaiShouSchedule>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.kuaiShouScheduleService.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<KuaiShouSchedule> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouSchedule> result = new Result<KuaiShouSchedule>();
+        KuaiShouSchedule kuaiShouSchedule = kuaiShouScheduleService.getById(id);
+        if (kuaiShouSchedule == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouSchedule);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouSchedule> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouSchedule kuaiShouSchedule = JSON.parseObject(deString, KuaiShouSchedule.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouSchedule, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouSchedule> pageList = kuaiShouScheduleService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "广告组-时间段范围列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouSchedule.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<KuaiShouSchedule> listKuaiShouSchedules = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouSchedule.class, params);
+                kuaiShouScheduleService.saveBatch(listKuaiShouSchedules);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouSchedules.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("文件导入失败!");
+    }
 
 }

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

@@ -8,13 +8,16 @@ 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.KuaiShouVideoGet;
 import org.jeecg.modules.kuaishou.service.IKuaiShouVideoGetService;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,210 +38,216 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
+/**
  * @Description: 快手-获取视频接口
  * @Author: jeecg-boot
- * @Date:   2019-07-25
+ * @Date: 2019-07-25
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="快手-获取视频接口")
+@Api(tags = "快手-获取视频接口")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouVideoGet")
 public class KuaiShouVideoGetController {
-	@Autowired
-	private IKuaiShouVideoGetService kuaiShouVideoGetService;
-	
-	/**
-	  * 分页列表查询
-	 * @param kuaiShouVideoGet
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "快手-获取视频接口-分页列表查询")
-	@ApiOperation(value="快手-获取视频接口-分页列表查询", notes="快手-获取视频接口-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouVideoGet>> queryPageList(KuaiShouVideoGet kuaiShouVideoGet,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouVideoGet>> result = new Result<IPage<KuaiShouVideoGet>>();
-		QueryWrapper<KuaiShouVideoGet> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouVideoGet, req.getParameterMap());
-		Page<KuaiShouVideoGet> page = new Page<KuaiShouVideoGet>(pageNo, pageSize);
-		IPage<KuaiShouVideoGet> pageList = kuaiShouVideoGetService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param kuaiShouVideoGet
-	 * @return
-	 */
-	@AutoLog(value = "快手-获取视频接口-添加")
-	@ApiOperation(value="快手-获取视频接口-添加", notes="快手-获取视频接口-添加")
-	@PostMapping(value = "/add")
-	public Result<KuaiShouVideoGet> add(@RequestBody KuaiShouVideoGet kuaiShouVideoGet) {
-		Result<KuaiShouVideoGet> result = new Result<KuaiShouVideoGet>();
-		try {
-			kuaiShouVideoGetService.save(kuaiShouVideoGet);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param kuaiShouVideoGet
-	 * @return
-	 */
-	@AutoLog(value = "快手-获取视频接口-编辑")
-	@ApiOperation(value="快手-获取视频接口-编辑", notes="快手-获取视频接口-编辑")
-	@PutMapping(value = "/edit")
-	public Result<KuaiShouVideoGet> edit(@RequestBody KuaiShouVideoGet kuaiShouVideoGet) {
-		Result<KuaiShouVideoGet> result = new Result<KuaiShouVideoGet>();
-		KuaiShouVideoGet kuaiShouVideoGetEntity = kuaiShouVideoGetService.getById(kuaiShouVideoGet.getId());
-		if(kuaiShouVideoGetEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = kuaiShouVideoGetService.updateById(kuaiShouVideoGet);
-			//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 {
-			kuaiShouVideoGetService.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<KuaiShouVideoGet> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouVideoGet> result = new Result<KuaiShouVideoGet>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.kuaiShouVideoGetService.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<KuaiShouVideoGet> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouVideoGet> result = new Result<KuaiShouVideoGet>();
-		KuaiShouVideoGet kuaiShouVideoGet = kuaiShouVideoGetService.getById(id);
-		if(kuaiShouVideoGet==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(kuaiShouVideoGet);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouVideoGet> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouVideoGet kuaiShouVideoGet = JSON.parseObject(deString, KuaiShouVideoGet.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouVideoGet, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouVideoGet> pageList = kuaiShouVideoGetService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "快手-获取视频接口列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouVideoGet.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<KuaiShouVideoGet> listKuaiShouVideoGets = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouVideoGet.class, params);
-              kuaiShouVideoGetService.saveBatch(listKuaiShouVideoGets);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouVideoGets.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("文件导入失败!");
-  }
+    @Autowired
+    private IKuaiShouVideoGetService kuaiShouVideoGetService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param kuaiShouVideoGet
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "快手-获取视频接口-分页列表查询")
+    @ApiOperation(value = "快手-获取视频接口-分页列表查询", notes = "快手-获取视频接口-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<KuaiShouVideoGet>> queryPageList(KuaiShouVideoGet kuaiShouVideoGet,
+                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                         HttpServletRequest req) {
+        Result<IPage<KuaiShouVideoGet>> result = new Result<IPage<KuaiShouVideoGet>>();
+        QueryWrapper<KuaiShouVideoGet> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouVideoGet, req.getParameterMap());
+        Page<KuaiShouVideoGet> page = new Page<KuaiShouVideoGet>(pageNo, pageSize);
+        IPage<KuaiShouVideoGet> pageList = kuaiShouVideoGetService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param kuaiShouVideoGet
+     * @return
+     */
+    @AutoLog(value = "快手-获取视频接口-添加")
+    @ApiOperation(value = "快手-获取视频接口-添加", notes = "快手-获取视频接口-添加")
+    @PostMapping(value = "/add")
+    public Result<KuaiShouVideoGet> add(@RequestBody KuaiShouVideoGet kuaiShouVideoGet) {
+        Result<KuaiShouVideoGet> result = new Result<KuaiShouVideoGet>();
+        try {
+            kuaiShouVideoGetService.save(kuaiShouVideoGet);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param kuaiShouVideoGet
+     * @return
+     */
+    @AutoLog(value = "快手-获取视频接口-编辑")
+    @ApiOperation(value = "快手-获取视频接口-编辑", notes = "快手-获取视频接口-编辑")
+    @PutMapping(value = "/edit")
+    public Result<KuaiShouVideoGet> edit(@RequestBody KuaiShouVideoGet kuaiShouVideoGet) {
+        Result<KuaiShouVideoGet> result = new Result<KuaiShouVideoGet>();
+        KuaiShouVideoGet kuaiShouVideoGetEntity = kuaiShouVideoGetService.getById(kuaiShouVideoGet.getId());
+        if (kuaiShouVideoGetEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = kuaiShouVideoGetService.updateById(kuaiShouVideoGet);
+            //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 {
+            kuaiShouVideoGetService.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<KuaiShouVideoGet> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouVideoGet> result = new Result<KuaiShouVideoGet>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.kuaiShouVideoGetService.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<KuaiShouVideoGet> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouVideoGet> result = new Result<KuaiShouVideoGet>();
+        KuaiShouVideoGet kuaiShouVideoGet = kuaiShouVideoGetService.getById(id);
+        if (kuaiShouVideoGet == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouVideoGet);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouVideoGet> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouVideoGet kuaiShouVideoGet = JSON.parseObject(deString, KuaiShouVideoGet.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouVideoGet, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouVideoGet> pageList = kuaiShouVideoGetService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-获取视频接口列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouVideoGet.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<KuaiShouVideoGet> listKuaiShouVideoGets = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouVideoGet.class, params);
+                kuaiShouVideoGetService.saveBatch(listKuaiShouVideoGets);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouVideoGets.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("文件导入失败!");
+    }
 
 }

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

@@ -8,13 +8,16 @@ 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.KuaiShouVideoUpload;
 import org.jeecg.modules.kuaishou.service.IKuaiShouVideoUploadService;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,210 +38,216 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
+/**
  * @Description: 快手-视频上传
  * @Author: jeecg-boot
- * @Date:   2019-07-26
+ * @Date: 2019-07-26
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="快手-视频上传")
+@Api(tags = "快手-视频上传")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouVideoUpload")
 public class KuaiShouVideoUploadController {
-	@Autowired
-	private IKuaiShouVideoUploadService kuaiShouVideoUploadService;
-	
-	/**
-	  * 分页列表查询
-	 * @param kuaiShouVideoUpload
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "快手-视频上传-分页列表查询")
-	@ApiOperation(value="快手-视频上传-分页列表查询", notes="快手-视频上传-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouVideoUpload>> queryPageList(KuaiShouVideoUpload kuaiShouVideoUpload,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouVideoUpload>> result = new Result<IPage<KuaiShouVideoUpload>>();
-		QueryWrapper<KuaiShouVideoUpload> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouVideoUpload, req.getParameterMap());
-		Page<KuaiShouVideoUpload> page = new Page<KuaiShouVideoUpload>(pageNo, pageSize);
-		IPage<KuaiShouVideoUpload> pageList = kuaiShouVideoUploadService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param kuaiShouVideoUpload
-	 * @return
-	 */
-	@AutoLog(value = "快手-视频上传-添加")
-	@ApiOperation(value="快手-视频上传-添加", notes="快手-视频上传-添加")
-	@PostMapping(value = "/add")
-	public Result<KuaiShouVideoUpload> add(@RequestBody KuaiShouVideoUpload kuaiShouVideoUpload) {
-		Result<KuaiShouVideoUpload> result = new Result<KuaiShouVideoUpload>();
-		try {
-			kuaiShouVideoUploadService.save(kuaiShouVideoUpload);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param kuaiShouVideoUpload
-	 * @return
-	 */
-	@AutoLog(value = "快手-视频上传-编辑")
-	@ApiOperation(value="快手-视频上传-编辑", notes="快手-视频上传-编辑")
-	@PutMapping(value = "/edit")
-	public Result<KuaiShouVideoUpload> edit(@RequestBody KuaiShouVideoUpload kuaiShouVideoUpload) {
-		Result<KuaiShouVideoUpload> result = new Result<KuaiShouVideoUpload>();
-		KuaiShouVideoUpload kuaiShouVideoUploadEntity = kuaiShouVideoUploadService.getById(kuaiShouVideoUpload.getId());
-		if(kuaiShouVideoUploadEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = kuaiShouVideoUploadService.updateById(kuaiShouVideoUpload);
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "快手-视频上传-通过id删除")
-	@ApiOperation(value="快手-视频上传-通过id删除", notes="快手-视频上传-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
-			kuaiShouVideoUploadService.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "快手-视频上传-批量删除")
-	@ApiOperation(value="快手-视频上传-批量删除", notes="快手-视频上传-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<KuaiShouVideoUpload> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouVideoUpload> result = new Result<KuaiShouVideoUpload>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.kuaiShouVideoUploadService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "快手-视频上传-通过id查询")
-	@ApiOperation(value="快手-视频上传-通过id查询", notes="快手-视频上传-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<KuaiShouVideoUpload> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouVideoUpload> result = new Result<KuaiShouVideoUpload>();
-		KuaiShouVideoUpload kuaiShouVideoUpload = kuaiShouVideoUploadService.getById(id);
-		if(kuaiShouVideoUpload==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(kuaiShouVideoUpload);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouVideoUpload> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouVideoUpload kuaiShouVideoUpload = JSON.parseObject(deString, KuaiShouVideoUpload.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouVideoUpload, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouVideoUpload> pageList = kuaiShouVideoUploadService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "快手-视频上传列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouVideoUpload.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("快手-视频上传列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();// 获取上传文件对象
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<KuaiShouVideoUpload> listKuaiShouVideoUploads = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouVideoUpload.class, params);
-              kuaiShouVideoUploadService.saveBatch(listKuaiShouVideoUploads);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouVideoUploads.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
+    @Autowired
+    private IKuaiShouVideoUploadService kuaiShouVideoUploadService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param kuaiShouVideoUpload
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "快手-视频上传-分页列表查询")
+    @ApiOperation(value = "快手-视频上传-分页列表查询", notes = "快手-视频上传-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<KuaiShouVideoUpload>> queryPageList(KuaiShouVideoUpload kuaiShouVideoUpload,
+                                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                            HttpServletRequest req) {
+        Result<IPage<KuaiShouVideoUpload>> result = new Result<IPage<KuaiShouVideoUpload>>();
+        QueryWrapper<KuaiShouVideoUpload> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouVideoUpload, req.getParameterMap());
+        Page<KuaiShouVideoUpload> page = new Page<KuaiShouVideoUpload>(pageNo, pageSize);
+        IPage<KuaiShouVideoUpload> pageList = kuaiShouVideoUploadService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param kuaiShouVideoUpload
+     * @return
+     */
+    @AutoLog(value = "快手-视频上传-添加")
+    @ApiOperation(value = "快手-视频上传-添加", notes = "快手-视频上传-添加")
+    @PostMapping(value = "/add")
+    public Result<KuaiShouVideoUpload> add(@RequestBody KuaiShouVideoUpload kuaiShouVideoUpload) {
+        Result<KuaiShouVideoUpload> result = new Result<KuaiShouVideoUpload>();
+        try {
+            kuaiShouVideoUploadService.save(kuaiShouVideoUpload);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param kuaiShouVideoUpload
+     * @return
+     */
+    @AutoLog(value = "快手-视频上传-编辑")
+    @ApiOperation(value = "快手-视频上传-编辑", notes = "快手-视频上传-编辑")
+    @PutMapping(value = "/edit")
+    public Result<KuaiShouVideoUpload> edit(@RequestBody KuaiShouVideoUpload kuaiShouVideoUpload) {
+        Result<KuaiShouVideoUpload> result = new Result<KuaiShouVideoUpload>();
+        KuaiShouVideoUpload kuaiShouVideoUploadEntity = kuaiShouVideoUploadService.getById(kuaiShouVideoUpload.getId());
+        if (kuaiShouVideoUploadEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = kuaiShouVideoUploadService.updateById(kuaiShouVideoUpload);
+            //TODO 返回false说明什么?
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "快手-视频上传-通过id删除")
+    @ApiOperation(value = "快手-视频上传-通过id删除", notes = "快手-视频上传-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            kuaiShouVideoUploadService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "快手-视频上传-批量删除")
+    @ApiOperation(value = "快手-视频上传-批量删除", notes = "快手-视频上传-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<KuaiShouVideoUpload> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouVideoUpload> result = new Result<KuaiShouVideoUpload>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.kuaiShouVideoUploadService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "快手-视频上传-通过id查询")
+    @ApiOperation(value = "快手-视频上传-通过id查询", notes = "快手-视频上传-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<KuaiShouVideoUpload> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouVideoUpload> result = new Result<KuaiShouVideoUpload>();
+        KuaiShouVideoUpload kuaiShouVideoUpload = kuaiShouVideoUploadService.getById(id);
+        if (kuaiShouVideoUpload == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouVideoUpload);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouVideoUpload> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouVideoUpload kuaiShouVideoUpload = JSON.parseObject(deString, KuaiShouVideoUpload.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouVideoUpload, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouVideoUpload> pageList = kuaiShouVideoUploadService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-视频上传列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouVideoUpload.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("快手-视频上传列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<KuaiShouVideoUpload> listKuaiShouVideoUploads = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouVideoUpload.class, params);
+                kuaiShouVideoUploadService.saveBatch(listKuaiShouVideoUploads);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouVideoUploads.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
 
 }

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.kuaishou.entity;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -18,42 +19,54 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 /**
  * @Description: 快手-可选深度转化类型
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  */
 @Data
 @TableName("ctop_kuaishou_conversion_infos")
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="ctop_kuaishou_conversion_infos对象", description="快手-可选深度转化类型")
+@ApiModel(value = "ctop_kuaishou_conversion_infos对象", description = "快手-可选深度转化类型")
 public class KuaiShouConversionInfos {
-    
-	/**id*/
-	@TableId(type = IdType.AUTO)
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
-	private Long id;
-	/**账户ID*/
-	@Excel(name = "账户ID", width = 15)
+    private Long id;
+    /**
+     * 账户ID
+     */
+    @Excel(name = "账户ID", width = 15)
     @ApiModelProperty(value = "账户ID")
-	private Long accountId;
-	/**是否有激活出价权限 0:没有 1:有*/
-	@Excel(name = "是否有激活出价权限 0:没有 1:有", width = 15)
+    private Long accountId;
+    /**
+     * 是否有激活出价权限 0:没有 1:有
+     */
+    @Excel(name = "是否有激活出价权限 0:没有 1:有", width = 15)
     @ApiModelProperty(value = "是否有激活出价权限 0:没有 1:有")
-	private Integer isActivate;
-	/**isFormSubmit*/
-	@Excel(name = "isFormSubmit", width = 15)
+    private Integer isActivate;
+    /**
+     * isFormSubmit
+     */
+    @Excel(name = "isFormSubmit", width = 15)
     @ApiModelProperty(value = "isFormSubmit")
-	private Integer isFormSubmit;
-	/**创建时间*/
-	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Integer isFormSubmit;
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
-	private Date createTime;
-	/**修改时间*/
-	@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "修改时间")
-	private Date updateTime;
+    private Date updateTime;
 }

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 快手-可选深度转化类型
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  */
 public interface KuaiShouConversionInfosMapper extends BaseMapper<KuaiShouConversionInfos> {

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

@@ -6,7 +6,7 @@ import org.jeecg.modules.kuaishou.entity.KuaiShouConversionTypes;
 /**
  * @Description: 快手-可选深度转化类型-详情
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  */
 public interface KuaiShouConversionTypesMapper extends BaseMapper<KuaiShouConversionTypes> {

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 快手-创建创意信息
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  */
 public interface KuaiShouCreativeCreateMapper extends BaseMapper<KuaiShouCreativeCreate> {

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 快手-创建广告组定向信息
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  */
 public interface KuaiShouGroupCreateTargetMapper extends BaseMapper<KuaiShouGroupCreateTarget> {

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 快手-获取图片接口
  * @Author: jeecg-boot
- * @Date:   2019-07-25
+ * @Date: 2019-07-25
  * @Version: V1.0
  */
 public interface KuaiShouImageGetMapper extends BaseMapper<KuaiShouImageGet> {

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

@@ -6,7 +6,7 @@ import org.jeecg.modules.kuaishou.entity.KuaiShouRegionListChildren;
 /**
  * @Description: 快手-子级地域
  * @Author: jeecg-boot
- * @Date:   2019-07-25
+ * @Date: 2019-07-25
  * @Version: V1.0
  */
 public interface KuaiShouRegionListChildrenMapper extends BaseMapper<KuaiShouRegionListChildren> {

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 快手-获取视频接口
  * @Author: jeecg-boot
- * @Date:   2019-07-25
+ * @Date: 2019-07-25
  * @Version: V1.0
  */
 public interface KuaiShouVideoGetMapper extends BaseMapper<KuaiShouVideoGet> {

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

@@ -6,7 +6,7 @@ import org.jeecg.modules.kuaishou.entity.KuaiShouVideoUpload;
 /**
  * @Description: 快手-视频上传
  * @Author: jeecg-boot
- * @Date:   2019-07-26
+ * @Date: 2019-07-26
  * @Version: V1.0
  */
 public interface KuaiShouVideoUploadMapper extends BaseMapper<KuaiShouVideoUpload> {

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.kuaishou.mapper.KuaiShouRegionListParentMapper">
-<delete id="deleteAll">
+    <delete id="deleteAll">
     DELETE FROM ctop_kuaishou_region_list_children;
 </delete>
 </mapper>

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 创建应用
  * @Author: jeecg-boot
- * @Date:   2019-07-26
+ * @Date: 2019-07-26
  * @Version: V1.0
  */
 public interface IKuaiShouAppCreateService extends IService<KuaiShouAppCreate> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 广告组-app信息
  * @Author: jeecg-boot
- * @Date:   2019-07-23
+ * @Date: 2019-07-23
  * @Version: V1.0
  */
 public interface IKuaiShouAppInfoService extends IService<KuaiShouAppInfo> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 快手-应用列表
  * @Author: jeecg-boot
- * @Date:   2019-07-26
+ * @Date: 2019-07-26
  * @Version: V1.0
  */
 public interface IKuaiShouAppListService extends IService<KuaiShouAppList> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 快手-创建广告计划
  * @Author: jeecg-boot
- * @Date:   2019-07-23
+ * @Date: 2019-07-23
  * @Version: V1.0
  */
 public interface IKuaiShouCampaignCreateService extends IService<KuaiShouCampaignCreate> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 快手-获取广告计划信息
  * @Author: jeecg-boot
- * @Date:   2019-07-23
+ * @Date: 2019-07-23
  * @Version: V1.0
  */
 public interface IKuaiShouCampaignService extends IService<KuaiShouCampaign> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 快手-可选深度转化类型
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  */
 public interface IKuaiShouConversionInfosService extends IService<KuaiShouConversionInfos> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 快手-可选深度转化类型-详情
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  */
 public interface IKuaiShouConversionTypesService extends IService<KuaiShouConversionTypes> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 快手-创建创意信息
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  */
 public interface IKuaiShouCreativeCreateService extends IService<KuaiShouCreativeCreate> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 快手-创意信息
  * @Author: jeecg-boot
- * @Date:   2019-07-23
+ * @Date: 2019-07-23
  * @Version: V1.0
  */
 public interface IKuaiShouCreativeService extends IService<KuaiShouCreative> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 快手-创建广告组信息
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  */
 public interface IKuaiShouGroupCreateService extends IService<KuaiShouGroupCreate> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 快手-创建广告组定向信息
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  */
 public interface IKuaiShouGroupCreateTargetService extends IService<KuaiShouGroupCreateTarget> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 广告组信息
  * @Author: jeecg-boot
- * @Date:   2019-07-23
+ * @Date: 2019-07-23
  * @Version: V1.0
  */
 public interface IKuaiShouGroupService extends IService<KuaiShouGroup> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 快手-获取图片接口
  * @Author: jeecg-boot
- * @Date:   2019-07-25
+ * @Date: 2019-07-25
  * @Version: V1.0
  */
 public interface IKuaiShouImageGetService extends IService<KuaiShouImageGet> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 快手-上传图片接口
  * @Author: jeecg-boot
- * @Date:   2019-07-26
+ * @Date: 2019-07-26
  * @Version: V1.0
  */
 public interface IKuaiShouImageUploandService extends IService<KuaiShouImageUploand> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 快手-子级地域
  * @Author: jeecg-boot
- * @Date:   2019-07-25
+ * @Date: 2019-07-25
  * @Version: V1.0
  */
 public interface IKuaiShouRegionListChildrenService extends IService<KuaiShouRegionListChildren> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 快手-父级地域
  * @Author: jeecg-boot
- * @Date:   2019-07-25
+ * @Date: 2019-07-25
  * @Version: V1.0
  */
 public interface IKuaiShouRegionListParentService extends IService<KuaiShouRegionListParent> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 广告组-时间段范围
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  */
 public interface IKuaiShouScheduleService extends IService<KuaiShouSchedule> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 快手-获取视频接口
  * @Author: jeecg-boot
- * @Date:   2019-07-25
+ * @Date: 2019-07-25
  * @Version: V1.0
  */
 public interface IKuaiShouVideoGetService extends IService<KuaiShouVideoGet> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 快手-视频上传
  * @Author: jeecg-boot
- * @Date:   2019-07-26
+ * @Date: 2019-07-26
  * @Version: V1.0
  */
 public interface IKuaiShouVideoUploadService extends IService<KuaiShouVideoUpload> {

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 创建应用
  * @Author: jeecg-boot
- * @Date:   2019-07-26
+ * @Date: 2019-07-26
  * @Version: V1.0
  */
 @Service

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 广告组-app信息
  * @Author: jeecg-boot
- * @Date:   2019-07-23
+ * @Date: 2019-07-23
  * @Version: V1.0
  */
 @Service

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 快手-应用列表
  * @Author: jeecg-boot
- * @Date:   2019-07-26
+ * @Date: 2019-07-26
  * @Version: V1.0
  */
 @Service

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 快手-创建广告计划
  * @Author: jeecg-boot
- * @Date:   2019-07-23
+ * @Date: 2019-07-23
  * @Version: V1.0
  */
 @Service

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 快手-获取广告计划信息
  * @Author: jeecg-boot
- * @Date:   2019-07-23
+ * @Date: 2019-07-23
  * @Version: V1.0
  */
 @Service

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 快手-可选深度转化类型-详情
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  */
 @Service

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 快手-创建创意信息
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  */
 @Service

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 快手-创意信息
  * @Author: jeecg-boot
- * @Date:   2019-07-23
+ * @Date: 2019-07-23
  * @Version: V1.0
  */
 @Service

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 快手-创建广告组信息
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  */
 @Service

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 快手-创建广告组定向信息
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  */
 @Service

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 广告组信息
  * @Author: jeecg-boot
- * @Date:   2019-07-23
+ * @Date: 2019-07-23
  * @Version: V1.0
  */
 @Service

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 快手-获取图片接口
  * @Author: jeecg-boot
- * @Date:   2019-07-25
+ * @Date: 2019-07-25
  * @Version: V1.0
  */
 @Service

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 快手-上传图片接口
  * @Author: jeecg-boot
- * @Date:   2019-07-26
+ * @Date: 2019-07-26
  * @Version: V1.0
  */
 @Service

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 快手-子级地域
  * @Author: jeecg-boot
- * @Date:   2019-07-25
+ * @Date: 2019-07-25
  * @Version: V1.0
  */
 @Service

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 快手-父级地域
  * @Author: jeecg-boot
- * @Date:   2019-07-25
+ * @Date: 2019-07-25
  * @Version: V1.0
  */
 @Service

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 广告组-时间段范围
  * @Author: jeecg-boot
- * @Date:   2019-07-24
+ * @Date: 2019-07-24
  * @Version: V1.0
  */
 @Service

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 快手-获取视频接口
  * @Author: jeecg-boot
- * @Date:   2019-07-25
+ * @Date: 2019-07-25
  * @Version: V1.0
  */
 @Service

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 快手-视频上传
  * @Author: jeecg-boot
- * @Date:   2019-07-26
+ * @Date: 2019-07-26
  * @Version: V1.0
  */
 @Service

+ 183 - 178
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouAppCreateList.vue

@@ -1,39 +1,39 @@
 <template>
-  <a-card :bordered="false">
+    <a-card :bordered="false">
 
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
+        <!-- 查询区域 -->
+        <div class="table-page-search-wrapper">
+            <a-form layout="inline">
+                <a-row :gutter="24">
 
-          <a-col :md="6" :sm="8">
-            <a-form-item label="账户ID">
-              <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="本地存储地址">
-              <a-input placeholder="请输入本地存储地址" v-model="queryParam.savaPath"></a-input>
-            </a-form-item>
-          </a-col>
-        <template v-if="toggleSearchStatus">
-        <a-col :md="6" :sm="8">
-            <a-form-item label="上传应用地址">
-              <a-input placeholder="请输入上传应用地址" v-model="queryParam.url"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="应用标记">
-              <a-input placeholder="请输入应用标记" v-model="queryParam.appVersion"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="应用名称">
-              <a-input placeholder="请输入应用名称" v-model="queryParam.appName"></a-input>
-            </a-form-item>
-          </a-col>
-          </template>
-          <a-col :md="6" :sm="8" >
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="账户ID">
+                            <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="本地存储地址">
+                            <a-input placeholder="请输入本地存储地址" v-model="queryParam.savaPath"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <template v-if="toggleSearchStatus">
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="上传应用地址">
+                                <a-input placeholder="请输入上传应用地址" v-model="queryParam.url"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="应用标记">
+                                <a-input placeholder="请输入应用标记" v-model="queryParam.appVersion"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="应用名称">
+                                <a-input placeholder="请输入应用名称" v-model="queryParam.appName"></a-input>
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                    <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -42,52 +42,59 @@
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
             </span>
-          </a-col>
+                    </a-col>
 
-        </a-row>
-      </a-form>
-    </div>
+                </a-row>
+            </a-form>
+        </div>
 
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('创建应用')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
+        <!-- 操作按钮区域 -->
+        <div class="table-operator">
+            <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('创建应用')">导出</a-button>
+            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
+                      :action="importExcelUrl" @change="handleImportExcel">
+                <a-button type="primary" icon="import">导入</a-button>
+            </a-upload>
+            <a-dropdown v-if="selectedRowKeys.length > 0">
+                <a-menu slot="overlay">
+                    <a-menu-item key="1" @click="batchDel">
+                        <a-icon type="delete"/>
+                        删除
+                    </a-menu-item>
+                </a-menu>
+                <a-button style="margin-left: 8px"> 批量操作
+                    <a-icon type="down"/>
+                </a-button>
+            </a-dropdown>
+        </div>
 
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+        <!-- table区域-begin -->
+        <div>
+            <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+                <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
+                selectedRowKeys.length }}</a>项
+                <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+            </div>
 
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
+            <a-table
+                    ref="table"
+                    size="middle"
+                    bordered
+                    rowKey="id"
+                    :columns="columns"
+                    :dataSource="dataSource"
+                    :pagination="ipagination"
+                    :loading="loading"
+                    :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+                    @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -98,121 +105,119 @@
           </a-dropdown>
         </span>
 
-      </a-table>
-    </div>
-    <!-- table区域-end -->
+            </a-table>
+        </div>
+        <!-- table区域-end -->
 
-    <!-- 表单区域 -->
-    <kuaiShouAppCreate-modal ref="modalForm" @ok="modalFormOk"></kuaiShouAppCreate-modal>
-  </a-card>
+        <!-- 表单区域 -->
+        <kuaiShouAppCreate-modal ref="modalForm" @ok="modalFormOk"></kuaiShouAppCreate-modal>
+    </a-card>
 </template>
 
 <script>
-  import KuaiShouAppCreateModal from './modules/KuaiShouAppCreateModal'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+    import KuaiShouAppCreateModal from './modules/KuaiShouAppCreateModal'
+    import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
-  export default {
-    name: "KuaiShouAppCreateList",
-    mixins:[JeecgListMixin],
-    components: {
-      KuaiShouAppCreateModal
-    },
-    data () {
-      return {
-        description: '创建应用管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
+    export default {
+        name: "KuaiShouAppCreateList",
+        mixins: [JeecgListMixin],
+        components: {
+            KuaiShouAppCreateModal
+        },
+        data() {
+            return {
+                description: '创建应用管理页面',
+                // 表头
+                columns: [
+                    {
+                        title: '#',
+                        dataIndex: '',
+                        key: 'rowIndex',
+                        width: 60,
+                        align: "center",
+                        customRender: function (t, r, index) {
+                            return parseInt(index) + 1;
+                        }
+                    },
+                    {
+                        title: '账户ID',
+                        align: "center",
+                        dataIndex: 'accountId'
+                    },
+                    {
+                        title: '本地存储地址',
+                        align: "center",
+                        dataIndex: 'savaPath'
+                    },
+                    {
+                        title: '上传应用地址',
+                        align: "center",
+                        dataIndex: 'url'
+                    },
+                    {
+                        title: '应用标记',
+                        align: "center",
+                        dataIndex: 'appVersion'
+                    },
+                    {
+                        title: '应用名称',
+                        align: "center",
+                        dataIndex: 'appName'
+                    },
+                    {
+                        title: '图片token',
+                        align: "center",
+                        dataIndex: 'imageToken'
+                    },
+                    {
+                        title: '应用包名',
+                        align: "center",
+                        dataIndex: 'packageName'
+                    },
+                    {
+                        title: '应用类型 1: Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏',
+                        align: "center",
+                        dataIndex: 'platform'
+                    },
+                    {
+                        title: '请求成功后 返回应用地址',
+                        align: "center",
+                        dataIndex: 'returnUrl'
+                    },
+                    {
+                        title: '应用id',
+                        align: "center",
+                        dataIndex: 'appId'
+                    },
+                    {
+                        title: '文件上传时间',
+                        align: "center",
+                        dataIndex: 'uploadTime'
+                    },
+                    {
+                        title: '操作',
+                        dataIndex: 'action',
+                        align: "center",
+                        scopedSlots: {customRender: 'action'},
+                    }
+                ],
+                url: {
+                    list: "/kuaishou/kuaiShouAppCreate/list",
+                    delete: "/kuaishou/kuaiShouAppCreate/delete",
+                    deleteBatch: "/kuaishou/kuaiShouAppCreate/deleteBatch",
+                    exportXlsUrl: "kuaishou/kuaiShouAppCreate/exportXls",
+                    importExcelUrl: "kuaishou/kuaiShouAppCreate/importExcel",
+                },
             }
-           },
-		   {
-            title: '账户ID',
-            align:"center",
-            dataIndex: 'accountId'
-           },
-		   {
-            title: '本地存储地址',
-            align:"center",
-            dataIndex: 'savaPath'
-           },
-		   {
-            title: '上传应用地址',
-            align:"center",
-            dataIndex: 'url'
-           },
-		   {
-            title: '应用标记',
-            align:"center",
-            dataIndex: 'appVersion'
-           },
-		   {
-            title: '应用名称',
-            align:"center",
-            dataIndex: 'appName'
-           },
-		   {
-            title: '图片token',
-            align:"center",
-            dataIndex: 'imageToken'
-           },
-		   {
-            title: '应用包名',
-            align:"center",
-            dataIndex: 'packageName'
-           },
-		   {
-            title: '应用类型 1: Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏',
-            align:"center",
-            dataIndex: 'platform'
-           },
-		   {
-            title: '请求成功后 返回应用地址',
-            align:"center",
-            dataIndex: 'returnUrl'
-           },
-		   {
-            title: '应用id',
-            align:"center",
-            dataIndex: 'appId'
-           },
-		   {
-            title: '文件上传时间',
-            align:"center",
-            dataIndex: 'uploadTime'
-           },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-		url: {
-          list: "/kuaishou/kuaiShouAppCreate/list",
-          delete: "/kuaishou/kuaiShouAppCreate/delete",
-          deleteBatch: "/kuaishou/kuaiShouAppCreate/deleteBatch",
-          exportXlsUrl: "kuaishou/kuaiShouAppCreate/exportXls",
-          importExcelUrl: "kuaishou/kuaiShouAppCreate/importExcel",
-       },
-    }
-  },
-  computed: {
-    importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-    methods: {
-     
+        },
+        computed: {
+            importExcelUrl: function () {
+                return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+            }
+        },
+        methods: {}
     }
-  }
 </script>
 <style scoped>
-  @import '~@assets/less/common.less'
+    @import '~@assets/less/common.less'
 </style>

+ 153 - 148
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouAppInfoList.vue

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

+ 178 - 173
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouAppListList.vue

@@ -1,39 +1,39 @@
 <template>
-  <a-card :bordered="false">
+    <a-card :bordered="false">
 
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
+        <!-- 查询区域 -->
+        <div class="table-page-search-wrapper">
+            <a-form layout="inline">
+                <a-row :gutter="24">
 
-          <a-col :md="6" :sm="8">
-            <a-form-item label="账户ID">
-              <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="应用id">
-              <a-input placeholder="请输入应用id" v-model="queryParam.appId"></a-input>
-            </a-form-item>
-          </a-col>
-        <template v-if="toggleSearchStatus">
-        <a-col :md="6" :sm="8">
-            <a-form-item label="应用地址">
-              <a-input placeholder="请输入应用地址" v-model="queryParam.url"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="应用标记">
-              <a-input placeholder="请输入应用标记" v-model="queryParam.appVersion"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="应用名称">
-              <a-input placeholder="请输入应用名称" v-model="queryParam.appName"></a-input>
-            </a-form-item>
-          </a-col>
-          </template>
-          <a-col :md="6" :sm="8" >
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="账户ID">
+                            <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="应用id">
+                            <a-input placeholder="请输入应用id" v-model="queryParam.appId"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <template v-if="toggleSearchStatus">
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="应用地址">
+                                <a-input placeholder="请输入应用地址" v-model="queryParam.url"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="应用标记">
+                                <a-input placeholder="请输入应用标记" v-model="queryParam.appVersion"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="应用名称">
+                                <a-input placeholder="请输入应用名称" v-model="queryParam.appName"></a-input>
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                    <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -42,52 +42,59 @@
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
             </span>
-          </a-col>
+                    </a-col>
 
-        </a-row>
-      </a-form>
-    </div>
+                </a-row>
+            </a-form>
+        </div>
 
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('快手-应用列表')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
+        <!-- 操作按钮区域 -->
+        <div class="table-operator">
+            <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('快手-应用列表')">导出</a-button>
+            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
+                      :action="importExcelUrl" @change="handleImportExcel">
+                <a-button type="primary" icon="import">导入</a-button>
+            </a-upload>
+            <a-dropdown v-if="selectedRowKeys.length > 0">
+                <a-menu slot="overlay">
+                    <a-menu-item key="1" @click="batchDel">
+                        <a-icon type="delete"/>
+                        删除
+                    </a-menu-item>
+                </a-menu>
+                <a-button style="margin-left: 8px"> 批量操作
+                    <a-icon type="down"/>
+                </a-button>
+            </a-dropdown>
+        </div>
 
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+        <!-- table区域-begin -->
+        <div>
+            <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+                <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
+                selectedRowKeys.length }}</a>项
+                <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+            </div>
 
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
+            <a-table
+                    ref="table"
+                    size="middle"
+                    bordered
+                    rowKey="id"
+                    :columns="columns"
+                    :dataSource="dataSource"
+                    :pagination="ipagination"
+                    :loading="loading"
+                    :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+                    @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -98,116 +105,114 @@
           </a-dropdown>
         </span>
 
-      </a-table>
-    </div>
-    <!-- table区域-end -->
+            </a-table>
+        </div>
+        <!-- table区域-end -->
 
-    <!-- 表单区域 -->
-    <kuaiShouAppList-modal ref="modalForm" @ok="modalFormOk"></kuaiShouAppList-modal>
-  </a-card>
+        <!-- 表单区域 -->
+        <kuaiShouAppList-modal ref="modalForm" @ok="modalFormOk"></kuaiShouAppList-modal>
+    </a-card>
 </template>
 
 <script>
-  import KuaiShouAppListModal from './modules/KuaiShouAppListModal'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+    import KuaiShouAppListModal from './modules/KuaiShouAppListModal'
+    import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
-  export default {
-    name: "KuaiShouAppListList",
-    mixins:[JeecgListMixin],
-    components: {
-      KuaiShouAppListModal
-    },
-    data () {
-      return {
-        description: '快手-应用列表管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
+    export default {
+        name: "KuaiShouAppListList",
+        mixins: [JeecgListMixin],
+        components: {
+            KuaiShouAppListModal
+        },
+        data() {
+            return {
+                description: '快手-应用列表管理页面',
+                // 表头
+                columns: [
+                    {
+                        title: '#',
+                        dataIndex: '',
+                        key: 'rowIndex',
+                        width: 60,
+                        align: "center",
+                        customRender: function (t, r, index) {
+                            return parseInt(index) + 1;
+                        }
+                    },
+                    {
+                        title: '账户ID',
+                        align: "center",
+                        dataIndex: 'accountId'
+                    },
+                    {
+                        title: '应用id',
+                        align: "center",
+                        dataIndex: 'appId'
+                    },
+                    {
+                        title: '应用地址',
+                        align: "center",
+                        dataIndex: 'url'
+                    },
+                    {
+                        title: '应用标记',
+                        align: "center",
+                        dataIndex: 'appVersion'
+                    },
+                    {
+                        title: '应用名称',
+                        align: "center",
+                        dataIndex: 'appName'
+                    },
+                    {
+                        title: '应用图标链接地址',
+                        align: "center",
+                        dataIndex: 'appIconUrl'
+                    },
+                    {
+                        title: '图片token',
+                        align: "center",
+                        dataIndex: 'imageToken'
+                    },
+                    {
+                        title: '应用包名',
+                        align: "center",
+                        dataIndex: 'packageName'
+                    },
+                    {
+                        title: '应用类型 1: Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏',
+                        align: "center",
+                        dataIndex: 'platform'
+                    },
+                    {
+                        title: '返回修改时间',
+                        align: "center",
+                        dataIndex: 'returnTime'
+                    },
+                    {
+                        title: '操作',
+                        dataIndex: 'action',
+                        align: "center",
+                        scopedSlots: {customRender: 'action'},
+                    }
+                ],
+                url: {
+                    list: "/kuaishou/kuaiShouAppList/list",
+                    delete: "/kuaishou/kuaiShouAppList/delete",
+                    deleteBatch: "/kuaishou/kuaiShouAppList/deleteBatch",
+                    exportXlsUrl: "kuaishou/kuaiShouAppList/exportXls",
+                    importExcelUrl: "kuaishou/kuaiShouAppList/importExcel",
+                },
             }
-           },
-		   {
-            title: '账户ID',
-            align:"center",
-            dataIndex: 'accountId'
-           },
-		   {
-            title: '应用id',
-            align:"center",
-            dataIndex: 'appId'
-           },
-		   {
-            title: '应用地址',
-            align:"center",
-            dataIndex: 'url'
-           },
-		   {
-            title: '应用标记',
-            align:"center",
-            dataIndex: 'appVersion'
-           },
-		   {
-            title: '应用名称',
-            align:"center",
-            dataIndex: 'appName'
-           },
-		   {
-            title: '应用图标链接地址',
-            align:"center",
-            dataIndex: 'appIconUrl'
-           },
-		   {
-            title: '图片token',
-            align:"center",
-            dataIndex: 'imageToken'
-           },
-		   {
-            title: '应用包名',
-            align:"center",
-            dataIndex: 'packageName'
-           },
-		   {
-            title: '应用类型 1: Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏',
-            align:"center",
-            dataIndex: 'platform'
-           },
-		   {
-            title: '返回修改时间',
-            align:"center",
-            dataIndex: 'returnTime'
-           },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-		url: {
-          list: "/kuaishou/kuaiShouAppList/list",
-          delete: "/kuaishou/kuaiShouAppList/delete",
-          deleteBatch: "/kuaishou/kuaiShouAppList/deleteBatch",
-          exportXlsUrl: "kuaishou/kuaiShouAppList/exportXls",
-          importExcelUrl: "kuaishou/kuaiShouAppList/importExcel",
-       },
-    }
-  },
-  computed: {
-    importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-    methods: {
-     
+        },
+        computed: {
+            importExcelUrl: function () {
+                return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+            }
+        },
+        methods: {}
     }
-  }
 </script>
 <style scoped>
-  @import '~@assets/less/common.less'
+    @import '~@assets/less/common.less'
 </style>

+ 155 - 148
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouCampaignCreateList.vue

@@ -1,39 +1,41 @@
 <template>
-  <a-card :bordered="false">
+    <a-card :bordered="false">
 
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
+        <!-- 查询区域 -->
+        <div class="table-page-search-wrapper">
+            <a-form layout="inline">
+                <a-row :gutter="24">
 
-          <a-col :md="6" :sm="8">
-            <a-form-item label="账户ID">
-              <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="广告计划名称">
-              <a-input placeholder="请输入广告计划名称" v-model="queryParam.campaignName"></a-input>
-            </a-form-item>
-          </a-col>
-        <template v-if="toggleSearchStatus">
-        <a-col :md="6" :sm="8">
-            <a-form-item label="2:提升应用安装 3:获取电商下单 4:推广品牌活动 5:收集销售线索">
-              <a-input placeholder="请输入2:提升应用安装 3:获取电商下单 4:推广品牌活动 5:收集销售线索" v-model="queryParam.type"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="计划单日预算金额 单位:厘 0表示预算不限,不小于500元,不超过100000000">
-              <a-input placeholder="请输入计划单日预算金额 单位:厘 0表示预算不限,不小于500元,不超过100000000" v-model="queryParam.dayBudget"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="广告计划id">
-              <a-input placeholder="请输入广告计划id" v-model="queryParam.campaignId"></a-input>
-            </a-form-item>
-          </a-col>
-          </template>
-          <a-col :md="6" :sm="8" >
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="账户ID">
+                            <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="广告计划名称">
+                            <a-input placeholder="请输入广告计划名称" v-model="queryParam.campaignName"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <template v-if="toggleSearchStatus">
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="2:提升应用安装 3:获取电商下单 4:推广品牌活动 5:收集销售线索">
+                                <a-input placeholder="请输入2:提升应用安装 3:获取电商下单 4:推广品牌活动 5:收集销售线索"
+                                         v-model="queryParam.type"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="计划单日预算金额 单位:厘 0表示预算不限,不小于500元,不超过100000000">
+                                <a-input placeholder="请输入计划单日预算金额 单位:厘 0表示预算不限,不小于500元,不超过100000000"
+                                         v-model="queryParam.dayBudget"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="广告计划id">
+                                <a-input placeholder="请输入广告计划id" v-model="queryParam.campaignId"></a-input>
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                    <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -42,52 +44,59 @@
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
             </span>
-          </a-col>
+                    </a-col>
 
-        </a-row>
-      </a-form>
-    </div>
+                </a-row>
+            </a-form>
+        </div>
 
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('快手-创建广告计划')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
+        <!-- 操作按钮区域 -->
+        <div class="table-operator">
+            <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('快手-创建广告计划')">导出</a-button>
+            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
+                      :action="importExcelUrl" @change="handleImportExcel">
+                <a-button type="primary" icon="import">导入</a-button>
+            </a-upload>
+            <a-dropdown v-if="selectedRowKeys.length > 0">
+                <a-menu slot="overlay">
+                    <a-menu-item key="1" @click="batchDel">
+                        <a-icon type="delete"/>
+                        删除
+                    </a-menu-item>
+                </a-menu>
+                <a-button style="margin-left: 8px"> 批量操作
+                    <a-icon type="down"/>
+                </a-button>
+            </a-dropdown>
+        </div>
 
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+        <!-- table区域-begin -->
+        <div>
+            <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+                <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
+                selectedRowKeys.length }}</a>项
+                <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+            </div>
 
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
+            <a-table
+                    ref="table"
+                    size="middle"
+                    bordered
+                    rowKey="id"
+                    :columns="columns"
+                    :dataSource="dataSource"
+                    :pagination="ipagination"
+                    :loading="loading"
+                    :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+                    @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -98,91 +107,89 @@
           </a-dropdown>
         </span>
 
-      </a-table>
-    </div>
-    <!-- table区域-end -->
+            </a-table>
+        </div>
+        <!-- table区域-end -->
 
-    <!-- 表单区域 -->
-    <kuaiShouCampaignCreate-modal ref="modalForm" @ok="modalFormOk"></kuaiShouCampaignCreate-modal>
-  </a-card>
+        <!-- 表单区域 -->
+        <kuaiShouCampaignCreate-modal ref="modalForm" @ok="modalFormOk"></kuaiShouCampaignCreate-modal>
+    </a-card>
 </template>
 
 <script>
-  import KuaiShouCampaignCreateModal from './modules/KuaiShouCampaignCreateModal'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+    import KuaiShouCampaignCreateModal from './modules/KuaiShouCampaignCreateModal'
+    import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
-  export default {
-    name: "KuaiShouCampaignCreateList",
-    mixins:[JeecgListMixin],
-    components: {
-      KuaiShouCampaignCreateModal
-    },
-    data () {
-      return {
-        description: '快手-创建广告计划管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
+    export default {
+        name: "KuaiShouCampaignCreateList",
+        mixins: [JeecgListMixin],
+        components: {
+            KuaiShouCampaignCreateModal
+        },
+        data() {
+            return {
+                description: '快手-创建广告计划管理页面',
+                // 表头
+                columns: [
+                    {
+                        title: '#',
+                        dataIndex: '',
+                        key: 'rowIndex',
+                        width: 60,
+                        align: "center",
+                        customRender: function (t, r, index) {
+                            return parseInt(index) + 1;
+                        }
+                    },
+                    {
+                        title: '账户ID',
+                        align: "center",
+                        dataIndex: 'accountId'
+                    },
+                    {
+                        title: '广告计划名称',
+                        align: "center",
+                        dataIndex: 'campaignName'
+                    },
+                    {
+                        title: '2:提升应用安装 3:获取电商下单 4:推广品牌活动 5:收集销售线索',
+                        align: "center",
+                        dataIndex: 'type'
+                    },
+                    {
+                        title: '计划单日预算金额 单位:厘 0表示预算不限,不小于500元,不超过100000000',
+                        align: "center",
+                        dataIndex: 'dayBudget'
+                    },
+                    {
+                        title: '广告计划id',
+                        align: "center",
+                        dataIndex: 'campaignId'
+                    },
+                    {
+                        title: '操作',
+                        dataIndex: 'action',
+                        align: "center",
+                        scopedSlots: {customRender: 'action'},
+                    }
+                ],
+                url: {
+                    list: "/kuaishou/kuaiShouCampaignCreate/list",
+                    delete: "/kuaishou/kuaiShouCampaignCreate/delete",
+                    deleteBatch: "/kuaishou/kuaiShouCampaignCreate/deleteBatch",
+                    exportXlsUrl: "kuaishou/kuaiShouCampaignCreate/exportXls",
+                    importExcelUrl: "kuaishou/kuaiShouCampaignCreate/importExcel",
+                },
             }
-           },
-		   {
-            title: '账户ID',
-            align:"center",
-            dataIndex: 'accountId'
-           },
-		   {
-            title: '广告计划名称',
-            align:"center",
-            dataIndex: 'campaignName'
-           },
-		   {
-            title: '2:提升应用安装 3:获取电商下单 4:推广品牌活动 5:收集销售线索',
-            align:"center",
-            dataIndex: 'type'
-           },
-		   {
-            title: '计划单日预算金额 单位:厘 0表示预算不限,不小于500元,不超过100000000',
-            align:"center",
-            dataIndex: 'dayBudget'
-           },
-		   {
-            title: '广告计划id',
-            align:"center",
-            dataIndex: 'campaignId'
-           },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-		url: {
-          list: "/kuaishou/kuaiShouCampaignCreate/list",
-          delete: "/kuaishou/kuaiShouCampaignCreate/delete",
-          deleteBatch: "/kuaishou/kuaiShouCampaignCreate/deleteBatch",
-          exportXlsUrl: "kuaishou/kuaiShouCampaignCreate/exportXls",
-          importExcelUrl: "kuaishou/kuaiShouCampaignCreate/importExcel",
-       },
-    }
-  },
-  computed: {
-    importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-    methods: {
-     
+        },
+        computed: {
+            importExcelUrl: function () {
+                return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+            }
+        },
+        methods: {}
     }
-  }
 </script>
 <style scoped>
-  @import '~@assets/less/common.less'
+    @import '~@assets/less/common.less'
 </style>

+ 153 - 148
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouCampaignList.vue

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

+ 133 - 128
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouConversionInfosList.vue

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

+ 133 - 128
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouConversionTypesList.vue

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

+ 173 - 168
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouCreativeCreateList.vue

@@ -1,39 +1,39 @@
 <template>
-  <a-card :bordered="false">
+    <a-card :bordered="false">
 
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
+        <!-- 查询区域 -->
+        <div class="table-page-search-wrapper">
+            <a-form layout="inline">
+                <a-row :gutter="24">
 
-          <a-col :md="6" :sm="8">
-            <a-form-item label="账户ID">
-              <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="广告组ID">
-              <a-input placeholder="请输入广告组ID" v-model="queryParam.unitId"></a-input>
-            </a-form-item>
-          </a-col>
-        <template v-if="toggleSearchStatus">
-        <a-col :md="6" :sm="8">
-            <a-form-item label="广告创意名称">
-              <a-input placeholder="请输入广告创意名称" v-model="queryParam.creativeName"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="视频作品ID">
-              <a-input placeholder="请输入视频作品ID" v-model="queryParam.photoId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="封面图片token">
-              <a-input placeholder="请输入封面图片token" v-model="queryParam.imageToken"></a-input>
-            </a-form-item>
-          </a-col>
-          </template>
-          <a-col :md="6" :sm="8" >
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="账户ID">
+                            <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="广告组ID">
+                            <a-input placeholder="请输入广告组ID" v-model="queryParam.unitId"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <template v-if="toggleSearchStatus">
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="广告创意名称">
+                                <a-input placeholder="请输入广告创意名称" v-model="queryParam.creativeName"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="视频作品ID">
+                                <a-input placeholder="请输入视频作品ID" v-model="queryParam.photoId"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="封面图片token">
+                                <a-input placeholder="请输入封面图片token" v-model="queryParam.imageToken"></a-input>
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                    <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -42,52 +42,59 @@
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
             </span>
-          </a-col>
+                    </a-col>
 
-        </a-row>
-      </a-form>
-    </div>
+                </a-row>
+            </a-form>
+        </div>
 
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('快手-创建创意信息')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
+        <!-- 操作按钮区域 -->
+        <div class="table-operator">
+            <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('快手-创建创意信息')">导出</a-button>
+            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
+                      :action="importExcelUrl" @change="handleImportExcel">
+                <a-button type="primary" icon="import">导入</a-button>
+            </a-upload>
+            <a-dropdown v-if="selectedRowKeys.length > 0">
+                <a-menu slot="overlay">
+                    <a-menu-item key="1" @click="batchDel">
+                        <a-icon type="delete"/>
+                        删除
+                    </a-menu-item>
+                </a-menu>
+                <a-button style="margin-left: 8px"> 批量操作
+                    <a-icon type="down"/>
+                </a-button>
+            </a-dropdown>
+        </div>
 
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+        <!-- table区域-begin -->
+        <div>
+            <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+                <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
+                selectedRowKeys.length }}</a>项
+                <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+            </div>
 
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
+            <a-table
+                    ref="table"
+                    size="middle"
+                    bordered
+                    rowKey="id"
+                    :columns="columns"
+                    :dataSource="dataSource"
+                    :pagination="ipagination"
+                    :loading="loading"
+                    :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+                    @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -98,111 +105,109 @@
           </a-dropdown>
         </span>
 
-      </a-table>
-    </div>
-    <!-- table区域-end -->
+            </a-table>
+        </div>
+        <!-- table区域-end -->
 
-    <!-- 表单区域 -->
-    <kuaiShouCreativeCreate-modal ref="modalForm" @ok="modalFormOk"></kuaiShouCreativeCreate-modal>
-  </a-card>
+        <!-- 表单区域 -->
+        <kuaiShouCreativeCreate-modal ref="modalForm" @ok="modalFormOk"></kuaiShouCreativeCreate-modal>
+    </a-card>
 </template>
 
 <script>
-  import KuaiShouCreativeCreateModal from './modules/KuaiShouCreativeCreateModal'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+    import KuaiShouCreativeCreateModal from './modules/KuaiShouCreativeCreateModal'
+    import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
-  export default {
-    name: "KuaiShouCreativeCreateList",
-    mixins:[JeecgListMixin],
-    components: {
-      KuaiShouCreativeCreateModal
-    },
-    data () {
-      return {
-        description: '快手-创建创意信息管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
+    export default {
+        name: "KuaiShouCreativeCreateList",
+        mixins: [JeecgListMixin],
+        components: {
+            KuaiShouCreativeCreateModal
+        },
+        data() {
+            return {
+                description: '快手-创建创意信息管理页面',
+                // 表头
+                columns: [
+                    {
+                        title: '#',
+                        dataIndex: '',
+                        key: 'rowIndex',
+                        width: 60,
+                        align: "center",
+                        customRender: function (t, r, index) {
+                            return parseInt(index) + 1;
+                        }
+                    },
+                    {
+                        title: '账户ID',
+                        align: "center",
+                        dataIndex: 'accountId'
+                    },
+                    {
+                        title: '广告组ID',
+                        align: "center",
+                        dataIndex: 'unitId'
+                    },
+                    {
+                        title: '广告创意名称',
+                        align: "center",
+                        dataIndex: 'creativeName'
+                    },
+                    {
+                        title: '视频作品ID',
+                        align: "center",
+                        dataIndex: 'photoId'
+                    },
+                    {
+                        title: '封面图片token',
+                        align: "center",
+                        dataIndex: 'imageToken'
+                    },
+                    {
+                        title: '行动号召按钮文案',
+                        align: "center",
+                        dataIndex: 'actionBarText'
+                    },
+                    {
+                        title: '广告语',
+                        align: "center",
+                        dataIndex: 'description'
+                    },
+                    {
+                        title: '点击测试链接',
+                        align: "center",
+                        dataIndex: 'clickTrackUrl'
+                    },
+                    {
+                        title: '广告创意ID',
+                        align: "center",
+                        dataIndex: 'creativeId'
+                    },
+                    {
+                        title: '操作',
+                        dataIndex: 'action',
+                        align: "center",
+                        scopedSlots: {customRender: 'action'},
+                    }
+                ],
+                url: {
+                    list: "/kuaishou/kuaiShouCreativeCreate/list",
+                    delete: "/kuaishou/kuaiShouCreativeCreate/delete",
+                    deleteBatch: "/kuaishou/kuaiShouCreativeCreate/deleteBatch",
+                    exportXlsUrl: "kuaishou/kuaiShouCreativeCreate/exportXls",
+                    importExcelUrl: "kuaishou/kuaiShouCreativeCreate/importExcel",
+                },
             }
-           },
-		   {
-            title: '账户ID',
-            align:"center",
-            dataIndex: 'accountId'
-           },
-		   {
-            title: '广告组ID',
-            align:"center",
-            dataIndex: 'unitId'
-           },
-		   {
-            title: '广告创意名称',
-            align:"center",
-            dataIndex: 'creativeName'
-           },
-		   {
-            title: '视频作品ID',
-            align:"center",
-            dataIndex: 'photoId'
-           },
-		   {
-            title: '封面图片token',
-            align:"center",
-            dataIndex: 'imageToken'
-           },
-		   {
-            title: '行动号召按钮文案',
-            align:"center",
-            dataIndex: 'actionBarText'
-           },
-		   {
-            title: '广告语',
-            align:"center",
-            dataIndex: 'description'
-           },
-		   {
-            title: '点击测试链接',
-            align:"center",
-            dataIndex: 'clickTrackUrl'
-           },
-		   {
-            title: '广告创意ID',
-            align:"center",
-            dataIndex: 'creativeId'
-           },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-		url: {
-          list: "/kuaishou/kuaiShouCreativeCreate/list",
-          delete: "/kuaishou/kuaiShouCreativeCreate/delete",
-          deleteBatch: "/kuaishou/kuaiShouCreativeCreate/deleteBatch",
-          exportXlsUrl: "kuaishou/kuaiShouCreativeCreate/exportXls",
-          importExcelUrl: "kuaishou/kuaiShouCreativeCreate/importExcel",
-       },
-    }
-  },
-  computed: {
-    importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-    methods: {
-     
+        },
+        computed: {
+            importExcelUrl: function () {
+                return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+            }
+        },
+        methods: {}
     }
-  }
 </script>
 <style scoped>
-  @import '~@assets/less/common.less'
+    @import '~@assets/less/common.less'
 </style>

+ 198 - 193
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouCreativeList.vue

@@ -1,39 +1,39 @@
 <template>
-  <a-card :bordered="false">
+    <a-card :bordered="false">
 
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
+        <!-- 查询区域 -->
+        <div class="table-page-search-wrapper">
+            <a-form layout="inline">
+                <a-row :gutter="24">
 
-          <a-col :md="6" :sm="8">
-            <a-form-item label="账户ID">
-              <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="广告计划ID">
-              <a-input placeholder="请输入广告计划ID" v-model="queryParam.campaignId"></a-input>
-            </a-form-item>
-          </a-col>
-        <template v-if="toggleSearchStatus">
-        <a-col :md="6" :sm="8">
-            <a-form-item label="广告组ID">
-              <a-input placeholder="请输入广告组ID" v-model="queryParam.unitId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="广告创意ID">
-              <a-input placeholder="请输入广告创意ID" v-model="queryParam.creativeId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="广告创意名称">
-              <a-input placeholder="请输入广告创意名称" v-model="queryParam.creativeName"></a-input>
-            </a-form-item>
-          </a-col>
-          </template>
-          <a-col :md="6" :sm="8" >
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="账户ID">
+                            <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="广告计划ID">
+                            <a-input placeholder="请输入广告计划ID" v-model="queryParam.campaignId"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <template v-if="toggleSearchStatus">
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="广告组ID">
+                                <a-input placeholder="请输入广告组ID" v-model="queryParam.unitId"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="广告创意ID">
+                                <a-input placeholder="请输入广告创意ID" v-model="queryParam.creativeId"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="广告创意名称">
+                                <a-input placeholder="请输入广告创意名称" v-model="queryParam.creativeName"></a-input>
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                    <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -42,52 +42,59 @@
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
             </span>
-          </a-col>
+                    </a-col>
 
-        </a-row>
-      </a-form>
-    </div>
+                </a-row>
+            </a-form>
+        </div>
 
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('快手-创意信息')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
+        <!-- 操作按钮区域 -->
+        <div class="table-operator">
+            <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('快手-创意信息')">导出</a-button>
+            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
+                      :action="importExcelUrl" @change="handleImportExcel">
+                <a-button type="primary" icon="import">导入</a-button>
+            </a-upload>
+            <a-dropdown v-if="selectedRowKeys.length > 0">
+                <a-menu slot="overlay">
+                    <a-menu-item key="1" @click="batchDel">
+                        <a-icon type="delete"/>
+                        删除
+                    </a-menu-item>
+                </a-menu>
+                <a-button style="margin-left: 8px"> 批量操作
+                    <a-icon type="down"/>
+                </a-button>
+            </a-dropdown>
+        </div>
 
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+        <!-- table区域-begin -->
+        <div>
+            <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+                <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
+                selectedRowKeys.length }}</a>项
+                <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+            </div>
 
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
+            <a-table
+                    ref="table"
+                    size="middle"
+                    bordered
+                    rowKey="id"
+                    :columns="columns"
+                    :dataSource="dataSource"
+                    :pagination="ipagination"
+                    :loading="loading"
+                    :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+                    @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -98,136 +105,134 @@
           </a-dropdown>
         </span>
 
-      </a-table>
-    </div>
-    <!-- table区域-end -->
+            </a-table>
+        </div>
+        <!-- table区域-end -->
 
-    <!-- 表单区域 -->
-    <kuaiShouCreative-modal ref="modalForm" @ok="modalFormOk"></kuaiShouCreative-modal>
-  </a-card>
+        <!-- 表单区域 -->
+        <kuaiShouCreative-modal ref="modalForm" @ok="modalFormOk"></kuaiShouCreative-modal>
+    </a-card>
 </template>
 
 <script>
-  import KuaiShouCreativeModal from './modules/KuaiShouCreativeModal'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+    import KuaiShouCreativeModal from './modules/KuaiShouCreativeModal'
+    import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
-  export default {
-    name: "KuaiShouCreativeList",
-    mixins:[JeecgListMixin],
-    components: {
-      KuaiShouCreativeModal
-    },
-    data () {
-      return {
-        description: '快手-创意信息管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
+    export default {
+        name: "KuaiShouCreativeList",
+        mixins: [JeecgListMixin],
+        components: {
+            KuaiShouCreativeModal
+        },
+        data() {
+            return {
+                description: '快手-创意信息管理页面',
+                // 表头
+                columns: [
+                    {
+                        title: '#',
+                        dataIndex: '',
+                        key: 'rowIndex',
+                        width: 60,
+                        align: "center",
+                        customRender: function (t, r, index) {
+                            return parseInt(index) + 1;
+                        }
+                    },
+                    {
+                        title: '账户ID',
+                        align: "center",
+                        dataIndex: 'accountId'
+                    },
+                    {
+                        title: '广告计划ID',
+                        align: "center",
+                        dataIndex: 'campaignId'
+                    },
+                    {
+                        title: '广告组ID',
+                        align: "center",
+                        dataIndex: 'unitId'
+                    },
+                    {
+                        title: '广告创意ID',
+                        align: "center",
+                        dataIndex: 'creativeId'
+                    },
+                    {
+                        title: '广告创意名称',
+                        align: "center",
+                        dataIndex: 'creativeName'
+                    },
+                    {
+                        title: '视频作品ID',
+                        align: "center",
+                        dataIndex: 'photoId'
+                    },
+                    {
+                        title: '广告创意状态',
+                        align: "center",
+                        dataIndex: 'status'
+                    },
+                    {
+                        title: '审核拒绝理由',
+                        align: "center",
+                        dataIndex: 'reviewDetail'
+                    },
+                    {
+                        title: '封面URL',
+                        align: "center",
+                        dataIndex: 'coverUrl'
+                    },
+                    {
+                        title: '封面图宽度',
+                        align: "center",
+                        dataIndex: 'coverWidth'
+                    },
+                    {
+                        title: '封面图高度',
+                        align: "center",
+                        dataIndex: 'coverHeight'
+                    },
+                    {
+                        title: 'description',
+                        align: "center",
+                        dataIndex: 'description'
+                    },
+                    {
+                        title: '行动号召按钮文案',
+                        align: "center",
+                        dataIndex: 'actionBarText'
+                    },
+                    {
+                        title: '点击测试链接',
+                        align: "center",
+                        dataIndex: 'clickTrackUrl'
+                    },
+                    {
+                        title: '操作',
+                        dataIndex: 'action',
+                        align: "center",
+                        scopedSlots: {customRender: 'action'},
+                    }
+                ],
+                url: {
+                    list: "/kuaishou/kuaiShouCreative/list",
+                    delete: "/kuaishou/kuaiShouCreative/delete",
+                    deleteBatch: "/kuaishou/kuaiShouCreative/deleteBatch",
+                    exportXlsUrl: "kuaishou/kuaiShouCreative/exportXls",
+                    importExcelUrl: "kuaishou/kuaiShouCreative/importExcel",
+                },
             }
-           },
-		   {
-            title: '账户ID',
-            align:"center",
-            dataIndex: 'accountId'
-           },
-		   {
-            title: '广告计划ID',
-            align:"center",
-            dataIndex: 'campaignId'
-           },
-		   {
-            title: '广告组ID',
-            align:"center",
-            dataIndex: 'unitId'
-           },
-		   {
-            title: '广告创意ID',
-            align:"center",
-            dataIndex: 'creativeId'
-           },
-		   {
-            title: '广告创意名称',
-            align:"center",
-            dataIndex: 'creativeName'
-           },
-		   {
-            title: '视频作品ID',
-            align:"center",
-            dataIndex: 'photoId'
-           },
-		   {
-            title: '广告创意状态',
-            align:"center",
-            dataIndex: 'status'
-           },
-		   {
-            title: '审核拒绝理由',
-            align:"center",
-            dataIndex: 'reviewDetail'
-           },
-		   {
-            title: '封面URL',
-            align:"center",
-            dataIndex: 'coverUrl'
-           },
-		   {
-            title: '封面图宽度',
-            align:"center",
-            dataIndex: 'coverWidth'
-           },
-		   {
-            title: '封面图高度',
-            align:"center",
-            dataIndex: 'coverHeight'
-           },
-		   {
-            title: 'description',
-            align:"center",
-            dataIndex: 'description'
-           },
-		   {
-            title: '行动号召按钮文案',
-            align:"center",
-            dataIndex: 'actionBarText'
-           },
-		   {
-            title: '点击测试链接',
-            align:"center",
-            dataIndex: 'clickTrackUrl'
-           },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-		url: {
-          list: "/kuaishou/kuaiShouCreative/list",
-          delete: "/kuaishou/kuaiShouCreative/delete",
-          deleteBatch: "/kuaishou/kuaiShouCreative/deleteBatch",
-          exportXlsUrl: "kuaishou/kuaiShouCreative/exportXls",
-          importExcelUrl: "kuaishou/kuaiShouCreative/importExcel",
-       },
-    }
-  },
-  computed: {
-    importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-    methods: {
-     
+        },
+        computed: {
+            importExcelUrl: function () {
+                return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+            }
+        },
+        methods: {}
     }
-  }
 </script>
 <style scoped>
-  @import '~@assets/less/common.less'
+    @import '~@assets/less/common.less'
 </style>

+ 223 - 218
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouGroupCreateList.vue

@@ -1,39 +1,39 @@
 <template>
-  <a-card :bordered="false">
+    <a-card :bordered="false">
 
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
+        <!-- 查询区域 -->
+        <div class="table-page-search-wrapper">
+            <a-form layout="inline">
+                <a-row :gutter="24">
 
-          <a-col :md="6" :sm="8">
-            <a-form-item label="账户ID">
-              <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="广告活动ID">
-              <a-input placeholder="请输入广告活动ID" v-model="queryParam.campaignId"></a-input>
-            </a-form-item>
-          </a-col>
-        <template v-if="toggleSearchStatus">
-        <a-col :md="6" :sm="8">
-            <a-form-item label="广告组名称">
-              <a-input placeholder="请输入广告组名称" v-model="queryParam.unitName"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="出价类型">
-              <a-input placeholder="请输入出价类型" v-model="queryParam.bidType"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="出价">
-              <a-input placeholder="请输入出价" v-model="queryParam.bid"></a-input>
-            </a-form-item>
-          </a-col>
-          </template>
-          <a-col :md="6" :sm="8" >
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="账户ID">
+                            <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="广告活动ID">
+                            <a-input placeholder="请输入广告活动ID" v-model="queryParam.campaignId"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <template v-if="toggleSearchStatus">
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="广告组名称">
+                                <a-input placeholder="请输入广告组名称" v-model="queryParam.unitName"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="出价类型">
+                                <a-input placeholder="请输入出价类型" v-model="queryParam.bidType"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="出价">
+                                <a-input placeholder="请输入出价" v-model="queryParam.bid"></a-input>
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                    <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -42,52 +42,59 @@
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
             </span>
-          </a-col>
+                    </a-col>
 
-        </a-row>
-      </a-form>
-    </div>
+                </a-row>
+            </a-form>
+        </div>
 
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('快手-创建广告组信息')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
+        <!-- 操作按钮区域 -->
+        <div class="table-operator">
+            <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('快手-创建广告组信息')">导出</a-button>
+            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
+                      :action="importExcelUrl" @change="handleImportExcel">
+                <a-button type="primary" icon="import">导入</a-button>
+            </a-upload>
+            <a-dropdown v-if="selectedRowKeys.length > 0">
+                <a-menu slot="overlay">
+                    <a-menu-item key="1" @click="batchDel">
+                        <a-icon type="delete"/>
+                        删除
+                    </a-menu-item>
+                </a-menu>
+                <a-button style="margin-left: 8px"> 批量操作
+                    <a-icon type="down"/>
+                </a-button>
+            </a-dropdown>
+        </div>
 
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+        <!-- table区域-begin -->
+        <div>
+            <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+                <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
+                selectedRowKeys.length }}</a>项
+                <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+            </div>
 
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
+            <a-table
+                    ref="table"
+                    size="middle"
+                    bordered
+                    rowKey="id"
+                    :columns="columns"
+                    :dataSource="dataSource"
+                    :pagination="ipagination"
+                    :loading="loading"
+                    :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+                    @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -98,161 +105,159 @@
           </a-dropdown>
         </span>
 
-      </a-table>
-    </div>
-    <!-- table区域-end -->
+            </a-table>
+        </div>
+        <!-- table区域-end -->
 
-    <!-- 表单区域 -->
-    <kuaiShouGroupCreate-modal ref="modalForm" @ok="modalFormOk"></kuaiShouGroupCreate-modal>
-  </a-card>
+        <!-- 表单区域 -->
+        <kuaiShouGroupCreate-modal ref="modalForm" @ok="modalFormOk"></kuaiShouGroupCreate-modal>
+    </a-card>
 </template>
 
 <script>
-  import KuaiShouGroupCreateModal from './modules/KuaiShouGroupCreateModal'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+    import KuaiShouGroupCreateModal from './modules/KuaiShouGroupCreateModal'
+    import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
-  export default {
-    name: "KuaiShouGroupCreateList",
-    mixins:[JeecgListMixin],
-    components: {
-      KuaiShouGroupCreateModal
-    },
-    data () {
-      return {
-        description: '快手-创建广告组信息管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
+    export default {
+        name: "KuaiShouGroupCreateList",
+        mixins: [JeecgListMixin],
+        components: {
+            KuaiShouGroupCreateModal
+        },
+        data() {
+            return {
+                description: '快手-创建广告组信息管理页面',
+                // 表头
+                columns: [
+                    {
+                        title: '#',
+                        dataIndex: '',
+                        key: 'rowIndex',
+                        width: 60,
+                        align: "center",
+                        customRender: function (t, r, index) {
+                            return parseInt(index) + 1;
+                        }
+                    },
+                    {
+                        title: '账户ID',
+                        align: "center",
+                        dataIndex: 'accountId'
+                    },
+                    {
+                        title: '广告活动ID',
+                        align: "center",
+                        dataIndex: 'campaignId'
+                    },
+                    {
+                        title: '广告组名称',
+                        align: "center",
+                        dataIndex: 'unitName'
+                    },
+                    {
+                        title: '出价类型',
+                        align: "center",
+                        dataIndex: 'bidType'
+                    },
+                    {
+                        title: '出价',
+                        align: "center",
+                        dataIndex: 'bid'
+                    },
+                    {
+                        title: 'OCPC出价',
+                        align: "center",
+                        dataIndex: 'cpaBid'
+                    },
+                    {
+                        title: '优化目标',
+                        align: "center",
+                        dataIndex: 'ocpxActionType'
+                    },
+                    {
+                        title: '深度转化目标',
+                        align: "center",
+                        dataIndex: 'deepConversionType'
+                    },
+                    {
+                        title: '资源位置',
+                        align: "center",
+                        dataIndex: 'page'
+                    },
+                    {
+                        title: '投放开始时间',
+                        align: "center",
+                        dataIndex: 'beginTime'
+                    },
+                    {
+                        title: '投放结束时间',
+                        align: "center",
+                        dataIndex: 'endTime'
+                    },
+                    {
+                        title: '投放时段',
+                        align: "center",
+                        dataIndex: 'scheduleTime'
+                    },
+                    {
+                        title: '单日预算',
+                        align: "center",
+                        dataIndex: 'dayBudget'
+                    },
+                    {
+                        title: 'url类型 1:淘宝商品短链 2:淘宝商品 itemID',
+                        align: "center",
+                        dataIndex: 'urlType'
+                    },
+                    {
+                        title: '投放链接',
+                        align: "center",
+                        dataIndex: 'url'
+                    },
+                    {
+                        title: 'APP ID',
+                        align: "center",
+                        dataIndex: 'appId'
+                    },
+                    {
+                        title: '创意展现方式  1:轮播 2:优选',
+                        align: "center",
+                        dataIndex: 'showModel'
+                    },
+                    {
+                        title: '投放方式 1:快速投放 2:平滑投放',
+                        align: "center",
+                        dataIndex: 'speed'
+                    },
+                    {
+                        title: '广告组ID',
+                        align: "center",
+                        dataIndex: 'unitId'
+                    },
+                    {
+                        title: '操作',
+                        dataIndex: 'action',
+                        align: "center",
+                        scopedSlots: {customRender: 'action'},
+                    }
+                ],
+                url: {
+                    list: "/kuaishou/kuaiShouGroupCreate/list",
+                    delete: "/kuaishou/kuaiShouGroupCreate/delete",
+                    deleteBatch: "/kuaishou/kuaiShouGroupCreate/deleteBatch",
+                    exportXlsUrl: "kuaishou/kuaiShouGroupCreate/exportXls",
+                    importExcelUrl: "kuaishou/kuaiShouGroupCreate/importExcel",
+                },
             }
-           },
-		   {
-            title: '账户ID',
-            align:"center",
-            dataIndex: 'accountId'
-           },
-		   {
-            title: '广告活动ID',
-            align:"center",
-            dataIndex: 'campaignId'
-           },
-		   {
-            title: '广告组名称',
-            align:"center",
-            dataIndex: 'unitName'
-           },
-		   {
-            title: '出价类型',
-            align:"center",
-            dataIndex: 'bidType'
-           },
-		   {
-            title: '出价',
-            align:"center",
-            dataIndex: 'bid'
-           },
-		   {
-            title: 'OCPC出价',
-            align:"center",
-            dataIndex: 'cpaBid'
-           },
-		   {
-            title: '优化目标',
-            align:"center",
-            dataIndex: 'ocpxActionType'
-           },
-		   {
-            title: '深度转化目标',
-            align:"center",
-            dataIndex: 'deepConversionType'
-           },
-		   {
-            title: '资源位置',
-            align:"center",
-            dataIndex: 'page'
-           },
-		   {
-            title: '投放开始时间',
-            align:"center",
-            dataIndex: 'beginTime'
-           },
-		   {
-            title: '投放结束时间',
-            align:"center",
-            dataIndex: 'endTime'
-           },
-		   {
-            title: '投放时段',
-            align:"center",
-            dataIndex: 'scheduleTime'
-           },
-		   {
-            title: '单日预算',
-            align:"center",
-            dataIndex: 'dayBudget'
-           },
-		   {
-            title: 'url类型 1:淘宝商品短链 2:淘宝商品 itemID',
-            align:"center",
-            dataIndex: 'urlType'
-           },
-		   {
-            title: '投放链接',
-            align:"center",
-            dataIndex: 'url'
-           },
-		   {
-            title: 'APP ID',
-            align:"center",
-            dataIndex: 'appId'
-           },
-		   {
-            title: '创意展现方式  1:轮播 2:优选',
-            align:"center",
-            dataIndex: 'showModel'
-           },
-		   {
-            title: '投放方式 1:快速投放 2:平滑投放',
-            align:"center",
-            dataIndex: 'speed'
-           },
-		   {
-            title: '广告组ID',
-            align:"center",
-            dataIndex: 'unitId'
-           },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-		url: {
-          list: "/kuaishou/kuaiShouGroupCreate/list",
-          delete: "/kuaishou/kuaiShouGroupCreate/delete",
-          deleteBatch: "/kuaishou/kuaiShouGroupCreate/deleteBatch",
-          exportXlsUrl: "kuaishou/kuaiShouGroupCreate/exportXls",
-          importExcelUrl: "kuaishou/kuaiShouGroupCreate/importExcel",
-       },
-    }
-  },
-  computed: {
-    importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-    methods: {
-     
+        },
+        computed: {
+            importExcelUrl: function () {
+                return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+            }
+        },
+        methods: {}
     }
-  }
 </script>
 <style scoped>
-  @import '~@assets/less/common.less'
+    @import '~@assets/less/common.less'
 </style>

+ 188 - 183
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouGroupCreateTargetList.vue

@@ -1,39 +1,39 @@
 <template>
-  <a-card :bordered="false">
+    <a-card :bordered="false">
 
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
+        <!-- 查询区域 -->
+        <div class="table-page-search-wrapper">
+            <a-form layout="inline">
+                <a-row :gutter="24">
 
-          <a-col :md="6" :sm="8">
-            <a-form-item label="账户ID">
-              <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="广告组ID">
-              <a-input placeholder="请输入广告组ID" v-model="queryParam.unitId"></a-input>
-            </a-form-item>
-          </a-col>
-        <template v-if="toggleSearchStatus">
-        <a-col :md="6" :sm="8">
-            <a-form-item label="地域">
-              <a-input placeholder="请输入地域" v-model="queryParam.region"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="年龄最小限制">
-              <a-input placeholder="请输入年龄最小限制" v-model="queryParam.ageMin"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="年龄最大限制">
-              <a-input placeholder="请输入年龄最大限制" v-model="queryParam.ageMax"></a-input>
-            </a-form-item>
-          </a-col>
-          </template>
-          <a-col :md="6" :sm="8" >
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="账户ID">
+                            <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="广告组ID">
+                            <a-input placeholder="请输入广告组ID" v-model="queryParam.unitId"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <template v-if="toggleSearchStatus">
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="地域">
+                                <a-input placeholder="请输入地域" v-model="queryParam.region"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="年龄最小限制">
+                                <a-input placeholder="请输入年龄最小限制" v-model="queryParam.ageMin"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="年龄最大限制">
+                                <a-input placeholder="请输入年龄最大限制" v-model="queryParam.ageMax"></a-input>
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                    <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -42,52 +42,59 @@
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
             </span>
-          </a-col>
+                    </a-col>
 
-        </a-row>
-      </a-form>
-    </div>
+                </a-row>
+            </a-form>
+        </div>
 
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('快手-创建广告组定向信息')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
+        <!-- 操作按钮区域 -->
+        <div class="table-operator">
+            <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('快手-创建广告组定向信息')">导出</a-button>
+            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
+                      :action="importExcelUrl" @change="handleImportExcel">
+                <a-button type="primary" icon="import">导入</a-button>
+            </a-upload>
+            <a-dropdown v-if="selectedRowKeys.length > 0">
+                <a-menu slot="overlay">
+                    <a-menu-item key="1" @click="batchDel">
+                        <a-icon type="delete"/>
+                        删除
+                    </a-menu-item>
+                </a-menu>
+                <a-button style="margin-left: 8px"> 批量操作
+                    <a-icon type="down"/>
+                </a-button>
+            </a-dropdown>
+        </div>
 
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+        <!-- table区域-begin -->
+        <div>
+            <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+                <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
+                selectedRowKeys.length }}</a>项
+                <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+            </div>
 
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
+            <a-table
+                    ref="table"
+                    size="middle"
+                    bordered
+                    rowKey="id"
+                    :columns="columns"
+                    :dataSource="dataSource"
+                    :pagination="ipagination"
+                    :loading="loading"
+                    :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+                    @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -98,126 +105,124 @@
           </a-dropdown>
         </span>
 
-      </a-table>
-    </div>
-    <!-- table区域-end -->
+            </a-table>
+        </div>
+        <!-- table区域-end -->
 
-    <!-- 表单区域 -->
-    <kuaiShouGroupCreateTarget-modal ref="modalForm" @ok="modalFormOk"></kuaiShouGroupCreateTarget-modal>
-  </a-card>
+        <!-- 表单区域 -->
+        <kuaiShouGroupCreateTarget-modal ref="modalForm" @ok="modalFormOk"></kuaiShouGroupCreateTarget-modal>
+    </a-card>
 </template>
 
 <script>
-  import KuaiShouGroupCreateTargetModal from './modules/KuaiShouGroupCreateTargetModal'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+    import KuaiShouGroupCreateTargetModal from './modules/KuaiShouGroupCreateTargetModal'
+    import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
-  export default {
-    name: "KuaiShouGroupCreateTargetList",
-    mixins:[JeecgListMixin],
-    components: {
-      KuaiShouGroupCreateTargetModal
-    },
-    data () {
-      return {
-        description: '快手-创建广告组定向信息管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
+    export default {
+        name: "KuaiShouGroupCreateTargetList",
+        mixins: [JeecgListMixin],
+        components: {
+            KuaiShouGroupCreateTargetModal
+        },
+        data() {
+            return {
+                description: '快手-创建广告组定向信息管理页面',
+                // 表头
+                columns: [
+                    {
+                        title: '#',
+                        dataIndex: '',
+                        key: 'rowIndex',
+                        width: 60,
+                        align: "center",
+                        customRender: function (t, r, index) {
+                            return parseInt(index) + 1;
+                        }
+                    },
+                    {
+                        title: '账户ID',
+                        align: "center",
+                        dataIndex: 'accountId'
+                    },
+                    {
+                        title: '广告组ID',
+                        align: "center",
+                        dataIndex: 'unitId'
+                    },
+                    {
+                        title: '地域',
+                        align: "center",
+                        dataIndex: 'region'
+                    },
+                    {
+                        title: '年龄最小限制',
+                        align: "center",
+                        dataIndex: 'ageMin'
+                    },
+                    {
+                        title: '年龄最大限制',
+                        align: "center",
+                        dataIndex: 'ageMax'
+                    },
+                    {
+                        title: '性别 1:女性, 2:男性, 0:不限',
+                        align: "center",
+                        dataIndex: 'gender'
+                    },
+                    {
+                        title: '操作系统 1: Android, 2: iOS, 0:不限',
+                        align: "center",
+                        dataIndex: 'platformOs'
+                    },
+                    {
+                        title: '安卓版本  3:不限, 4: 4.x+, 5: 5.x+, 6: 6.x+, 7: 7.x+;',
+                        align: "center",
+                        dataIndex: 'androidOsv'
+                    },
+                    {
+                        title: 'ios版本  6:不限, 7: 7.x+, 8: 8.x+,9: 9.x+, 10: 10.x+',
+                        align: "center",
+                        dataIndex: 'iosOsv'
+                    },
+                    {
+                        title: '网络环境 1: Wi-Fi, 2:移动网络,0:表示不限',
+                        align: "center",
+                        dataIndex: 'network'
+                    },
+                    {
+                        title: '设备品牌 1: OPPO, 2: VIVO,3:华为, 4:小米,5:荣耀, 6:三星,7:金立, 8:魅族,9:乐视, 10:其他,11 : 苹 果',
+                        align: "center",
+                        dataIndex: 'deviceBrand'
+                    },
+                    {
+                        title: '设备价格 1: 1500 元以下,2: 1501~2000,3: 2001~2500,4: 2501~3000,5: 3001~3500,6: 3501~4000,7: 4001~4500,8: 4501~5000,9: 5001~5500,10: 5500 元以上',
+                        align: "center",
+                        dataIndex: 'devicePrice'
+                    },
+                    {
+                        title: '操作',
+                        dataIndex: 'action',
+                        align: "center",
+                        scopedSlots: {customRender: 'action'},
+                    }
+                ],
+                url: {
+                    list: "/kuaishou/kuaiShouGroupCreateTarget/list",
+                    delete: "/kuaishou/kuaiShouGroupCreateTarget/delete",
+                    deleteBatch: "/kuaishou/kuaiShouGroupCreateTarget/deleteBatch",
+                    exportXlsUrl: "kuaishou/kuaiShouGroupCreateTarget/exportXls",
+                    importExcelUrl: "kuaishou/kuaiShouGroupCreateTarget/importExcel",
+                },
             }
-           },
-		   {
-            title: '账户ID',
-            align:"center",
-            dataIndex: 'accountId'
-           },
-		   {
-            title: '广告组ID',
-            align:"center",
-            dataIndex: 'unitId'
-           },
-		   {
-            title: '地域',
-            align:"center",
-            dataIndex: 'region'
-           },
-		   {
-            title: '年龄最小限制',
-            align:"center",
-            dataIndex: 'ageMin'
-           },
-		   {
-            title: '年龄最大限制',
-            align:"center",
-            dataIndex: 'ageMax'
-           },
-		   {
-            title: '性别 1:女性, 2:男性, 0:不限',
-            align:"center",
-            dataIndex: 'gender'
-           },
-		   {
-            title: '操作系统 1: Android, 2: iOS, 0:不限',
-            align:"center",
-            dataIndex: 'platformOs'
-           },
-		   {
-            title: '安卓版本  3:不限, 4: 4.x+, 5: 5.x+, 6: 6.x+, 7: 7.x+;',
-            align:"center",
-            dataIndex: 'androidOsv'
-           },
-		   {
-            title: 'ios版本  6:不限, 7: 7.x+, 8: 8.x+,9: 9.x+, 10: 10.x+',
-            align:"center",
-            dataIndex: 'iosOsv'
-           },
-		   {
-            title: '网络环境 1: Wi-Fi, 2:移动网络,0:表示不限',
-            align:"center",
-            dataIndex: 'network'
-           },
-		   {
-            title: '设备品牌 1: OPPO, 2: VIVO,3:华为, 4:小米,5:荣耀, 6:三星,7:金立, 8:魅族,9:乐视, 10:其他,11 : 苹 果',
-            align:"center",
-            dataIndex: 'deviceBrand'
-           },
-		   {
-            title: '设备价格 1: 1500 元以下,2: 1501~2000,3: 2001~2500,4: 2501~3000,5: 3001~3500,6: 3501~4000,7: 4001~4500,8: 4501~5000,9: 5001~5500,10: 5500 元以上',
-            align:"center",
-            dataIndex: 'devicePrice'
-           },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-		url: {
-          list: "/kuaishou/kuaiShouGroupCreateTarget/list",
-          delete: "/kuaishou/kuaiShouGroupCreateTarget/delete",
-          deleteBatch: "/kuaishou/kuaiShouGroupCreateTarget/deleteBatch",
-          exportXlsUrl: "kuaishou/kuaiShouGroupCreateTarget/exportXls",
-          importExcelUrl: "kuaishou/kuaiShouGroupCreateTarget/importExcel",
-       },
-    }
-  },
-  computed: {
-    importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-    methods: {
-     
+        },
+        computed: {
+            importExcelUrl: function () {
+                return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+            }
+        },
+        methods: {}
     }
-  }
 </script>
 <style scoped>
-  @import '~@assets/less/common.less'
+    @import '~@assets/less/common.less'
 </style>

+ 233 - 228
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouGroupList.vue

@@ -1,39 +1,39 @@
 <template>
-  <a-card :bordered="false">
+    <a-card :bordered="false">
 
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
+        <!-- 查询区域 -->
+        <div class="table-page-search-wrapper">
+            <a-form layout="inline">
+                <a-row :gutter="24">
 
-          <a-col :md="6" :sm="8">
-            <a-form-item label="账户ID">
-              <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="广告活动ID">
-              <a-input placeholder="请输入广告活动ID" v-model="queryParam.campaignId"></a-input>
-            </a-form-item>
-          </a-col>
-        <template v-if="toggleSearchStatus">
-        <a-col :md="6" :sm="8">
-            <a-form-item label="广告组ID">
-              <a-input placeholder="请输入广告组ID" v-model="queryParam.unitId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="广告组名称">
-              <a-input placeholder="请输入广告组名称" v-model="queryParam.unitName"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="广告组状态">
-              <a-input placeholder="请输入广告组状态" v-model="queryParam.status"></a-input>
-            </a-form-item>
-          </a-col>
-          </template>
-          <a-col :md="6" :sm="8" >
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="账户ID">
+                            <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="广告活动ID">
+                            <a-input placeholder="请输入广告活动ID" v-model="queryParam.campaignId"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <template v-if="toggleSearchStatus">
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="广告组ID">
+                                <a-input placeholder="请输入广告组ID" v-model="queryParam.unitId"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="广告组名称">
+                                <a-input placeholder="请输入广告组名称" v-model="queryParam.unitName"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="广告组状态">
+                                <a-input placeholder="请输入广告组状态" v-model="queryParam.status"></a-input>
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                    <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -42,52 +42,59 @@
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
             </span>
-          </a-col>
+                    </a-col>
 
-        </a-row>
-      </a-form>
-    </div>
+                </a-row>
+            </a-form>
+        </div>
 
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('广告组信息')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
+        <!-- 操作按钮区域 -->
+        <div class="table-operator">
+            <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('广告组信息')">导出</a-button>
+            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
+                      :action="importExcelUrl" @change="handleImportExcel">
+                <a-button type="primary" icon="import">导入</a-button>
+            </a-upload>
+            <a-dropdown v-if="selectedRowKeys.length > 0">
+                <a-menu slot="overlay">
+                    <a-menu-item key="1" @click="batchDel">
+                        <a-icon type="delete"/>
+                        删除
+                    </a-menu-item>
+                </a-menu>
+                <a-button style="margin-left: 8px"> 批量操作
+                    <a-icon type="down"/>
+                </a-button>
+            </a-dropdown>
+        </div>
 
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+        <!-- table区域-begin -->
+        <div>
+            <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+                <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
+                selectedRowKeys.length }}</a>项
+                <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+            </div>
 
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
+            <a-table
+                    ref="table"
+                    size="middle"
+                    bordered
+                    rowKey="id"
+                    :columns="columns"
+                    :dataSource="dataSource"
+                    :pagination="ipagination"
+                    :loading="loading"
+                    :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+                    @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -98,171 +105,169 @@
           </a-dropdown>
         </span>
 
-      </a-table>
-    </div>
-    <!-- table区域-end -->
+            </a-table>
+        </div>
+        <!-- table区域-end -->
 
-    <!-- 表单区域 -->
-    <kuaiShouGroup-modal ref="modalForm" @ok="modalFormOk"></kuaiShouGroup-modal>
-  </a-card>
+        <!-- 表单区域 -->
+        <kuaiShouGroup-modal ref="modalForm" @ok="modalFormOk"></kuaiShouGroup-modal>
+    </a-card>
 </template>
 
 <script>
-  import KuaiShouGroupModal from './modules/KuaiShouGroupModal'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+    import KuaiShouGroupModal from './modules/KuaiShouGroupModal'
+    import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
-  export default {
-    name: "KuaiShouGroupList",
-    mixins:[JeecgListMixin],
-    components: {
-      KuaiShouGroupModal
-    },
-    data () {
-      return {
-        description: '广告组信息管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
+    export default {
+        name: "KuaiShouGroupList",
+        mixins: [JeecgListMixin],
+        components: {
+            KuaiShouGroupModal
+        },
+        data() {
+            return {
+                description: '广告组信息管理页面',
+                // 表头
+                columns: [
+                    {
+                        title: '#',
+                        dataIndex: '',
+                        key: 'rowIndex',
+                        width: 60,
+                        align: "center",
+                        customRender: function (t, r, index) {
+                            return parseInt(index) + 1;
+                        }
+                    },
+                    {
+                        title: '账户ID',
+                        align: "center",
+                        dataIndex: 'accountId'
+                    },
+                    {
+                        title: '广告活动ID',
+                        align: "center",
+                        dataIndex: 'campaignId'
+                    },
+                    {
+                        title: '广告组ID',
+                        align: "center",
+                        dataIndex: 'unitId'
+                    },
+                    {
+                        title: '广告组名称',
+                        align: "center",
+                        dataIndex: 'unitName'
+                    },
+                    {
+                        title: '广告组状态',
+                        align: "center",
+                        dataIndex: 'status'
+                    },
+                    {
+                        title: '审核拒绝理由',
+                        align: "center",
+                        dataIndex: 'reviewDetail'
+                    },
+                    {
+                        title: '出价类型',
+                        align: "center",
+                        dataIndex: 'bidType'
+                    },
+                    {
+                        title: '出价',
+                        align: "center",
+                        dataIndex: 'bid'
+                    },
+                    {
+                        title: 'OCPC出价',
+                        align: "center",
+                        dataIndex: 'cpaBid'
+                    },
+                    {
+                        title: 'OCPX行为类型   1: CPM, 2: CPC,',
+                        align: "center",
+                        dataIndex: 'ocpxActionType'
+                    },
+                    {
+                        title: '单日预算',
+                        align: "center",
+                        dataIndex: 'dayBudget'
+                    },
+                    {
+                        title: '投放方式  0:未知, 1:正常投',
+                        align: "center",
+                        dataIndex: 'speed'
+                    },
+                    {
+                        title: '投放开始时间',
+                        align: "center",
+                        dataIndex: 'beginTime'
+                    },
+                    {
+                        title: '投放结束时间',
+                        align: "center",
+                        dataIndex: 'endTime'
+                    },
+                    {
+                        title: '投放时段',
+                        align: "center",
+                        dataIndex: 'schedule'
+                    },
+                    {
+                        title: '创意展现方式  0:未知, 1:轮播,',
+                        align: "center",
+                        dataIndex: 'showModel'
+                    },
+                    {
+                        title: 'url类型 ',
+                        align: "center",
+                        dataIndex: 'urlType'
+                    },
+                    {
+                        title: '落地页链接',
+                        align: "center",
+                        dataIndex: 'url'
+                    },
+                    {
+                        title: 'APP ID',
+                        align: "center",
+                        dataIndex: 'appId'
+                    },
+                    {
+                        title: 'APP图标存储地址',
+                        align: "center",
+                        dataIndex: 'appIconUrl'
+                    },
+                    {
+                        title: '应用信息',
+                        align: "center",
+                        dataIndex: 'diverseData'
+                    },
+                    {
+                        title: '操作',
+                        dataIndex: 'action',
+                        align: "center",
+                        scopedSlots: {customRender: 'action'},
+                    }
+                ],
+                url: {
+                    list: "/kuaishou/kuaiShouGroup/list",
+                    delete: "/kuaishou/kuaiShouGroup/delete",
+                    deleteBatch: "/kuaishou/kuaiShouGroup/deleteBatch",
+                    exportXlsUrl: "kuaishou/kuaiShouGroup/exportXls",
+                    importExcelUrl: "kuaishou/kuaiShouGroup/importExcel",
+                },
             }
-           },
-		   {
-            title: '账户ID',
-            align:"center",
-            dataIndex: 'accountId'
-           },
-		   {
-            title: '广告活动ID',
-            align:"center",
-            dataIndex: 'campaignId'
-           },
-		   {
-            title: '广告组ID',
-            align:"center",
-            dataIndex: 'unitId'
-           },
-		   {
-            title: '广告组名称',
-            align:"center",
-            dataIndex: 'unitName'
-           },
-		   {
-            title: '广告组状态',
-            align:"center",
-            dataIndex: 'status'
-           },
-		   {
-            title: '审核拒绝理由',
-            align:"center",
-            dataIndex: 'reviewDetail'
-           },
-		   {
-            title: '出价类型',
-            align:"center",
-            dataIndex: 'bidType'
-           },
-		   {
-            title: '出价',
-            align:"center",
-            dataIndex: 'bid'
-           },
-		   {
-            title: 'OCPC出价',
-            align:"center",
-            dataIndex: 'cpaBid'
-           },
-		   {
-            title: 'OCPX行为类型   1: CPM, 2: CPC,',
-            align:"center",
-            dataIndex: 'ocpxActionType'
-           },
-		   {
-            title: '单日预算',
-            align:"center",
-            dataIndex: 'dayBudget'
-           },
-		   {
-            title: '投放方式  0:未知, 1:正常投',
-            align:"center",
-            dataIndex: 'speed'
-           },
-		   {
-            title: '投放开始时间',
-            align:"center",
-            dataIndex: 'beginTime'
-           },
-		   {
-            title: '投放结束时间',
-            align:"center",
-            dataIndex: 'endTime'
-           },
-		   {
-            title: '投放时段',
-            align:"center",
-            dataIndex: 'schedule'
-           },
-		   {
-            title: '创意展现方式  0:未知, 1:轮播,',
-            align:"center",
-            dataIndex: 'showModel'
-           },
-		   {
-            title: 'url类型 ',
-            align:"center",
-            dataIndex: 'urlType'
-           },
-		   {
-            title: '落地页链接',
-            align:"center",
-            dataIndex: 'url'
-           },
-		   {
-            title: 'APP ID',
-            align:"center",
-            dataIndex: 'appId'
-           },
-		   {
-            title: 'APP图标存储地址',
-            align:"center",
-            dataIndex: 'appIconUrl'
-           },
-		   {
-            title: '应用信息',
-            align:"center",
-            dataIndex: 'diverseData'
-           },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-		url: {
-          list: "/kuaishou/kuaiShouGroup/list",
-          delete: "/kuaishou/kuaiShouGroup/delete",
-          deleteBatch: "/kuaishou/kuaiShouGroup/deleteBatch",
-          exportXlsUrl: "kuaishou/kuaiShouGroup/exportXls",
-          importExcelUrl: "kuaishou/kuaiShouGroup/importExcel",
-       },
-    }
-  },
-  computed: {
-    importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-    methods: {
-     
+        },
+        computed: {
+            importExcelUrl: function () {
+                return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+            }
+        },
+        methods: {}
     }
-  }
 </script>
 <style scoped>
-  @import '~@assets/less/common.less'
+    @import '~@assets/less/common.less'
 </style>

+ 163 - 158
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouImageGetList.vue

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

+ 173 - 168
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouImageUploandList.vue

@@ -1,39 +1,39 @@
 <template>
-  <a-card :bordered="false">
+    <a-card :bordered="false">
 
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
+        <!-- 查询区域 -->
+        <div class="table-page-search-wrapper">
+            <a-form layout="inline">
+                <a-row :gutter="24">
 
-          <a-col :md="6" :sm="8">
-            <a-form-item label="账户ID">
-              <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="本地存储地址">
-              <a-input placeholder="请输入本地存储地址" v-model="queryParam.savaPath"></a-input>
-            </a-form-item>
-          </a-col>
-        <template v-if="toggleSearchStatus">
-        <a-col :md="6" :sm="8">
-            <a-form-item label="图片预览地址">
-              <a-input placeholder="请输入图片预览地址" v-model="queryParam.url"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="宽">
-              <a-input placeholder="请输入宽" v-model="queryParam.width"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="高">
-              <a-input placeholder="请输入高" v-model="queryParam.height"></a-input>
-            </a-form-item>
-          </a-col>
-          </template>
-          <a-col :md="6" :sm="8" >
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="账户ID">
+                            <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="本地存储地址">
+                            <a-input placeholder="请输入本地存储地址" v-model="queryParam.savaPath"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <template v-if="toggleSearchStatus">
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="图片预览地址">
+                                <a-input placeholder="请输入图片预览地址" v-model="queryParam.url"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="宽">
+                                <a-input placeholder="请输入宽" v-model="queryParam.width"></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="高">
+                                <a-input placeholder="请输入高" v-model="queryParam.height"></a-input>
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                    <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -42,52 +42,59 @@
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
             </span>
-          </a-col>
+                    </a-col>
 
-        </a-row>
-      </a-form>
-    </div>
+                </a-row>
+            </a-form>
+        </div>
 
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('快手-上传图片接口')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
+        <!-- 操作按钮区域 -->
+        <div class="table-operator">
+            <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('快手-上传图片接口')">导出</a-button>
+            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
+                      :action="importExcelUrl" @change="handleImportExcel">
+                <a-button type="primary" icon="import">导入</a-button>
+            </a-upload>
+            <a-dropdown v-if="selectedRowKeys.length > 0">
+                <a-menu slot="overlay">
+                    <a-menu-item key="1" @click="batchDel">
+                        <a-icon type="delete"/>
+                        删除
+                    </a-menu-item>
+                </a-menu>
+                <a-button style="margin-left: 8px"> 批量操作
+                    <a-icon type="down"/>
+                </a-button>
+            </a-dropdown>
+        </div>
 
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+        <!-- table区域-begin -->
+        <div>
+            <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+                <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
+                selectedRowKeys.length }}</a>项
+                <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+            </div>
 
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
+            <a-table
+                    ref="table"
+                    size="middle"
+                    bordered
+                    rowKey="id"
+                    :columns="columns"
+                    :dataSource="dataSource"
+                    :pagination="ipagination"
+                    :loading="loading"
+                    :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+                    @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -98,111 +105,109 @@
           </a-dropdown>
         </span>
 
-      </a-table>
-    </div>
-    <!-- table区域-end -->
+            </a-table>
+        </div>
+        <!-- table区域-end -->
 
-    <!-- 表单区域 -->
-    <kuaiShouImageUploand-modal ref="modalForm" @ok="modalFormOk"></kuaiShouImageUploand-modal>
-  </a-card>
+        <!-- 表单区域 -->
+        <kuaiShouImageUploand-modal ref="modalForm" @ok="modalFormOk"></kuaiShouImageUploand-modal>
+    </a-card>
 </template>
 
 <script>
-  import KuaiShouImageUploandModal from './modules/KuaiShouImageUploandModal'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+    import KuaiShouImageUploandModal from './modules/KuaiShouImageUploandModal'
+    import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
-  export default {
-    name: "KuaiShouImageUploandList",
-    mixins:[JeecgListMixin],
-    components: {
-      KuaiShouImageUploandModal
-    },
-    data () {
-      return {
-        description: '快手-上传图片接口管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
+    export default {
+        name: "KuaiShouImageUploandList",
+        mixins: [JeecgListMixin],
+        components: {
+            KuaiShouImageUploandModal
+        },
+        data() {
+            return {
+                description: '快手-上传图片接口管理页面',
+                // 表头
+                columns: [
+                    {
+                        title: '#',
+                        dataIndex: '',
+                        key: 'rowIndex',
+                        width: 60,
+                        align: "center",
+                        customRender: function (t, r, index) {
+                            return parseInt(index) + 1;
+                        }
+                    },
+                    {
+                        title: '账户ID',
+                        align: "center",
+                        dataIndex: 'accountId'
+                    },
+                    {
+                        title: '本地存储地址',
+                        align: "center",
+                        dataIndex: 'savaPath'
+                    },
+                    {
+                        title: '图片预览地址',
+                        align: "center",
+                        dataIndex: 'url'
+                    },
+                    {
+                        title: '宽',
+                        align: "center",
+                        dataIndex: 'width'
+                    },
+                    {
+                        title: '高',
+                        align: "center",
+                        dataIndex: 'height'
+                    },
+                    {
+                        title: '图片大小',
+                        align: "center",
+                        dataIndex: 'size'
+                    },
+                    {
+                        title: '图片格式',
+                        align: "center",
+                        dataIndex: 'format'
+                    },
+                    {
+                        title: '图片 token',
+                        align: "center",
+                        dataIndex: 'imageToken'
+                    },
+                    {
+                        title: '文件上传时间',
+                        align: "center",
+                        dataIndex: 'uploadTime'
+                    },
+                    {
+                        title: '操作',
+                        dataIndex: 'action',
+                        align: "center",
+                        scopedSlots: {customRender: 'action'},
+                    }
+                ],
+                url: {
+                    list: "/kuaishou/kuaiShouImageUploand/list",
+                    delete: "/kuaishou/kuaiShouImageUploand/delete",
+                    deleteBatch: "/kuaishou/kuaiShouImageUploand/deleteBatch",
+                    exportXlsUrl: "kuaishou/kuaiShouImageUploand/exportXls",
+                    importExcelUrl: "kuaishou/kuaiShouImageUploand/importExcel",
+                },
             }
-           },
-		   {
-            title: '账户ID',
-            align:"center",
-            dataIndex: 'accountId'
-           },
-		   {
-            title: '本地存储地址',
-            align:"center",
-            dataIndex: 'savaPath'
-           },
-		   {
-            title: '图片预览地址',
-            align:"center",
-            dataIndex: 'url'
-           },
-		   {
-            title: '宽',
-            align:"center",
-            dataIndex: 'width'
-           },
-		   {
-            title: '高',
-            align:"center",
-            dataIndex: 'height'
-           },
-		   {
-            title: '图片大小',
-            align:"center",
-            dataIndex: 'size'
-           },
-		   {
-            title: '图片格式',
-            align:"center",
-            dataIndex: 'format'
-           },
-		   {
-            title: '图片 token',
-            align:"center",
-            dataIndex: 'imageToken'
-           },
-		   {
-            title: '文件上传时间',
-            align:"center",
-            dataIndex: 'uploadTime'
-           },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-		url: {
-          list: "/kuaishou/kuaiShouImageUploand/list",
-          delete: "/kuaishou/kuaiShouImageUploand/delete",
-          deleteBatch: "/kuaishou/kuaiShouImageUploand/deleteBatch",
-          exportXlsUrl: "kuaishou/kuaiShouImageUploand/exportXls",
-          importExcelUrl: "kuaishou/kuaiShouImageUploand/importExcel",
-       },
-    }
-  },
-  computed: {
-    importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-    methods: {
-     
+        },
+        computed: {
+            importExcelUrl: function () {
+                return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+            }
+        },
+        methods: {}
     }
-  }
 </script>
 <style scoped>
-  @import '~@assets/less/common.less'
+    @import '~@assets/less/common.less'
 </style>

+ 0 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouRegionListChildrenList.vue


Некоторые файлы не были показаны из-за большого количества измененных файлов