|
@@ -5,6 +5,7 @@ import cn.com.ctop.crawler.modules.appium.entity.AppiumTask;
|
|
|
import cn.com.ctop.crawler.modules.appium.entity.AppiumTaskItem;
|
|
|
import cn.com.ctop.crawler.modules.appium.entity.AppiumTaskLog;
|
|
|
import cn.com.ctop.crawler.modules.appium.mapper.AppiumTaskItemMapper;
|
|
|
+import cn.com.ctop.crawler.modules.appium.mapper.AppiumTaskLogMapper;
|
|
|
import cn.com.ctop.crawler.modules.appium.mapper.AppiumTaskMapper;
|
|
|
import cn.com.ctop.crawler.modules.appium.service.IAppiumDeviceService;
|
|
|
import cn.com.ctop.crawler.modules.appium.service.IAppiumTaskItemService;
|
|
@@ -35,7 +36,7 @@ public class AppiumTaskServiceImpl extends ServiceImpl<AppiumTaskMapper, AppiumT
|
|
|
@Autowired
|
|
|
private IAppiumDeviceService iAppiumDeviceService;
|
|
|
@Autowired
|
|
|
- private IAppiumTaskLogService iAppiumTaskLogService;
|
|
|
+ private AppiumTaskLogMapper appiumTaskLogMapper;
|
|
|
|
|
|
public void runTask(Integer taskId, Integer deviceId) {
|
|
|
AppiumTask task = this.getById(taskId);
|
|
@@ -44,11 +45,13 @@ public class AppiumTaskServiceImpl extends ServiceImpl<AppiumTaskMapper, AppiumT
|
|
|
iAppiumDeviceService.updateById(appiumDevice);
|
|
|
AppiumTaskLog log = new AppiumTaskLog();
|
|
|
log.setDeviceId(deviceId);
|
|
|
+ log.setDeviceIp(appiumDevice.getIp());
|
|
|
log.setDevicePort(appiumDevice.getPort());
|
|
|
log.setStatus(1);
|
|
|
log.setTaskId(taskId);
|
|
|
log.setTaskName(task.getTaskName());
|
|
|
- iAppiumTaskLogService.save(log);
|
|
|
+ appiumTaskLogMapper.insert(log);
|
|
|
+ log.setId(log.getId());
|
|
|
List<AppiumTaskItem> taskItemList = iAppiumTaskItemService.initTaskItemList(taskId, null);
|
|
|
AppiumUtil appiumUtil = new AppiumUtil();
|
|
|
try {
|
|
@@ -58,14 +61,14 @@ public class AppiumTaskServiceImpl extends ServiceImpl<AppiumTaskMapper, AppiumT
|
|
|
appiumUtil.runTask(androidDriver, appiumTaskItem, null);
|
|
|
}
|
|
|
log.setStatus(2);
|
|
|
- iAppiumTaskLogService.updateById(log);
|
|
|
+ appiumTaskLogMapper.updateById(log);
|
|
|
appiumDevice.setStatus(1);
|
|
|
iAppiumDeviceService.updateById(appiumDevice);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
log.setStatus(3);
|
|
|
- iAppiumTaskLogService.updateById(log);
|
|
|
+ appiumTaskLogMapper.updateById(log);
|
|
|
appiumDevice.setStatus(1);
|
|
|
iAppiumDeviceService.updateById(appiumDevice);
|
|
|
}
|