Jelajahi Sumber

修改爬虫任务

syh 5 tahun lalu
induk
melakukan
01b835e84f
15 mengubah file dengan 68 tambahan dan 166 penghapusan
  1. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java
  2. 4 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CrawlerController.java
  3. 3 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/ICrawlerService.java
  4. 14 8
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CrawlerServiceImpl.java
  5. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vo/KuaishouAppiumJobVO.java
  6. 1 1
      jeecg-boot-module-system/src/main/resources/logback-test.xml
  7. 14 103
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/controller/AppiumTaskLogController.java
  8. 1 1
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/entity/AppiumTaskItem.java
  9. 5 3
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/entity/AppiumTaskLog.java
  10. 1 1
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/service/IAppiumTaskItemService.java
  11. 1 1
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/service/IAppiumTaskService.java
  12. 1 1
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/service/impl/AppiumDeviceServiceImpl.java
  13. 3 38
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/service/impl/AppiumJobServiceImpl.java
  14. 1 1
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/service/impl/AppiumTaskItemServiceImpl.java
  15. 4 4
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/service/impl/AppiumTaskServiceImpl.java

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

@@ -72,8 +72,8 @@ public class ShiroConfig {
 		filterChainDefinitionMap.put("/ctop/bytedanceAreaInfo/**", "anon");
 		filterChainDefinitionMap.put("/ctop/bytedanceInterestCategory/**", "anon");
 		filterChainDefinitionMap.put("/template/creative/words/get", "anon");
+        filterChainDefinitionMap.put("/appium/crawler/startJob", "anon");
 
-        //pdf预览需要文件
         filterChainDefinitionMap.put("/generic/**", "anon");
 		filterChainDefinitionMap.put("/", "anon");
 		filterChainDefinitionMap.put("/doc.html", "anon");

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

@@ -1,8 +1,10 @@
 package org.jeecg.modules.ctop.controller;
 
 import org.jeecg.modules.ctop.service.ICrawlerService;
+import org.jeecg.modules.ctop.vo.KuaishouAppiumJobVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -15,7 +17,7 @@ public class CrawlerController {
     private ICrawlerService crawlerService;
 
     @PostMapping("startJob")
-    public Map<String, Object> runTask(Long jobId, Long num, String creativeName, String accountId, String publishName) {
-        return crawlerService.startJob(jobId, num, creativeName, accountId, publishName);
+    public Map<String, Object> runTask(@RequestBody KuaishouAppiumJobVO jobVO) {
+        return crawlerService.startJob(jobVO);
     }
 }

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

@@ -1,7 +1,9 @@
 package org.jeecg.modules.ctop.service;
 
+import org.jeecg.modules.ctop.vo.KuaishouAppiumJobVO;
+
 import java.util.Map;
 
 public interface ICrawlerService {
-    Map<String, Object> startJob(Long jobId, Long num, String creativeName, String ksid, String publishName);
+    Map<String, Object> startJob(KuaishouAppiumJobVO jobVO);
 }

+ 14 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CrawlerServiceImpl.java

@@ -11,6 +11,7 @@ import cn.com.ctop.crawler.modules.appium.service.IAppiumDeviceService;
 import cn.com.ctop.crawler.modules.appium.service.IAppiumJobService;
 import cn.com.ctop.crawler.modules.appium.service.IAppiumTaskService;
 import org.jeecg.modules.ctop.service.ICrawlerService;
+import org.jeecg.modules.ctop.vo.KuaishouAppiumJobVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,19 +35,20 @@ public class CrawlerServiceImpl implements ICrawlerService {
     private AppiumTaskLogMapper taskLogMapper;
 
     @Override
-    public Map<String, Object> startJob(Long jobId, Long num, String creativeName, String accountId, String publishName) {
+    public Map<String, Object> startJob(KuaishouAppiumJobVO jobVO) {
         Map<String, Object> result = new HashMap<>();
         //TODO 需要考虑多个任务并行的问题
         //1:根据id查询快手账号信息
-        BindAccountLogin accountLogin = bindAccountLoginService.getById(accountId);
+        BindAccountLogin accountLogin = bindAccountLoginService.getById(jobVO.getAccountId());
         if (null == accountLogin) {
             ResultMapUtils.setResultMap(result, StatusCode.COMMON_PARAM_ERROR.getCode());
             return result;
         }
-        if (jobId == null || jobId == 0 || num == null || num == 0 || creativeName == null || "".equals(creativeName) || publishName == null || "".equals(publishName.trim())) {
+        if (jobVO.getJobId() == null || jobVO.getJobId() == 0 || jobVO.getNum() == null || jobVO.getNum() == 0 || jobVO.getCreativeName() == null || "".equals(jobVO.getCreativeName()) || jobVO.getPublishName() == null || "".equals(jobVO.getPublishName().trim())) {
             ResultMapUtils.setResultMap(result, StatusCode.COMMON_PARAM_ERROR.getCode());
             return result;
         }
+        Long num = jobVO.getNum();
         //获取手机设备信息
         AppiumDevice device = deviceService.getEnabled();
         if (null == device || device.getStatus() != 1) {
@@ -64,11 +66,11 @@ public class CrawlerServiceImpl implements ICrawlerService {
                     }
                     deviceService.updateById(device);
                     AppiumTaskLog log = new AppiumTaskLog();
-                    log.setDeviceId(2);
+                    log.setDeviceId(device.getId());
                     log.setDeviceIp(device.getIp());
                     log.setDevicePort(device.getPort());
-                    log.setStatus(1);
-                    log.setTaskId(1);
+                    log.setStatus(1 + "");
+                    log.setTaskId(jobVO.getJobId());
                     log.setTaskName("快手刷量任务");
                     taskLogMapper.insert(log);
                     log.setId(log.getId());
@@ -82,18 +84,22 @@ public class CrawlerServiceImpl implements ICrawlerService {
                         Thread.sleep(10000L);
                         String ksId = jobService.loginTask(2L, device);
                         if (null == ksId) {
+                            i++;
                             jobService.updateStatus(device, log, -1, 1);
                             continue;
                         }
-                        boolean isBind = jobService.bindCreative(accountLogin.getAccountName(), accountLogin.getPassword(), creativeName, ksId);
+                        boolean isBind = jobService.bindCreative(accountLogin.getAccountName(), accountLogin.getPassword(), jobVO.getPublishName(), ksId);
                         if (!isBind) {
+                            i++;
                             jobService.updateStatus(device, log, -2, 1);
                             continue;
                         }
-                        taskService.runTask(1, 1, publishName);
+                        taskService.runTask(1L, device.getId(), jobVO.getPublishName());
+                        jobService.updateStatus(device, log, 2, 1);
                         i++;
                     } catch (Exception e) {
                         jobService.updateStatus(device, log, -3, 1);
+                        i++;
                         continue;
                     }
                 }

+ 14 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/vo/KuaishouAppiumJobVO.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.ctop.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class KuaishouAppiumJobVO implements Serializable {
+    private Long jobId;
+    private Long num;
+    private String creativeName;
+    private String accountId;
+    private String publishName;
+}

+ 1 - 1
jeecg-boot-module-system/src/main/resources/logback-test.xml

@@ -8,7 +8,7 @@
     <property name="LOG_PATTERN" value="%date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n"/>
 
     <!-- 定义日志存储的路径,不要配置相对路径 -->
-    <property name="FILE_PATH" value="D:/Desktop/log/spring-log.%d{yyyy-MM-dd}.%i.log"/>
+    <property name="FILE_PATH" value="/data/webapp/log/spring-log.%d{yyyy-MM-dd}.%i.log"/>
 
     <!-- 控制台输出日志 -->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">

+ 14 - 103
module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/controller/AppiumTaskLogController.java

@@ -1,42 +1,21 @@
 package cn.com.ctop.crawler.modules.appium.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 cn.com.ctop.crawler.modules.appium.entity.AppiumTaskLog;
 import cn.com.ctop.crawler.modules.appium.service.IAppiumTaskLogService;
-
-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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 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.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
 /**
  * 任务日志表
@@ -69,9 +48,9 @@ public class AppiumTaskLogController {
                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                       HttpServletRequest req) {
-        Result<IPage<AppiumTaskLog>> result = new Result<IPage<AppiumTaskLog>>();
+        Result<IPage<AppiumTaskLog>> result = new Result<>();
         QueryWrapper<AppiumTaskLog> queryWrapper = QueryGenerator.initQueryWrapper(appiumTaskLog, req.getParameterMap());
-        Page<AppiumTaskLog> page = new Page<AppiumTaskLog>(pageNo, pageSize);
+        Page<AppiumTaskLog> page = new Page<>(pageNo, pageSize);
         IPage<AppiumTaskLog> pageList = appiumTaskLogService.page(page, queryWrapper);
         result.setSuccess(true);
         result.setResult(pageList);
@@ -88,7 +67,7 @@ public class AppiumTaskLogController {
     @ApiOperation(value = "任务日志表-添加", notes = "任务日志表-添加")
     @PostMapping(value = "/add")
     public Result<AppiumTaskLog> add(@RequestBody AppiumTaskLog appiumTaskLog) {
-        Result<AppiumTaskLog> result = new Result<AppiumTaskLog>();
+        Result<AppiumTaskLog> result = new Result<>();
         try {
             appiumTaskLogService.save(appiumTaskLog);
             result.success("添加成功!");
@@ -109,7 +88,7 @@ public class AppiumTaskLogController {
     @ApiOperation(value = "任务日志表-编辑", notes = "任务日志表-编辑")
     @PutMapping(value = "/edit")
     public Result<AppiumTaskLog> edit(@RequestBody AppiumTaskLog appiumTaskLog) {
-        Result<AppiumTaskLog> result = new Result<AppiumTaskLog>();
+        Result<AppiumTaskLog> result = new Result<>();
         AppiumTaskLog appiumTaskLogEntity = appiumTaskLogService.getById(appiumTaskLog.getId());
         if (appiumTaskLogEntity == null) {
             result.error500("未找到对应实体");
@@ -152,7 +131,7 @@ public class AppiumTaskLogController {
     @ApiOperation(value = "任务日志表-批量删除", notes = "任务日志表-批量删除")
     @DeleteMapping(value = "/deleteBatch")
     public Result<AppiumTaskLog> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<AppiumTaskLog> result = new Result<AppiumTaskLog>();
+        Result<AppiumTaskLog> result = new Result<>();
         if (ids == null || "".equals(ids.trim())) {
             result.error500("参数不识别!");
         } else {
@@ -172,7 +151,7 @@ public class AppiumTaskLogController {
     @ApiOperation(value = "任务日志表-通过id查询", notes = "任务日志表-通过id查询")
     @GetMapping(value = "/queryById")
     public Result<AppiumTaskLog> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<AppiumTaskLog> result = new Result<AppiumTaskLog>();
+        Result<AppiumTaskLog> result = new Result<>();
         AppiumTaskLog appiumTaskLog = appiumTaskLogService.getById(id);
         if (appiumTaskLog == null) {
             result.error500("未找到对应实体");
@@ -182,72 +161,4 @@ public class AppiumTaskLogController {
         }
         return result;
     }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<AppiumTaskLog> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                AppiumTaskLog appiumTaskLog = JSON.parseObject(deString, AppiumTaskLog.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(appiumTaskLog, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<AppiumTaskLog> pageList = appiumTaskLogService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "任务日志表列表");
-        mv.addObject(NormalExcelConstants.CLASS, AppiumTaskLog.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<AppiumTaskLog> listAppiumTaskLogs = ExcelImportUtil.importExcel(file.getInputStream(), AppiumTaskLog.class, params);
-                appiumTaskLogService.saveBatch(listAppiumTaskLogs);
-                return Result.ok("文件导入成功!数据行数:" + listAppiumTaskLogs.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("文件导入失败!");
-    }
-
 }

+ 1 - 1
module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/entity/AppiumTaskItem.java

@@ -38,7 +38,7 @@ public class AppiumTaskItem {
 	 */
 	@Excel(name = "任务ID", width = 15)
 	@ApiModelProperty(value = "任务ID")
-	private Integer taskId;
+	private Long taskId;
 	/**
 	 * 父ID
 	 */

+ 5 - 3
module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/entity/AppiumTaskLog.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.util.Date;
@@ -31,13 +32,13 @@ public class AppiumTaskLog {
      */
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private Integer id;
+    private Long id;
     /**
      * 任务ID
      */
     @Excel(name = "任务ID", width = 15)
     @ApiModelProperty(value = "任务ID")
-    private Integer taskId;
+    private Long taskId;
     /**
      * 设备ID
      */
@@ -66,8 +67,9 @@ public class AppiumTaskLog {
      * 状态
      */
     @Excel(name = "状态", width = 15)
+    @Dict(dicCode = "appium_ks_log_status")
     @ApiModelProperty(value = "状态")
-    private Integer status;
+    private String status;
     /**
      * 创建时间
      */

+ 1 - 1
module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/service/IAppiumTaskItemService.java

@@ -19,5 +19,5 @@ public interface IAppiumTaskItemService extends IService<AppiumTaskItem> {
      * @param parentId
      * @return
      */
-    List<AppiumTaskItem> initTaskItemList(Integer taskId, Integer parentId);
+    List<AppiumTaskItem> initTaskItemList(Long taskId, Integer parentId);
 }

+ 1 - 1
module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/service/IAppiumTaskService.java

@@ -16,7 +16,7 @@ public interface IAppiumTaskService extends IService<AppiumTask> {
      * @param taskId
      * @param deviceId
      */
-    public void runTask(Integer taskId, Integer deviceId, String publishName);
+    public void runTask(Long taskId, Integer deviceId, String publishName);
 
     public void runKuaishouLoginTask();
 }

+ 1 - 1
module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/service/impl/AppiumDeviceServiceImpl.java

@@ -20,7 +20,7 @@ public class AppiumDeviceServiceImpl extends ServiceImpl<AppiumDeviceMapper, App
     @Override
     public AppiumDevice getEnabled() {
         QueryWrapper<AppiumDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("status", 1).orderByDesc("id").last("linit 1");
+        queryWrapper.eq("status", 1).orderByDesc("id").last("limit 1");
         return getOne(queryWrapper);
     }
 }

+ 3 - 38
module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/service/impl/AppiumJobServiceImpl.java

@@ -28,7 +28,6 @@ import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Stack;
 
 /**
  * 爬虫调度任务
@@ -161,7 +160,7 @@ public class AppiumJobServiceImpl extends ServiceImpl<AppiumJobMapper, AppiumJob
         String url = "https://lcloud.longene.com.cn/";
         System.getProperties().setProperty("webdriver.chrome.driver", chromeDriver);
         ChromeOptions chromeOptions = new ChromeOptions();
-//        chromeOptions.addArguments("--headless");
+        chromeOptions.addArguments("--headless");
         chromeOptions.addArguments("--incognito");
         chromeOptions.addArguments("--disable-gpu");
 //        chromeOptions.addArguments("--no-sandbox");
@@ -208,43 +207,9 @@ public class AppiumJobServiceImpl extends ServiceImpl<AppiumJobMapper, AppiumJob
 
     @Override
     public void updateStatus(AppiumDevice appiumDevice, AppiumTaskLog log, Integer logStatus, Integer deviceStatus) {
-        log.setStatus(3);
+        log.setStatus(logStatus + "");
         appiumTaskLogMapper.updateById(log);
-        appiumDevice.setStatus(1);
+        appiumDevice.setStatus(deviceStatus);
         appiumDeviceService.updateById(appiumDevice);
     }
-
-    public static boolean isValid(String s) {
-        if (null == s || s.length() <= 0) {
-            return true;
-        }
-        if (s.length() % 2 == 1) {
-            return false;
-        }
-        Stack<Character> stack = new Stack<>();
-        for (int i = 0; i < s.length(); i++) {
-            char getchar = s.charAt(i);
-            if (getchar == '(' || getchar == '{' || getchar == '[') {
-                stack.push(getchar);
-            }
-            if (getchar == ')' || getchar == '}' || getchar == ']') {
-                if (stack.empty()) {
-                    return false;
-                }
-                char sufix = stack.pop();
-                if ((getchar == ')' && sufix != '(') || (getchar == '}' && sufix != '{') || (getchar == ']' && sufix != '[')) {
-                    stack.push(sufix);
-                }
-            }
-        }
-        if (stack.empty()) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public static void main(String[] args) {
-        System.out.println(isValid("[]()[]"));
-    }
 }

+ 1 - 1
module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/service/impl/AppiumTaskItemServiceImpl.java

@@ -18,7 +18,7 @@ import java.util.List;
 @Service
 public class AppiumTaskItemServiceImpl extends ServiceImpl<AppiumTaskItemMapper, AppiumTaskItem> implements IAppiumTaskItemService {
     @Override
-    public List<AppiumTaskItem> initTaskItemList(Integer taskId, Integer parentId) {
+    public List<AppiumTaskItem> initTaskItemList(Long taskId, Integer parentId) {
         QueryWrapper<AppiumTaskItem> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("task_id", taskId);
         if (parentId == null) {

+ 4 - 4
module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/service/impl/AppiumTaskServiceImpl.java

@@ -49,7 +49,7 @@ public class AppiumTaskServiceImpl extends ServiceImpl<AppiumTaskMapper, AppiumT
     }
 
     @Override
-    public void runTask(Integer taskId, Integer deviceId, String publishName) {
+    public void runTask(Long taskId, Integer deviceId, String publishName) {
         //获取当前需要执行的任务信息
         AppiumTask task = this.getById(taskId);
         //获取手机设备信息
@@ -60,7 +60,7 @@ public class AppiumTaskServiceImpl extends ServiceImpl<AppiumTaskMapper, AppiumT
         log.setDeviceId(deviceId);
         log.setDeviceIp(appiumDevice.getIp());
         log.setDevicePort(appiumDevice.getPort());
-        log.setStatus(1);
+        log.setStatus(1 + "");
         log.setTaskId(taskId);
         log.setTaskName(task.getTaskName());
         appiumTaskLogMapper.insert(log);
@@ -74,14 +74,14 @@ public class AppiumTaskServiceImpl extends ServiceImpl<AppiumTaskMapper, AppiumT
                 for (AppiumTaskItem appiumTaskItem : taskItemList) {
                     appiumUtil.runTask(androidDriver, appiumTaskItem, null, publishName);
                 }
-                log.setStatus(2);
+                log.setStatus(2 + "");
                 appiumTaskLogMapper.updateById(log);
                 appiumDevice.setStatus(1);
                 iAppiumDeviceService.updateById(appiumDevice);
             }
         } catch (Exception e) {
             e.printStackTrace();
-            log.setStatus(3);
+            log.setStatus(3 + "");
             appiumTaskLogMapper.updateById(log);
             appiumDevice.setStatus(1);
             iAppiumDeviceService.updateById(appiumDevice);