|
@@ -1,42 +1,21 @@
|
|
package cn.com.ctop.crawler.modules.appium.controller;
|
|
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.entity.AppiumTaskLog;
|
|
import cn.com.ctop.crawler.modules.appium.service.IAppiumTaskLogService;
|
|
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.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
+import io.swagger.annotations.Api;
|
|
|
|
+import io.swagger.annotations.ApiOperation;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
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.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.*;
|
|
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 = "pageNo", defaultValue = "1") Integer pageNo,
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
HttpServletRequest req) {
|
|
HttpServletRequest req) {
|
|
- Result<IPage<AppiumTaskLog>> result = new Result<IPage<AppiumTaskLog>>();
|
|
|
|
|
|
+ Result<IPage<AppiumTaskLog>> result = new Result<>();
|
|
QueryWrapper<AppiumTaskLog> queryWrapper = QueryGenerator.initQueryWrapper(appiumTaskLog, req.getParameterMap());
|
|
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);
|
|
IPage<AppiumTaskLog> pageList = appiumTaskLogService.page(page, queryWrapper);
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
result.setResult(pageList);
|
|
result.setResult(pageList);
|
|
@@ -88,7 +67,7 @@ public class AppiumTaskLogController {
|
|
@ApiOperation(value = "任务日志表-添加", notes = "任务日志表-添加")
|
|
@ApiOperation(value = "任务日志表-添加", notes = "任务日志表-添加")
|
|
@PostMapping(value = "/add")
|
|
@PostMapping(value = "/add")
|
|
public Result<AppiumTaskLog> add(@RequestBody AppiumTaskLog appiumTaskLog) {
|
|
public Result<AppiumTaskLog> add(@RequestBody AppiumTaskLog appiumTaskLog) {
|
|
- Result<AppiumTaskLog> result = new Result<AppiumTaskLog>();
|
|
|
|
|
|
+ Result<AppiumTaskLog> result = new Result<>();
|
|
try {
|
|
try {
|
|
appiumTaskLogService.save(appiumTaskLog);
|
|
appiumTaskLogService.save(appiumTaskLog);
|
|
result.success("添加成功!");
|
|
result.success("添加成功!");
|
|
@@ -109,7 +88,7 @@ public class AppiumTaskLogController {
|
|
@ApiOperation(value = "任务日志表-编辑", notes = "任务日志表-编辑")
|
|
@ApiOperation(value = "任务日志表-编辑", notes = "任务日志表-编辑")
|
|
@PutMapping(value = "/edit")
|
|
@PutMapping(value = "/edit")
|
|
public Result<AppiumTaskLog> edit(@RequestBody AppiumTaskLog appiumTaskLog) {
|
|
public Result<AppiumTaskLog> edit(@RequestBody AppiumTaskLog appiumTaskLog) {
|
|
- Result<AppiumTaskLog> result = new Result<AppiumTaskLog>();
|
|
|
|
|
|
+ Result<AppiumTaskLog> result = new Result<>();
|
|
AppiumTaskLog appiumTaskLogEntity = appiumTaskLogService.getById(appiumTaskLog.getId());
|
|
AppiumTaskLog appiumTaskLogEntity = appiumTaskLogService.getById(appiumTaskLog.getId());
|
|
if (appiumTaskLogEntity == null) {
|
|
if (appiumTaskLogEntity == null) {
|
|
result.error500("未找到对应实体");
|
|
result.error500("未找到对应实体");
|
|
@@ -152,7 +131,7 @@ public class AppiumTaskLogController {
|
|
@ApiOperation(value = "任务日志表-批量删除", notes = "任务日志表-批量删除")
|
|
@ApiOperation(value = "任务日志表-批量删除", notes = "任务日志表-批量删除")
|
|
@DeleteMapping(value = "/deleteBatch")
|
|
@DeleteMapping(value = "/deleteBatch")
|
|
public Result<AppiumTaskLog> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
|
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())) {
|
|
if (ids == null || "".equals(ids.trim())) {
|
|
result.error500("参数不识别!");
|
|
result.error500("参数不识别!");
|
|
} else {
|
|
} else {
|
|
@@ -172,7 +151,7 @@ public class AppiumTaskLogController {
|
|
@ApiOperation(value = "任务日志表-通过id查询", notes = "任务日志表-通过id查询")
|
|
@ApiOperation(value = "任务日志表-通过id查询", notes = "任务日志表-通过id查询")
|
|
@GetMapping(value = "/queryById")
|
|
@GetMapping(value = "/queryById")
|
|
public Result<AppiumTaskLog> queryById(@RequestParam(name = "id", required = true) String id) {
|
|
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);
|
|
AppiumTaskLog appiumTaskLog = appiumTaskLogService.getById(id);
|
|
if (appiumTaskLog == null) {
|
|
if (appiumTaskLog == null) {
|
|
result.error500("未找到对应实体");
|
|
result.error500("未找到对应实体");
|
|
@@ -182,72 +161,4 @@ public class AppiumTaskLogController {
|
|
}
|
|
}
|
|
return result;
|
|
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("文件导入失败!");
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
}
|
|
}
|