Procházet zdrojové kódy

Merge remote-tracking branch 'origin/master'

syh před 5 roky
rodič
revize
5c17ffef33

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

@@ -1,16 +1,22 @@
 package org.jeecg.modules.ctop.job;
 
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.chrome.ChromeDriverService;
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.firefox.FirefoxOptions;
+import org.openqa.selenium.firefox.GeckoDriverService;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 
+import java.io.File;
+import java.util.concurrent.TimeUnit;
+
 public class TestJob implements Job {
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         System.setProperty("webdriver.gecko.driver", "/usr/lib/geckodriver");
+        GeckoDriverService service = new GeckoDriverService.Builder().usingDriverExecutable(new File("/usr/lib/geckodriver")).usingAnyFreePort().build();
         FirefoxOptions options = new FirefoxOptions();
         options.addArguments("--headless");
         options.addArguments("--incognito");
@@ -18,8 +24,19 @@ public class TestJob implements Job {
         options.addArguments("--disable-gpu");
         options.addArguments("--window-size=1290,1080");
         WebDriver driver = new FirefoxDriver(options);
-        driver.get("http://www.baidu.com");
-        System.out.println(driver.getPageSource());
-        driver.quit();
+        try {
+            service.start();
+            driver.manage().timeouts().pageLoadTimeout(5, TimeUnit.SECONDS);
+            driver.manage().timeouts().setScriptTimeout(5, TimeUnit.SECONDS);
+            driver.get("http://b.e.kuaishou.com");
+            System.out.println(driver.getPageSource());
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            driver.quit();
+            service.stop();
+        }
+
+
     }
 }

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

@@ -66,7 +66,8 @@ public class KuaiShouConversionTypesController {
         }
         Map<String, Object> resultMap = kuaishouInterfaceService.getDeepConversionInfos(accountId, token.getAccessToken());
         if ((Integer) resultMap.get("code") == 0) {
-            result.setResult(resultMap.get("isActivate"));
+            result.setResult(resultMap);
+            System.err.println(result);
         }
         result.setSuccess(true);
 

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

@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.com.ctop.common.utils.Check;
+import com.alibaba.fastjson.JSONArray;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -18,7 +19,7 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.kuaishou.entity.KuaiShouImage;
 import org.jeecg.modules.kuaishou.service.IKuaiShouImageService;
