Explorar el Código

修改爬虫任务

syh hace 5 años
padre
commit
6eeadcf3d1

+ 6 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestMqController.java

@@ -2,6 +2,8 @@ package org.jeecg.modules.ctop.controller;
 
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
+import cn.com.ctop.crawler.modules.appium.entity.AppiumDevice;
+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.mq.Sender;
@@ -17,6 +19,8 @@ import java.util.Map;
 @RequestMapping("mq")
 public class TestMqController {
     @Autowired
+    private IAppiumDeviceService deviceService;
+    @Autowired
     private Sender sender;
     @Autowired
     private IAppiumJobService jobService;
@@ -34,15 +38,8 @@ public class TestMqController {
     @GetMapping("task1")
     public Map<String, Object> task1() {
         Map<String, Object> result = new HashMap<>();
-        jobService.loginTask(2L);
-        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS.getCode());
-        return result;
-    }
-
-    @GetMapping("task2")
-    public Map<String, Object> task2() {
-        Map<String, Object> result = new HashMap<>();
-        appiumTaskService.runTask(1, 1);
+        AppiumDevice device = deviceService.getById(1);
+        jobService.loginTask(2L, device);
         ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS.getCode());
         return result;
     }

+ 0 - 12
module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/controller/AppiumTaskController.java

@@ -209,18 +209,6 @@ public class AppiumTaskController {
         return mv;
     }
 
-    @RequestMapping(value = "/run", method = RequestMethod.POST)
-    public Result<?> run(HttpServletRequest request, HttpServletResponse response, Integer taskId, Integer deviceId) {
-        Thread thread = new Thread() {
-            @Override
-            public void run() {
-                appiumTaskService.runTask(taskId, deviceId);
-            }
-        };
-        thread.start();
-        return Result.ok("任务已启动");
-    }
-
     @RequestMapping(value = "/run/login", method = RequestMethod.POST)
     public Result<?> runLogin(HttpServletRequest request, HttpServletResponse response, Integer taskId, Integer deviceId) {
         Thread thread = new Thread() {