yumeng пре 6 година
родитељ
комит
1892d6c261
34 измењених фајлова са 2824 додато и 25 уклоњено
  1. 7 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  2. 2 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/CTopOauthTokenMapper.java
  3. 20 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouController.java
  4. 244 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouConversionInfosController.java
  5. 244 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouConversionTypesController.java
  6. 244 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreativeCreateController.java
  7. 59 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouConversionInfos.java
  8. 72 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouConversionTypes.java
  9. 106 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouCreativeCreate.java
  10. 17 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouConversionInfosMapper.java
  11. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouConversionTypesMapper.java
  12. 17 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/KuaiShouCreativeCreateMapper.java
  13. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/xml/KuaiShouConversionInfosMapper.xml
  14. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/xml/KuaiShouConversionTypesMapper.xml
  15. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/mapper/xml/KuaiShouCreativeCreateMapper.xml
  16. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouConversionInfosService.java
  17. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouConversionTypesService.java
  18. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaiShouCreativeCreateService.java
  19. 27 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaishouInterfaceService.java
  20. 18 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouConversionInfosServiceImpl.java
  21. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouConversionTypesServiceImpl.java
  22. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouCreativeCreateServiceImpl.java
  23. 145 11
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaishouInterfaceServiceImpl.java
  24. 168 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouConversionInfosList.vue
  25. 168 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouConversionTypesList.vue
  26. 208 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/KuaiShouCreativeCreateList.vue
  27. 136 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/modules/KuaiShouConversionInfosModal.vue
  28. 143 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/modules/KuaiShouConversionInfosModal__Style#Drawer.vue
  29. 136 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/modules/KuaiShouConversionTypesModal.vue
  30. 143 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/modules/KuaiShouConversionTypesModal__Style#Drawer.vue
  31. 172 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/modules/KuaiShouCreativeCreateModal.vue
  32. 179 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/modules/KuaiShouCreativeCreateModal__Style#Drawer.vue
  33. 39 1
      module-common/src/main/java/cn/com/ctop/common/utils/HttpUtils.java
  34. 1 0
      module-kuaishou/src/main/java/constant/KuaishouInterfaceConstant.java

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

@@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 @Controller
 @RequestMapping("/")