-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;
@@ -39,215 +40,234 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
+/**
  * @Description: 快手-本地图片保存
  * @Author: jeecg-boot
- * @Date:   2019-08-14
+ * @Date: 2019-08-14
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="快手-本地图片保存")
+@Api(tags = "快手-本地图片保存")
 @RestController
 @RequestMapping("/kuaishou/kuaiShouImage")
 public class KuaiShouImageController {
-	@Autowired
-	private IKuaiShouImageService kuaiShouImageService;
-	
-	/**
-	  * 分页列表查询
-	 * @param kuaiShouImage
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "快手-本地图片保存-分页列表查询")
-	@ApiOperation(value="快手-本地图片保存-分页列表查询", notes="快手-本地图片保存-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<KuaiShouImage>> queryPageList(KuaiShouImage kuaiShouImage,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<KuaiShouImage>> result = new Result<IPage<KuaiShouImage>>();
-
-		QueryWrapper<KuaiShouImage> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImage, req.getParameterMap());
-		LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		if(!Check.isNull(user)){
-			queryWrapper.eq("login_id", user.getId());
-		}
-		Page<KuaiShouImage> page = new Page<KuaiShouImage>(pageNo, pageSize);
-		IPage<KuaiShouImage> pageList = kuaiShouImageService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param kuaiShouImage
-	 * @return
-	 */
-	@AutoLog(value = "快手-本地图片保存-添加")
-	@ApiOperation(value="快手-本地图片保存-添加", notes="快手-本地图片保存-添加")
-	@PostMapping(value = "/add")
-	public Result<KuaiShouImage> add(@RequestBody KuaiShouImage kuaiShouImage) {
-		Result<KuaiShouImage> result = new Result<KuaiShouImage>();
-		try {
-			kuaiShouImageService.save(kuaiShouImage);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param kuaiShouImage
-	 * @return
-	 */
-	@AutoLog(value = "快手-本地图片保存-编辑")
-	@ApiOperation(value="快手-本地图片保存-编辑", notes="快手-本地图片保存-编辑")
-	@PutMapping(value = "/edit")
-	public Result<KuaiShouImage> edit(@RequestBody KuaiShouImage kuaiShouImage) {
-		Result<KuaiShouImage> result = new Result<KuaiShouImage>();
-		KuaiShouImage kuaiShouImageEntity = kuaiShouImageService.getById(kuaiShouImage.getId());
-		if(kuaiShouImageEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = kuaiShouImageService.updateById(kuaiShouImage);
-			//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 {
-			kuaiShouImageService.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<KuaiShouImage> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<KuaiShouImage> result = new Result<KuaiShouImage>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.kuaiShouImageService.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<KuaiShouImage> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<KuaiShouImage> result = new Result<KuaiShouImage>();
-		KuaiShouImage kuaiShouImage = kuaiShouImageService.getById(id);
-		if(kuaiShouImage==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(kuaiShouImage);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<KuaiShouImage> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              KuaiShouImage kuaiShouImage = JSON.parseObject(deString, KuaiShouImage.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImage, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<KuaiShouImage> pageList = kuaiShouImageService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "快手-本地图片保存列表");
-      mv.addObject(NormalExcelConstants.CLASS, KuaiShouImage.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<KuaiShouImage> listKuaiShouImages = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouImage.class, params);
-              kuaiShouImageService.saveBatch(listKuaiShouImages);
-              return Result.ok("文件导入成功!数据行数:" + listKuaiShouImages.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
+    @Autowired
+    private IKuaiShouImageService kuaiShouImageService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param kuaiShouImage
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "快手-本地图片保存-分页列表查询")
+    @ApiOperation(value = "快手-本地图片保存-分页列表查询", notes = "快手-本地图片保存-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<KuaiShouImage>> queryPageList(KuaiShouImage kuaiShouImage,
+                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                      HttpServletRequest req) {
+        Result<IPage<KuaiShouImage>> result = new Result<IPage<KuaiShouImage>>();
+
+        QueryWrapper<KuaiShouImage> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImage, req.getParameterMap());
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (!Check.isNull(user)) {
+            queryWrapper.eq("login_id", user.getId());
+        }
+        Page<KuaiShouImage> page = new Page<KuaiShouImage>(pageNo, pageSize);
+        IPage<KuaiShouImage> pageList = kuaiShouImageService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+
+    @GetMapping(value = "/image/list")
+    public JSONArray imageList(KuaiShouImage kuaiShouImage, HttpServletRequest req) {
+        QueryWrapper<KuaiShouImage> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImage, req.getParameterMap());
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (!Check.isNull(user)) {
+            queryWrapper.eq("login_id", user.getId());
+        }
+        JSONArray jsonArr = kuaiShouImageService.selectImageList(queryWrapper);
+        return jsonArr;
+    }
+
+
+    /**
+     * 添加
+     *
+     * @param kuaiShouImage
+     * @return
+     */
+    @AutoLog(value = "快手-本地图片保存-添加")
+    @ApiOperation(value = "快手-本地图片保存-添加", notes = "快手-本地图片保存-添加")
+    @PostMapping(value = "/add")
+    public Result<KuaiShouImage> add(@RequestBody KuaiShouImage kuaiShouImage) {
+        Result<KuaiShouImage> result = new Result<KuaiShouImage>();
+        try {
+            kuaiShouImageService.save(kuaiShouImage);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param kuaiShouImage
+     * @return
+     */
+    @AutoLog(value = "快手-本地图片保存-编辑")
+    @ApiOperation(value = "快手-本地图片保存-编辑", notes = "快手-本地图片保存-编辑")
+    @PutMapping(value = "/edit")
+    public Result<KuaiShouImage> edit(@RequestBody KuaiShouImage kuaiShouImage) {
+        Result<KuaiShouImage> result = new Result<KuaiShouImage>();
+        KuaiShouImage kuaiShouImageEntity = kuaiShouImageService.getById(kuaiShouImage.getId());
+        if (kuaiShouImageEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = kuaiShouImageService.updateById(kuaiShouImage);
+            //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 {
+            kuaiShouImageService.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<KuaiShouImage> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouImage> result = new Result<KuaiShouImage>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.kuaiShouImageService.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<KuaiShouImage> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouImage> result = new Result<KuaiShouImage>();
+        KuaiShouImage kuaiShouImage = kuaiShouImageService.getById(id);
+        if (kuaiShouImage == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouImage);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouImage> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouImage kuaiShouImage = JSON.parseObject(deString, KuaiShouImage.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImage, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouImage> pageList = kuaiShouImageService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-本地图片保存列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouImage.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<KuaiShouImage> listKuaiShouImages = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouImage.class, params);
+                kuaiShouImageService.saveBatch(listKuaiShouImages);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouImages.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
 
 }

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

@@ -1,6 +1,8 @@
 package org.jeecg.modules.kuaishou.service;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.jeecg.modules.kuaishou.entity.KuaiShouImage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -16,4 +18,6 @@ public interface IKuaiShouImageService extends IService<KuaiShouImage> {
 
 
     String localInsert(String url, JSONObject requestJson);
+
+    JSONArray selectImageList(QueryWrapper<KuaiShouImage> queryWrapper);
 }

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

@@ -293,7 +293,6 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 return returnMap;
             }
             createJson.put("photo_id", videoMap.get("photoId"));
-          //  Thread.sleep(90 * 1000);
             if (!Check.isNull(requestJson.getString("actionBarText"))) {
                 createJson.put("action_bar_text", requestJson.getString("actionBarText"));
             }
@@ -306,7 +305,9 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 return returnMap;
             }
             createJson.put("description", requestJson.getString("description"));
-
+            if (!Check.isNull(requestJson.getString("clickTrackUrl"))) {
+                createJson.put("click_track_url", requestJson.getString("clickTrackUrl"));
+            }
             JSONArray imageUrlArr = requestJson.getJSONArray("imageUrl");
             if (Check.isNull(imageUrlArr)) {
                 logger.error("请选择封面图,accountId:{}", accountId);

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.kuaishou.service.impl;
 import cn.com.ctop.common.utils.Check;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import constant.KuaishouInterfaceConstant;
 import org.jeecg.common.util.encryption.AesEncryptUtil;
 import org.jeecg.modules.kuaishou.entity.KuaiShouImage;
@@ -14,6 +15,8 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: 快手-本地图片保存
  * @Author: jeecg-boot
@@ -76,4 +79,26 @@ public class KuaiShouImageServiceImpl extends ServiceImpl<KuaiShouImageMapper, K
 
         return imageUrl;
     }
+
+    @Override
+    public JSONArray selectImageList(QueryWrapper<KuaiShouImage> queryWrapper) {
+        List<KuaiShouImage> kuaiShouImages = imageMapper.selectList(queryWrapper);
+        JSONArray jsonArray = new JSONArray();
+        if (!Check.isNull(kuaiShouImages)) {
+            for (KuaiShouImage image : kuaiShouImages) {
+                if (!Check.isNull(image)) {
+                    JSONObject json = new JSONObject();
+                    json.put("id", image.getId());
+                    json.put("src", image.getLocalUrl());
+                    json.put("msrc", image.getLocalUrl());
+                    json.put("w", 600);
+                    json.put("h", 400);
+                    json.put("name", image.getImageName());
+                    jsonArray.add(json);
+                }
+            }
+        }
+
+        return jsonArray;
+    }
 }

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

@@ -1,12 +1,13 @@
 package org.jeecg.modules.kuaishou.service.impl;
 
-import cn.com.ctop.common.utils.*;
+import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.common.utils.HttpUtils;
+import cn.com.ctop.common.utils.PropertiesUtils;
 import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResult;
 import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResultToken;
 import cn.com.ctop.kuaishou.modules.report.entity.*;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAccountMapper;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyCampaignMapper;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -780,7 +781,8 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             logger.info(resultJson.toJSONString());
             if (!Check.isNullMap(resultJson)) {
                 Integer code = resultJson.getInteger("code");
-                boolean isActivate = false;
+                Integer is_activate = null;
+                Integer is_form_submit = null;
                 if (code == 0) {
                     Map<String, Object> deleteMap = new HashMap<>();
                     deleteMap.put("account_id", advertiserId);
@@ -790,12 +792,12 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                     if (!Check.isNullMap(dataJson)) {
                         KuaiShouConversionInfos conversionInfos = new KuaiShouConversionInfos();
                         conversionInfos.setAccountId(advertiserId);
-                        Integer is_activate = dataJson.getInteger("is_activate");
-                        if (is_activate == 1) {
-                            isActivate = true;
-                        }
+                        is_activate = dataJson.getInteger("is_activate");
+                        is_form_submit = dataJson.getInteger("is_form_submit");
+
+
                         conversionInfos.setIsActivate(is_activate);
-                        conversionInfos.setIsFormSubmit(dataJson.getInteger("is_form_submit"));
+                        conversionInfos.setIsFormSubmit(is_form_submit);
                         conversionInfosMapper.insert(conversionInfos);
                         JSONArray ConversionTypeArr = dataJson.getJSONArray("deep_conversion_types");
                         if (!Check.isNull(ConversionTypeArr)) {
@@ -814,7 +816,8 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
 
                     resultMap.put("code", 0);
                     resultMap.put("success", true);
-                    resultMap.put("isActivate", isActivate);
+                    resultMap.put("isActivate", is_activate);
+                    resultMap.put("isFormSubmit", is_form_submit);
 
                 } else {
                     logger.error("获取可选的深度转化类型返回异常,advertiserId:{},异常信息:{}", advertiserId, resultJson);
@@ -1020,7 +1023,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             ArrayList<String> strArray = new ArrayList<String>();
             strArray.add(photoId);
             param.put("photo_ids", strArray);
-            Map<String, String> headers = new HashMap<String, String>();
+            Map<String, String> headers = new HashMap<>();
             headers.put("Access-Token", accessToken);
             headers.put("Content-Type", " application/json");
             String result = HttpUtils.kuaiShouhttpPostRequest(url, param.toJSONString(), headers);
@@ -1042,14 +1045,10 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                                 videoGet.setCoverUrl(dataJson.getString("cover_url"));
                                 videoGetMapper.insert(videoGet);
                             }
-
                         }
-
                     }
-
                 } else {
                     logger.error("获取广告视频失败,advertiser_id:{},返回信息:{}", advertiserId, resultJson);
-
                 }
 
             } else {
@@ -1080,12 +1079,10 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             JSONObject param = new JSONObject();
             param.put("advertiser_id", advertiserId);
             param.put("image_token", image_token);
-
             Map<String, String> headers = new HashMap<String, String>();
             headers.put("Access-Token", accessToken);
             headers.put("Content-Type", " application/json");
             String result = HttpUtils.kuaiShouhttpPostRequest(url, param.toJSONString(), headers);
-            System.err.println(result);
             JSONObject resultJson = JSONObject.parseObject(result);
             if (!Check.isNull(resultJson)) {
                 Integer code = resultJson.getInteger("code");
@@ -1371,16 +1368,26 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
     public Map<String, Object> urlAppCreate(Long accountId, String accessToken, JSONObject apkJson) {
         Map<String, Object> returnMap = new HashMap<>();
         try {
+            String appUrl = apkJson.getString("url");
+            String appVersion = apkJson.getString("app_version");
+            String appName = apkJson.getString("app_name");
+            QueryWrapper<KuaiShouAppCreate> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("account_id", accountId).eq("url", appUrl).eq("app_version", appVersion).eq("app_name", appName).orderByDesc("create_time");
+            queryWrapper.last("limit 1");
+            KuaiShouAppCreate kuaiShouAppCreate = appCreateMapper.selectOne(queryWrapper);
+            if (!Check.isNull(kuaiShouAppCreate)) {
+                returnMap.put("code", 0);
+                returnMap.put("message", "文件已上传");
+                returnMap.put("success", true);
+                returnMap.put("appId", kuaiShouAppCreate.getAppId());
+                return returnMap;
+            }
             String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.APP_CREATE;
             Map<String, String> headers = new HashMap<String, String>();
             headers.put("Access-Token", accessToken);
             headers.put("Content-Type", "multipart/form-data");
             apkJson.put("advertiser_id", accountId + "");
             String result = exceptInfoForRestTemplate(url, apkJson, headers, null);
-            System.err.println(apkJson);
-            System.err.println(url);
-            System.err.println(JSON.toJSONString(headers));
-
             JSONObject resultJson = JSONObject.parseObject(result);
             if (!Check.isNull(result)) {
                 Integer code = resultJson.getInteger("code");
@@ -1395,7 +1402,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                         appCreate.setReturnUrl(dataJson.getString("url"));
                         appCreate.setAppId(dataJson.getLong("app_id"));
                         appCreate.setAppVersion(apkJson.getString("app_version"));
-
                         appCreate.setImageToken(apkJson.getString("image_token"));
                         appCreate.setAppName(apkJson.getString("app_name"));
                         int i = appCreateMapper.insert(appCreate);