Parcourir la source

增加任务日志

xuzuoyun il y a 5 ans
Parent
commit
735e9a7bd3

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

@@ -0,0 +1,253 @@
+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 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.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;
+
+/**
+ * 任务日志表
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-11-01
+ */
+@Slf4j
+@Api(tags = "任务日志表")
+@RestController
+@RequestMapping("/appium/appiumTaskLog")
+public class AppiumTaskLogController {
+    @Autowired
+    private IAppiumTaskLogService appiumTaskLogService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param appiumTaskLog
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "任务日志表-分页列表查询")
+    @ApiOperation(value = "任务日志表-分页列表查询", notes = "任务日志表-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<AppiumTaskLog>> queryPageList(AppiumTaskLog appiumTaskLog,
+                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                      HttpServletRequest req) {
+        Result<IPage<AppiumTaskLog>> result = new Result<IPage<AppiumTaskLog>>();
+        QueryWrapper<AppiumTaskLog> queryWrapper = QueryGenerator.initQueryWrapper(appiumTaskLog, req.getParameterMap());
+        Page<AppiumTaskLog> page = new Page<AppiumTaskLog>(pageNo, pageSize);
+        IPage<AppiumTaskLog> pageList = appiumTaskLogService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param appiumTaskLog
+     * @return
+     */
+    @AutoLog(value = "任务日志表-添加")
+    @ApiOperation(value = "任务日志表-添加", notes = "任务日志表-添加")
+    @PostMapping(value = "/add")
+    public Result<AppiumTaskLog> add(@RequestBody AppiumTaskLog appiumTaskLog) {
+        Result<AppiumTaskLog> result = new Result<AppiumTaskLog>();
+        try {
+            appiumTaskLogService.save(appiumTaskLog);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param appiumTaskLog
+     * @return
+     */
+    @AutoLog(value = "任务日志表-编辑")
+    @ApiOperation(value = "任务日志表-编辑", notes = "任务日志表-编辑")
+    @PutMapping(value = "/edit")
+    public Result<AppiumTaskLog> edit(@RequestBody AppiumTaskLog appiumTaskLog) {
+        Result<AppiumTaskLog> result = new Result<AppiumTaskLog>();
+        AppiumTaskLog appiumTaskLogEntity = appiumTaskLogService.getById(appiumTaskLog.getId());
+        if (appiumTaskLogEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = appiumTaskLogService.updateById(appiumTaskLog);
+            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 {
+            appiumTaskLogService.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<AppiumTaskLog> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<AppiumTaskLog> result = new Result<AppiumTaskLog>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.appiumTaskLogService.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<AppiumTaskLog> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<AppiumTaskLog> result = new Result<AppiumTaskLog>();
+        AppiumTaskLog appiumTaskLog = appiumTaskLogService.getById(id);
+        if (appiumTaskLog == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(appiumTaskLog);
+            result.setSuccess(true);
+        }
+        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("文件导入失败!");
+    }
+
+}

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

@@ -0,0 +1,85 @@
+package cn.com.ctop.crawler.modules.appium.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 任务日志表
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-11-01
+ */
+@Data
+@TableName("ctop_appium_task_log")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_appium_task_log对象", description = "任务日志表")
+public class AppiumTaskLog {
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+    /**
+     * 任务ID
+     */
+    @Excel(name = "任务ID", width = 15)
+    @ApiModelProperty(value = "任务ID")
+    private Integer taskId;
+    /**
+     * 设备ID
+     */
+    @Excel(name = "设备ID", width = 15)
+    @ApiModelProperty(value = "设备ID")
+    private Integer deviceId;
+    /**
+     * 任务名称
+     */
+    @Excel(name = "任务名称", width = 15)
+    @ApiModelProperty(value = "任务名称")
+    private String taskName;
+    /**
+     * 设备IP
+     */
+    @Excel(name = "设备IP", width = 15)
+    @ApiModelProperty(value = "设备IP")
+    private String deviceIp;
+    /**
+     * 设备端口
+     */
+    @Excel(name = "设备端口", width = 15)
+    @ApiModelProperty(value = "设备端口")
+    private String devicePort;
+    /**
+     * 状态
+     */
+    @Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+}

+ 18 - 0
module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/mapper/AppiumTaskLogMapper.java

@@ -0,0 +1,18 @@
+package cn.com.ctop.crawler.modules.appium.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import cn.com.ctop.crawler.modules.appium.entity.AppiumTaskLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 任务日志表
+ *
+ * @author: jeecg-boot
+ * @date: 2019-11-01
+ * @cersion: V1.0
+ */
+public interface AppiumTaskLogMapper extends BaseMapper<AppiumTaskLog> {
+
+}

+ 5 - 0
module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/mapper/xml/AppiumTaskLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.ctop.crawler.modules.appium.mapper.AppiumTaskLogMapper">
+
+</mapper>

+ 15 - 0
module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/service/IAppiumTaskLogService.java

@@ -0,0 +1,15 @@
+package cn.com.ctop.crawler.modules.appium.service;
+
+import cn.com.ctop.crawler.modules.appium.entity.AppiumTaskLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 任务日志表
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-11-01
+ */
+public interface IAppiumTaskLogService extends IService<AppiumTaskLog> {
+
+}

+ 20 - 0
module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/service/impl/AppiumTaskLogServiceImpl.java

@@ -0,0 +1,20 @@
+package cn.com.ctop.crawler.modules.appium.service.impl;
+
+import cn.com.ctop.crawler.modules.appium.entity.AppiumTaskLog;
+import cn.com.ctop.crawler.modules.appium.mapper.AppiumTaskLogMapper;
+import cn.com.ctop.crawler.modules.appium.service.IAppiumTaskLogService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 任务日志表
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-11-01
+ */
+@Service
+public class AppiumTaskLogServiceImpl extends ServiceImpl<AppiumTaskLogMapper, AppiumTaskLog> implements IAppiumTaskLogService {
+
+}

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

@@ -3,10 +3,12 @@ package cn.com.ctop.crawler.modules.appium.service.impl;
 import cn.com.ctop.crawler.modules.appium.entity.AppiumDevice;
 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.AppiumTaskMapper;
 import cn.com.ctop.crawler.modules.appium.service.IAppiumDeviceService;
 import cn.com.ctop.crawler.modules.appium.service.IAppiumTaskItemService;
+import cn.com.ctop.crawler.modules.appium.service.IAppiumTaskLogService;
 import cn.com.ctop.crawler.modules.appium.service.IAppiumTaskService;
 import cn.com.ctop.crawler.modules.core.util.AppiumUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -32,10 +34,21 @@ public class AppiumTaskServiceImpl extends ServiceImpl<AppiumTaskMapper, AppiumT
     private IAppiumTaskItemService iAppiumTaskItemService;
     @Autowired
     private IAppiumDeviceService iAppiumDeviceService;
+    @Autowired
+    private IAppiumTaskLogService iAppiumTaskLogService;
 
     public void runTask(Integer taskId, Integer deviceId) {
         AppiumTask task = this.getById(taskId);
         AppiumDevice appiumDevice = iAppiumDeviceService.getById(deviceId);
+        appiumDevice.setStatus(2);
+        iAppiumDeviceService.updateById(appiumDevice);
+        AppiumTaskLog log = new AppiumTaskLog();
+        log.setDeviceId(deviceId);
+        log.setDevicePort(appiumDevice.getPort());
+        log.setStatus(1);
+        log.setTaskId(taskId);
+        log.setTaskName(task.getTaskName());
+        iAppiumTaskLogService.save(log);
         List<AppiumTaskItem> taskItemList = iAppiumTaskItemService.initTaskItemList(taskId, null);
         AppiumUtil appiumUtil = new AppiumUtil();
         try {
@@ -44,9 +57,17 @@ public class AppiumTaskServiceImpl extends ServiceImpl<AppiumTaskMapper, AppiumT
                 for (AppiumTaskItem appiumTaskItem : taskItemList) {
                     appiumUtil.runTask(androidDriver, appiumTaskItem, null);
                 }
+                log.setStatus(2);
+                iAppiumTaskLogService.updateById(log);
+                appiumDevice.setStatus(1);
+                iAppiumDeviceService.updateById(appiumDevice);
             }
         } catch (Exception e) {
             e.printStackTrace();
+            log.setStatus(3);
+            iAppiumTaskLogService.updateById(log);
+            appiumDevice.setStatus(1);
+            iAppiumDeviceService.updateById(appiumDevice);
         }
     }