@@ -38,6 +40,7 @@ public class CallbackController {
             KuaishouAccessToken token = accessToken.getData();
             if (token != null) {
                 CTopOauthToken topOauthToken = new CTopOauthToken();
+                Long accountId = token.getAccountId();
                 topOauthToken.setAccountId(token.getAccountId());
                 topOauthToken.setMediaId("2");
                 topOauthToken.setAdvertiserId(state);
@@ -50,7 +53,10 @@ public class CallbackController {
                 long refreshTokenExpireIn = token.getRefreshTokenExpiresIn() * 1000L;
                 Date refreshTokenExpireInDate = new Date(now + refreshTokenExpireIn);
                 topOauthToken.setRefreshTokenExpiresIn(refreshTokenExpireInDate);
-                cTopOauthTokenMapper.insert(topOauthToken);
+
+                Map<String, Object> map = new HashMap<>();
+                map.put("account_id", accountId);
+
             }
             return "auth_success";
         }

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

@@ -1,15 +1,12 @@
 package org.jeecg.modules.ctop.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.ctop.entity.CTopOauthToken;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.ctop.entity.CTopOauthToken;
 
 /**
  * @Description: oauth授权码
  * @Author: jeecg-boot
- * @Date:   2019-07-09
+ * @Date: 2019-07-09
  * @Version: V1.0
  */
 public interface CTopOauthTokenMapper extends BaseMapper<CTopOauthToken> {

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

@@ -33,7 +33,7 @@ public class KuaiShouController {
      */
     @RequestMapping("/adUnitCreate")
     public void adUnitCcreate() {
-        String accessToken = "f60f51a8f7d8938d6147d38357fed70c";
+        String accessToken = "cbe9caeffcc2c5ccd97a05bf909896da";
         Long advertiserId = 23212L;
         JSONObject requestJson = new JSONObject();
         requestJson.put("campaign_id", 4178072L);
@@ -81,7 +81,7 @@ public class KuaiShouController {
     public void getCampaignList() {
         String accessToken = "f60f51a8f7d8938d6147d38357fed70c";
         Long advertiserId = 23212L;
-        kuaishouInterfaceService.getCampaignList(accessToken, advertiserId,1);
+        kuaishouInterfaceService.getCampaignList(accessToken, advertiserId, 1);
 
     }
 
@@ -89,19 +89,34 @@ public class KuaiShouController {
     public void getGroupList() {
         String accessToken = "f60f51a8f7d8938d6147d38357fed70c";
         Long advertiserId = 23212L;
-        kuaishouInterfaceService.getGroupList(accessToken, advertiserId,1);
+        kuaishouInterfaceService.getGroupList(accessToken, advertiserId, 1);
 
     }
 
     @RequestMapping("/getCreativeList")
     public void getCreativeList() {
-        String accessToken = "f60f51a8f7d8938d6147d38357fed70c";
+        String accessToken = "cbe9caeffcc2c5ccd97a05bf909896da";
         Long advertiserId = 23212L;
-        kuaishouInterfaceService.getCreativeList(accessToken, advertiserId,1);
+        kuaishouInterfaceService.getCreativeList(accessToken, advertiserId, 1);
 
     }
 
+    @RequestMapping("/getDeepConversionInfos")
+    public void getDeepConversionInfos() {
+        String accessToken = "cbe9caeffcc2c5ccd97a05bf909896da";
+        Long advertiserId = 23212L;
+        kuaishouInterfaceService.getDeepConversionInfos(advertiserId, accessToken);
+
+    }
 
 
+    @RequestMapping("/getToken")
+    public void getToken() {
+        String accessToken = "e7d672aeaea6a1d020c20139fe295c57";
+        kuaishouInterfaceService.getRefreshToken(accessToken);
+
+
+    }
+
 
 }

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

@@ -0,0 +1,244 @@
+package org.jeecg.modules.kuaishou.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.kuaishou.entity.KuaiShouConversionInfos;
+import org.jeecg.modules.kuaishou.service.IKuaiShouConversionInfosService;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * @Description: 快手-可选深度转化类型
+ * @Author: jeecg-boot
+ * @Date:   2019-07-24
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags="快手-可选深度转化类型")
+@RestController
+@RequestMapping("/kuaishou/kuaiShouConversionInfos")
+public class KuaiShouConversionInfosController {
+	@Autowired
+	private IKuaiShouConversionInfosService kuaiShouConversionInfosService;
+	
+	/**
+	  * 分页列表查询
+	 * @param kuaiShouConversionInfos
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@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);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param kuaiShouConversionInfos
+	 * @return
+	 */
+	@AutoLog(value = "快手-可选深度转化类型-添加")
+	@ApiOperation(value="快手-可选深度转化类型-添加", notes="快手-可选深度转化类型-添加")
+	@PostMapping(value = "/add")
+	public Result<KuaiShouConversionInfos> add(@RequestBody KuaiShouConversionInfos kuaiShouConversionInfos) {
+		Result<KuaiShouConversionInfos> result = new Result<KuaiShouConversionInfos>();
+		try {
+			kuaiShouConversionInfosService.save(kuaiShouConversionInfos);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param kuaiShouConversionInfos
+	 * @return
+	 */
+	@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) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = kuaiShouConversionInfosService.updateById(kuaiShouConversionInfos);
+			//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 {
+			kuaiShouConversionInfosService.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<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(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@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) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(kuaiShouConversionInfos);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<KuaiShouConversionInfos> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              KuaiShouConversionInfos kuaiShouConversionInfos = JSON.parseObject(deString, KuaiShouConversionInfos.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouConversionInfos, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<KuaiShouConversionInfos> pageList = kuaiShouConversionInfosService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "快手-可选深度转化类型列表");
+      mv.addObject(NormalExcelConstants.CLASS, KuaiShouConversionInfos.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("快手-可选深度转化类型列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+  /**
+      * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();// 获取上传文件对象
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<KuaiShouConversionInfos> listKuaiShouConversionInfoss = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouConversionInfos.class, params);
+              kuaiShouConversionInfosService.saveBatch(listKuaiShouConversionInfoss);
+              return Result.ok("文件导入成功!数据行数:" + listKuaiShouConversionInfoss.size());
+          } catch (Exception e) {
+              log.error(e.getMessage(),e);
+              return Result.error("文件导入失败:"+e.getMessage());
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败!");
+  }
+
+}

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

@@ -0,0 +1,244 @@
+package org.jeecg.modules.kuaishou.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.kuaishou.entity.KuaiShouConversionTypes;
+import org.jeecg.modules.kuaishou.service.IKuaiShouConversionTypesService;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * @Description: 快手-可选深度转化类型-详情
+ * @Author: jeecg-boot
+ * @Date:   2019-07-24
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags="快手-可选深度转化类型-详情")
+@RestController
+@RequestMapping("/kuaishou/kuaiShouConversionTypes")
+public class KuaiShouConversionTypesController {
+	@Autowired
+	private IKuaiShouConversionTypesService kuaiShouConversionTypesService;
+	
+	/**
+	  * 分页列表查询
+	 * @param kuaiShouConversionTypes
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@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);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param kuaiShouConversionTypes
+	 * @return
+	 */
+	@AutoLog(value = "快手-可选深度转化类型-详情-添加")
+	@ApiOperation(value="快手-可选深度转化类型-详情-添加", notes="快手-可选深度转化类型-详情-添加")
+	@PostMapping(value = "/add")
+	public Result<KuaiShouConversionTypes> add(@RequestBody KuaiShouConversionTypes kuaiShouConversionTypes) {
+		Result<KuaiShouConversionTypes> result = new Result<KuaiShouConversionTypes>();
+		try {
+			kuaiShouConversionTypesService.save(kuaiShouConversionTypes);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param kuaiShouConversionTypes
+	 * @return
+	 */
+	@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) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = kuaiShouConversionTypesService.updateById(kuaiShouConversionTypes);
+			//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 {
+			kuaiShouConversionTypesService.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<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(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@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) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(kuaiShouConversionTypes);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<KuaiShouConversionTypes> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              KuaiShouConversionTypes kuaiShouConversionTypes = JSON.parseObject(deString, KuaiShouConversionTypes.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouConversionTypes, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<KuaiShouConversionTypes> pageList = kuaiShouConversionTypesService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "快手-可选深度转化类型-详情列表");
+      mv.addObject(NormalExcelConstants.CLASS, KuaiShouConversionTypes.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<KuaiShouConversionTypes> listKuaiShouConversionTypess = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouConversionTypes.class, params);
+              kuaiShouConversionTypesService.saveBatch(listKuaiShouConversionTypess);
+              return Result.ok("文件导入成功!数据行数:" + listKuaiShouConversionTypess.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("文件导入失败!");
+  }
+
+}

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

@@ -0,0 +1,244 @@
+package org.jeecg.modules.kuaishou.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.kuaishou.entity.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;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * @Description: 快手-创建创意信息
+ * @Author: jeecg-boot
+ * @Date:   2019-07-24
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags="快手-创建创意信息")
+@RestController
+@RequestMapping("/kuaishou/kuaiShouCreativeCreate")
+public class KuaiShouCreativeCreateController {
+	@Autowired
+	private IKuaiShouCreativeCreateService kuaiShouCreativeCreateService;
+	
+	/**
+	  * 分页列表查询
+	 * @param kuaiShouCreativeCreate
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "快手-创建创意信息-分页列表查询")
+	@ApiOperation(value="快手-创建创意信息-分页列表查询", notes="快手-创建创意信息-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<KuaiShouCreativeCreate>> queryPageList(KuaiShouCreativeCreate kuaiShouCreativeCreate,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<KuaiShouCreativeCreate>> result = new Result<IPage<KuaiShouCreativeCreate>>();
+		QueryWrapper<KuaiShouCreativeCreate> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCreativeCreate, req.getParameterMap());
+		Page<KuaiShouCreativeCreate> page = new Page<KuaiShouCreativeCreate>(pageNo, pageSize);
+		IPage<KuaiShouCreativeCreate> pageList = kuaiShouCreativeCreateService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param kuaiShouCreativeCreate
+	 * @return
+	 */
+	@AutoLog(value = "快手-创建创意信息-添加")
+	@ApiOperation(value="快手-创建创意信息-添加", notes="快手-创建创意信息-添加")
+	@PostMapping(value = "/add")
+	public Result<KuaiShouCreativeCreate> add(@RequestBody KuaiShouCreativeCreate kuaiShouCreativeCreate) {
+		Result<KuaiShouCreativeCreate> result = new Result<KuaiShouCreativeCreate>();
+		try {
+			kuaiShouCreativeCreateService.save(kuaiShouCreativeCreate);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param kuaiShouCreativeCreate
+	 * @return
+	 */
+	@AutoLog(value = "快手-创建创意信息-编辑")
+	@ApiOperation(value="快手-创建创意信息-编辑", notes="快手-创建创意信息-编辑")
+	@PutMapping(value = "/edit")
+	public Result<KuaiShouCreativeCreate> edit(@RequestBody KuaiShouCreativeCreate kuaiShouCreativeCreate) {
+		Result<KuaiShouCreativeCreate> result = new Result<KuaiShouCreativeCreate>();
+		KuaiShouCreativeCreate kuaiShouCreativeCreateEntity = kuaiShouCreativeCreateService.getById(kuaiShouCreativeCreate.getId());
+		if(kuaiShouCreativeCreateEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = kuaiShouCreativeCreateService.updateById(kuaiShouCreativeCreate);
+			//TODO 返回false说明什么?
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "快手-创建创意信息-通过id删除")
+	@ApiOperation(value="快手-创建创意信息-通过id删除", notes="快手-创建创意信息-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+			kuaiShouCreativeCreateService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "快手-创建创意信息-批量删除")
+	@ApiOperation(value="快手-创建创意信息-批量删除", notes="快手-创建创意信息-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<KuaiShouCreativeCreate> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<KuaiShouCreativeCreate> result = new Result<KuaiShouCreativeCreate>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.kuaiShouCreativeCreateService.removeByIds(Arrays.asList(ids.split(",")));
+			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("文件导入失败!");
+  }
+
+}

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

@@ -0,0 +1,59 @@
+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;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: 快手-可选深度转化类型
+ * @Author: jeecg-boot
+ * @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="快手-可选深度转化类型")
+public class KuaiShouConversionInfos {
+    
+	/**id*/
+	@TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+	private Long id;
+	/**账户ID*/
+	@Excel(name = "账户ID", width = 15)
+    @ApiModelProperty(value = "账户ID")
+	private Long accountId;
+	/**是否有激活出价权限 0:没有 1:有*/
+	@Excel(name = "是否有激活出价权限 0:没有 1:有", width = 15)
+    @ApiModelProperty(value = "是否有激活出价权限 0:没有 1:有")
+	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")
+    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**修改时间*/
+	@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+}

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

@@ -0,0 +1,72 @@
+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;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: 快手-可选深度转化类型-详情
+ * @Author: jeecg-boot
+ * @Date: 2019-07-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("ctop_kuaishou_conversion_types")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_kuaishou_conversion_types对象", description = "快手-可选深度转化类型-详情")
+public class KuaiShouConversionTypes {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+    private Long id;
+    /**
+     * 账户ID
+     */
+    @Excel(name = "账户ID", width = 15)
+    @ApiModelProperty(value = "账户ID")
+    private Long accountId;
+    /**
+     * 深度转化类型
+     */
+    @Excel(name = "深度转化类型", width = 15)
+    @ApiModelProperty(value = "深度转化类型")
+    private Integer deepConversionTypes;
+    /**
+     * 深度转化类型描述
+     */
+    @Excel(name = "深度转化类型描述", width = 15)
+    @ApiModelProperty(value = "深度转化类型描述")
+    private String desc;
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+}

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

@@ -0,0 +1,106 @@
+package org.jeecg.modules.kuaishou.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @Description: 快手-创建创意信息
+ * @Author: jeecg-boot
+ * @Date: 2019-07-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("ctop_kuaishou_creative_create")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_kuaishou_creative_create对象", description = "快手-创建创意信息")
+public class KuaiShouCreativeCreate {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.UUID)
+    @ApiModelProperty(value = "id")
+    private Long id;
+    /**
+     * 账户ID
+     */
+    @Excel(name = "账户ID", width = 15)
+    @ApiModelProperty(value = "账户ID")
+    private Long accountId;
+    /**
+     * 广告组ID
+     */
+    @Excel(name = "广告组ID", width = 15)
+    @ApiModelProperty(value = "广告组ID")
+    private Long unitId;
+    /**
+     * 广告创意名称
+     */
+    @Excel(name = "广告创意名称", width = 15)
+    @ApiModelProperty(value = "广告创意名称")
+    private String creativeName;
+    /**
+     * 视频作品ID
+     */
+    @Excel(name = "视频作品ID", width = 15)
+    @ApiModelProperty(value = "视频作品ID")
+    private String photoId;
+    /**
+     * 封面图片token
+     */
+    @Excel(name = "封面图片token", width = 15)
+    @ApiModelProperty(value = "封面图片token")
+    private String imageToken;
+    /**
+     * 行动号召按钮文案
+     */
+    @Excel(name = "行动号召按钮文案", width = 15)
+    @ApiModelProperty(value = "行动号召按钮文案")
+    private String actionBarText;
+    /**
+     * 广告语
+     */
+    @Excel(name = "广告语", width = 15)
+    @ApiModelProperty(value = "广告语")
+    private String description;
+    /**
+     * 点击测试链接
+     */
+    @Excel(name = "点击测试链接", width = 15)
+    @ApiModelProperty(value = "点击测试链接")
+    private String clickTrackUrl;
+    /**
+     * 广告创意ID
+     */
+    @Excel(name = "广告创意ID", width = 15)
+    @ApiModelProperty(value = "广告创意ID")
+    private Long creativeId;
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+}

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.kuaishou.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.kuaishou.entity.KuaiShouConversionInfos;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 快手-可选深度转化类型
+ * @Author: jeecg-boot
+ * @Date:   2019-07-24
+ * @Version: V1.0
+ */
+public interface KuaiShouConversionInfosMapper extends BaseMapper<KuaiShouConversionInfos> {
+
+}

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

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

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.kuaishou.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.kuaishou.entity.KuaiShouCreativeCreate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 快手-创建创意信息
+ * @Author: jeecg-boot
+ * @Date:   2019-07-24
+ * @Version: V1.0
+ */
+public interface KuaiShouCreativeCreateMapper extends BaseMapper<KuaiShouCreativeCreate> {
+
+}

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

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

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

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

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

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

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

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

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

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

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

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

+ 27 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/IKuaishouInterfaceService.java

@@ -41,11 +41,11 @@ public interface IKuaishouInterfaceService {
      * 创建广告组
      *
      * @param accessToken
-     * @param advertiser_id
+     * @param advertiserId
      * @param requestJson
      * @return
      */
-    Map<String, Object> adUnitCreate(String accessToken, Long advertiser_id, JSONObject requestJson);
+    Map<String, Object> adUnitCreate(String accessToken, Long advertiserId, JSONObject requestJson);
 
 
     /**
@@ -75,10 +75,35 @@ public interface IKuaishouInterfaceService {
 
     /**
      * 获取token
+     *
      * @param authCode
      * @return
      */
     KuaishouResultToken getAccessToken(String authCode);
 
+    /**
+     * 刷新token
+     *
+     * @param refreshToken
+     * @return
+     */
     KuaishouResultToken getRefreshToken(String refreshToken);
+
+
+    /**
+     * 获取可选的深度转化类型
+     *
+     * @param advertiserId
+     */
+    void getDeepConversionInfos(Long advertiserId, String accessToken);
+
+
+    /**
+     * 创建广告创意
+     *
+     * @param accessToken
+     * @param advertiserId
+     * @param requestJson
+     */
+    Map<String, Object> creativeCreate(String accessToken, Long advertiserId, JSONObject requestJson);
 }

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

@@ -0,0 +1,18 @@
+package org.jeecg.modules.kuaishou.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.kuaishou.entity.KuaiShouConversionInfos;
+import org.jeecg.modules.kuaishou.mapper.KuaiShouConversionInfosMapper;
+import org.jeecg.modules.kuaishou.service.IKuaiShouConversionInfosService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 快手-可选深度转化类型
+ * @Author: jeecg-boot
+ * @Date: 2019-07-24
+ * @Version: V1.0
+ */
+@Service
+public class KuaiShouConversionInfosServiceImpl extends ServiceImpl<KuaiShouConversionInfosMapper, KuaiShouConversionInfos> implements IKuaiShouConversionInfosService {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.kuaishou.service.impl;
+
+import org.jeecg.modules.kuaishou.entity.KuaiShouConversionTypes;
+import org.jeecg.modules.kuaishou.mapper.KuaiShouConversionTypesMapper;
+import org.jeecg.modules.kuaishou.service.IKuaiShouConversionTypesService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 快手-可选深度转化类型-详情
+ * @Author: jeecg-boot
+ * @Date:   2019-07-24
+ * @Version: V1.0
+ */
+@Service
+public class KuaiShouConversionTypesServiceImpl extends ServiceImpl<KuaiShouConversionTypesMapper, KuaiShouConversionTypes> implements IKuaiShouConversionTypesService {
+
+}

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

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

+ 145 - 11
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaishouInterfaceServiceImpl.java

@@ -16,13 +16,6 @@ import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import constant.KuaishouInterfaceConstant;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
 import org.jeecg.modules.kuaishou.entity.*;
 import org.jeecg.modules.kuaishou.mapper.*;
 import org.jeecg.modules.kuaishou.service.IKuaishouInterfaceService;
@@ -669,16 +662,157 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
         KuaishouResultToken kuaishouResult = null;
         try {
             String result = HttpUtils.httpPostRequest(url, param, headers);
-            ObjectMapper mapper = new ObjectMapper();
-            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-            kuaishouResult = mapper.readValue(result, new TypeReference<KuaishouResultToken>() {
-            });
+            System.err.println(result);
+            JSONObject tokenJson = new JSONObject();
+            if (!Check.isNullMap(tokenJson)) {
+
+
+            } else {
+                logger.error("重新获取token返回结果为空");
+            }
+
+
         } catch (Exception e) {
             e.printStackTrace();
         }
         return kuaishouResult;
     }
 
+
+    /**
+     * 获取可选的深度转化类型
+     *
+     * @param advertiserId
+     */
+    @Autowired
+    private KuaiShouConversionInfosMapper conversionInfosMapper;
+
+    @Autowired
+    private KuaiShouConversionTypesMapper conversionTypesMapper;
+
+    @Override
+    public void getDeepConversionInfos(Long advertiserId, String accessToken) {
+        String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.DEEP_CONVERSION_INFOS;
+        JSONObject param = new JSONObject();
+        param.put("advertiser_id", advertiserId);
+        Map<String, String> headers = new HashMap<String, String>();
+        headers.put("Access-Token", accessToken);
+        try {
+            String result = HttpUtils.kuaiShouhttpPostRequest(url, param.toJSONString(), headers);
+            JSONObject resultJson = JSONObject.parseObject(result);
+            if (!Check.isNullMap(resultJson)) {
+                Integer code = resultJson.getInteger("code");
+                if (code == 0) {
+                    Map<String, Object> deleteMap = new HashMap<>();
+                    deleteMap.put("account_id", advertiserId);
+                    conversionInfosMapper.deleteByMap(deleteMap);
+                    conversionTypesMapper.deleteByMap(deleteMap); //删除历史数据
+                    JSONObject dataJson = resultJson.getJSONObject("data");
+                    if (!Check.isNullMap(dataJson)) {
+                        KuaiShouConversionInfos conversionInfos = new KuaiShouConversionInfos();
+                        conversionInfos.setAccountId(advertiserId);
+                        conversionInfos.setIsActivate(dataJson.getInteger("is_activate"));
+                        conversionInfos.setIsFormSubmit(dataJson.getInteger("is_form_submit"));
+                        conversionInfosMapper.insert(conversionInfos);
+                        JSONArray ConversionTypeArr = dataJson.getJSONArray("deep_conversion_types");
+                        if (!Check.isNull(ConversionTypeArr)) {
+                            for (int i = 0; i < ConversionTypeArr.size(); i++) {
+                                JSONObject conversionType = JSONObject.parseObject(ConversionTypeArr.get(i).toString());
+                                if (!Check.isNull(conversionType)) {
+                                    KuaiShouConversionTypes conversionTypes = new KuaiShouConversionTypes();
+                                    conversionTypes.setAccountId(advertiserId);
+                                    conversionTypes.setDeepConversionTypes(conversionType.getInteger("deep_conversion_type"));
+                                    conversionTypes.setDesc(conversionType.getString("desc"));
+                                    conversionTypesMapper.insert(conversionTypes);
+                                }
+                            }
+                        }
+                    }
+
+                } else {
+                    logger.error("获取可选的深度转化类型返回异常,advertiserId:{},异常信息:{}", advertiserId, resultJson);
+
+                }
+
+            } else {
+                logger.error("快手,获取可选的深度转化类型返回为空,advertiserId:{}", advertiserId);
+            }
+
+        } catch (
+                Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     * 创建广告创意
+     *
+     * @param accessToken
+     * @param advertiserId
+     * @param requestJson
+     */
+    @Autowired
+    private KuaiShouCreativeCreateMapper creativeCreateMapper;
+
+    @Override
+    public Map<String, Object> creativeCreate(String accessToken, Long advertiserId, JSONObject requestJson) {
+        Map<String, Object> returnMap = new HashMap<>();
+        try {
+            String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.CAMPAIGN_CREATE;
+            requestJson.put("advertiser_id", advertiserId);
+            Map<String, String> header = new HashMap<String, String>();
+            header.put("Access-Token", accessToken);
+
+            String result = HttpUtils.kuaiShouhttpPostRequest(url, requestJson.toJSONString(), header);
+            JSONObject resultJson = JSONObject.parseObject(result);
+            if (!Check.isNull(resultJson)) {
+                Integer code = resultJson.getInteger("code");
+                if (code == 0) {
+                    JSONObject dataJson = resultJson.getJSONObject("data");
+                    if (!Check.isNull(dataJson)) {
+                        KuaiShouCreativeCreate creativeCreate = new KuaiShouCreativeCreate();
+                        creativeCreate.setCreativeId(dataJson.getLong("creative_id"));
+                        creativeCreate.setAccountId(advertiserId);
+                        creativeCreate.setUnitId(requestJson.getLong("unit_id"));
+                        creativeCreate.setCreativeName(requestJson.getString("creative_name"));
+                        creativeCreate.setPhotoId(requestJson.getString("photo_id"));
+                        creativeCreate.setImageToken(requestJson.getString("image_token"));
+                        creativeCreate.setActionBarText(requestJson.getString("action_bar_text"));
+                        creativeCreate.setDescription(requestJson.getString("description"));
+                        creativeCreate.setClickTrackUrl(requestJson.getString("click_track_url"));
+                        int i = creativeCreateMapper.insert(creativeCreate);
+                        if (i > 0) {
+                            logger.info("创建广告创意入库完成,advertiser_id:{}", advertiserId);
+                        }
+                        returnMap.put("code", 0);
+                        returnMap.put("message", "success");
+                    }
+                } else {
+                    logger.error("创建广告创意失败,advertiser_id:{},返回信息:{}", advertiserId, resultJson);
+                    returnMap.put("code", -1);
+                    returnMap.put("message", "error");
+                    returnMap.put("desc", resultJson.getString("message"));
+                }
+            } else {
+                logger.error("快手创建广告创意返回内容为空,advertiser_id:{}", advertiserId);
+                returnMap.put("code", -1);
+                returnMap.put("message", "error");
+                returnMap.put("desc", "result is null");
+            }
+
+        } catch (Exception e) {
+            logger.error("创建广告创意失败,advertiser_id:{}", advertiserId);
+            returnMap.put("code", -1);
+            returnMap.put("message", "error");
+            returnMap.put("desc", "Interface exception");
+            e.printStackTrace();
+        }
+        return returnMap;
+
+    }
+
+
     public Object jsonToObj(Object t, String jsonStr) throws
             JsonParseException, JsonMappingException, IOException {
         ObjectMapper mapper = new ObjectMapper();

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

@@ -0,0 +1,168 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="账户ID">
+              <a-input placeholder="请输入账户ID" v-model="queryParam.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>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('快手-可选深度转化类型')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <kuaiShouConversionInfos-modal ref="modalForm" @ok="modalFormOk"></kuaiShouConversionInfos-modal>
+  </a-card>
+</template>
+
+<script>
+  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;
+            }
+           },
+		   {
+            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: {
+     
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

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

@@ -0,0 +1,168 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="账户ID">
+              <a-input placeholder="请输入账户ID" v-model="queryParam.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>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('快手-可选深度转化类型-详情')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <kuaiShouConversionTypes-modal ref="modalForm" @ok="modalFormOk"></kuaiShouConversionTypes-modal>
+  </a-card>
+</template>
+
+<script>
+  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;
+            }
+           },
+		   {
+            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: {
+     
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

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

@@ -0,0 +1,208 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="账户ID">
+              <a-input placeholder="请输入账户ID" v-model="queryParam.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>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('快手-创建创意信息')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <kuaiShouCreativeCreate-modal ref="modalForm" @ok="modalFormOk"></kuaiShouCreativeCreate-modal>
+  </a-card>
+</template>
+
+<script>
+  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;
+            }
+           },
+		   {
+            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: {
+     
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

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

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

+ 143 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/modules/KuaiShouConversionInfosModal__Style#Drawer.vue

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

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

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

+ 143 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/modules/KuaiShouConversionTypesModal__Style#Drawer.vue

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

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

@@ -0,0 +1,172 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="账户ID">
+          <a-input placeholder="请输入账户ID" v-decorator="['accountId', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="广告组ID">
+          <a-input placeholder="请输入广告组ID" v-decorator="['unitId', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="广告创意名称">
+          <a-input placeholder="请输入广告创意名称" v-decorator="['creativeName', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="视频作品ID">
+          <a-input placeholder="请输入视频作品ID" v-decorator="['photoId', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="封面图片token">
+          <a-input placeholder="请输入封面图片token" v-decorator="['imageToken', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="行动号召按钮文案">
+          <a-input placeholder="请输入行动号召按钮文案" v-decorator="['actionBarText', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="广告语">
+          <a-input placeholder="请输入广告语" v-decorator="['description', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="点击测试链接">
+          <a-input placeholder="请输入点击测试链接" v-decorator="['clickTrackUrl', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="广告创意ID">
+          <a-input placeholder="请输入广告创意ID" v-decorator="['creativeId', {}]" />
+        </a-form-item>
+		
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "KuaiShouCreativeCreateModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        },
+        url: {
+          add: "/kuaishou/kuaiShouCreativeCreate/add",
+          edit: "/kuaishou/kuaiShouCreativeCreate/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'accountId','unitId','creativeName','photoId','imageToken','actionBarText','description','clickTrackUrl','creativeId'))
+		  //时间格式化
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+
+</style>

+ 179 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/vue/modules/KuaiShouCreativeCreateModal__Style#Drawer.vue

@@ -0,0 +1,179 @@
+<template>
+  <a-drawer
+      :title="title"
+      :width="800"
+      placement="right"
+      :closable="false"
+      @close="close"
+      :visible="visible"
+  >
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="账户ID">
+          <a-input placeholder="请输入账户ID" v-decorator="['accountId', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="广告组ID">
+          <a-input placeholder="请输入广告组ID" v-decorator="['unitId', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="广告创意名称">
+          <a-input placeholder="请输入广告创意名称" v-decorator="['creativeName', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="视频作品ID">
+          <a-input placeholder="请输入视频作品ID" v-decorator="['photoId', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="封面图片token">
+          <a-input placeholder="请输入封面图片token" v-decorator="['imageToken', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="行动号召按钮文案">
+          <a-input placeholder="请输入行动号召按钮文案" v-decorator="['actionBarText', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="广告语">
+          <a-input placeholder="请输入广告语" v-decorator="['description', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="点击测试链接">
+          <a-input placeholder="请输入点击测试链接" v-decorator="['clickTrackUrl', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="广告创意ID">
+          <a-input placeholder="请输入广告创意ID" v-decorator="['creativeId', {}]" />
+        </a-form-item>
+		
+      </a-form>
+    </a-spin>
+    <a-button type="primary" @click="handleOk">确定</a-button>
+    <a-button type="primary" @click="handleCancel">取消</a-button>
+  </a-drawer>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "KuaiShouCreativeCreateModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        },
+        url: {
+          add: "/kuaishou/kuaiShouCreativeCreate/add",
+          edit: "/kuaishou/kuaiShouCreativeCreate/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'accountId','unitId','creativeName','photoId','imageToken','actionBarText','description','clickTrackUrl','creativeId'))
+		  //时间格式化
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+</style>

+ 39 - 1
module-common/src/main/java/cn/com/ctop/common/utils/HttpUtils.java

@@ -175,7 +175,6 @@ public class HttpUtils {
             }
             httppost.setHeader("User-Agent", USER_AGENT);
             httppost.addHeader("Content-Type", "application/json");
-            headers.put("Content-Type", "application/json");
             httppost.setEntity(new StringEntity(body, Charset.forName("UTF-8")));
             HttpEntity respentity;
             HttpResponse response = httpClient.execute(httppost);
@@ -522,4 +521,43 @@ public class HttpUtils {
         }
         return strReturn;
     }
+
+
+    public static String httpGet(String url, Map<String, Object> paramsMap, Map<String, String> headers) {
+        String result = null;
+        try {
+            // CloseableHttpClient httpClient = HttpClients.createDefault();
+            //创建参数列表
+            HttpClient httpclient = getHttpclient();
+            StringBuilder postBody = new StringBuilder();
+            for (Map.Entry<String, Object> entry : paramsMap.entrySet()) {
+                if (entry.getValue() == null) {
+                    continue;
+                }
+                postBody.append(entry.getKey()).append("=").append(URLEncoder.encode(entry.getValue().toString(),
+                        "utf-8")).append("&");
+            }
+            if (!paramsMap.isEmpty()) {
+                postBody.deleteCharAt(postBody.length() - 1);
+            }
+            HttpGet httpget = new HttpGet(url + "?" + postBody);
+            httpget.setHeader("Content-Type", "application/json");
+            httpget.setHeader("User-Agent", USER_AGENT);
+            if (!Check.isNullMap(headers)) {
+                for (String key : headers.keySet()) {
+                    httpget.setHeader(key, headers.get(key));
+                }
+            }
+            HttpEntity respEntity;
+            System.err.println(httpget);
+            HttpResponse response = httpclient.execute(httpget);
+            respEntity = response.getEntity();
+            result = EntityUtils.toString(respEntity);
+        } catch (Exception e) {
+            logger.error("http get请求异常");
+            e.printStackTrace();
+        }
+        return result;
+    }
+
 }

+ 1 - 0
module-kuaishou/src/main/java/constant/KuaishouInterfaceConstant.java

@@ -14,6 +14,7 @@ public class KuaishouInterfaceConstant {
     public static final String CAMPAIGN_CREATE = "/rest/openapi/v1/campaign/create"; //创建广告计划
     public static final String AD_UNIT_CREATE = "/rest/openapi/v1/ad_unit/create"; //创建广告组
     public static final String APP_LIST = "/rest/openapi/v1/file/ad/app/list"; //创建广告获取应用列表
+    public static final String DEEP_CONVERSION_INFOS = "/rest/openapi/v1/ad_unit/ocpc/conversion_infos"; //获取可选的深度转化类型
 
 
 }