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