diff --git a/src/main/java/com/bonus/emergencyrap/controller/LoginController.java b/src/main/java/com/bonus/emergencyrap/controller/LoginController.java index 7c5f767..86a5e99 100644 --- a/src/main/java/com/bonus/emergencyrap/controller/LoginController.java +++ b/src/main/java/com/bonus/emergencyrap/controller/LoginController.java @@ -18,7 +18,6 @@ public class LoginController { @PostMapping("/login") public AjaxResult login(@RequestBody LoginFormVo loginFormVo) { - return service.login(loginFormVo); - + return service.login(loginFormVo); } } diff --git a/src/main/java/com/bonus/emergencyrap/service/PlatformServiceImpl.java b/src/main/java/com/bonus/emergencyrap/service/PlatformServiceImpl.java index ce53898..3d59da7 100644 --- a/src/main/java/com/bonus/emergencyrap/service/PlatformServiceImpl.java +++ b/src/main/java/com/bonus/emergencyrap/service/PlatformServiceImpl.java @@ -69,15 +69,12 @@ public class PlatformServiceImpl implements PlatformService{ if(!isCz){ //不存在则创建 TextFileUtils.createFile(filePtah); - TextFileUtils.appendToFile(filePtah,uuid); - TextFileUtils.appendToFile(filePtah,"="); - TextFileUtils.appendToFile(filePtah,json); }else{ TextFileUtils.appendToFile(filePtah,"\n"); - TextFileUtils.appendToFile(filePtah,uuid); - TextFileUtils.appendToFile(filePtah,"="); - TextFileUtils.appendToFile(filePtah,json); } + TextFileUtils.appendToFile(filePtah,uuid); + TextFileUtils.appendToFile(filePtah,"="); + TextFileUtils.appendToFile(filePtah,json); return AjaxResult.success("添加成功"); } diff --git a/src/main/java/com/bonus/emergencyrap/service/TaskServiceImpl.java b/src/main/java/com/bonus/emergencyrap/service/TaskServiceImpl.java index 4d8a083..8000506 100644 --- a/src/main/java/com/bonus/emergencyrap/service/TaskServiceImpl.java +++ b/src/main/java/com/bonus/emergencyrap/service/TaskServiceImpl.java @@ -57,7 +57,7 @@ public class TaskServiceImpl implements TaskService{ String json=JSON.toJSONString(vo); //文件是否存在 boolean isCz=TextFileUtils.exists(filePtah); - appendToFile(filePtah,json,uuid,!isCz); + appendToFile(filePtah,json,uuid,isCz); return AjaxResult.success("添加成功"); } @@ -70,9 +70,9 @@ public class TaskServiceImpl implements TaskService{ */ public void appendToFile(String filePath,String content,String id,boolean append){ if(append){ - TextFileUtils.createFile(filePath); - }else{ TextFileUtils.appendToFile(filePath,"\n"); + }else{ + TextFileUtils.createFile(filePath); } TextFileUtils.appendToFile(filePath,id); TextFileUtils.appendToFile(filePath,"="); @@ -111,7 +111,7 @@ public class TaskServiceImpl implements TaskService{ @Override public AjaxResult delete(TaskVo vo) { try{ - String filePtah=UploadFile.getFilePath(TextConstants.PLATFORM); + String filePtah=UploadFile.getFilePath(TextConstants.TASK); Map map=TextFileUtils.readFileMaps(filePtah); TextFileUtils.deleteFile(filePtah); TextFileUtils.createFile(filePtah); diff --git a/src/main/java/com/bonus/emergencyrap/utils/TextFileUtils.java b/src/main/java/com/bonus/emergencyrap/utils/TextFileUtils.java index fdf02ed..b1c8328 100644 --- a/src/main/java/com/bonus/emergencyrap/utils/TextFileUtils.java +++ b/src/main/java/com/bonus/emergencyrap/utils/TextFileUtils.java @@ -89,7 +89,10 @@ public class TextFileUtils { try (BufferedReader reader = Files.newBufferedReader(path, actualCharset)) { String line; while ((line = reader.readLine()) != null) { - lines.add(line); + if(StringUtils.isNotBlank(line)){ + lines.add(line); + } + } } catch (IOException e) { throw new RuntimeException("读取文件行失败: " + e.getMessage(), e); @@ -103,6 +106,20 @@ public class TextFileUtils { * @return 存在返回true,否则false */ public static boolean exists(String filePath) { + File file = new File(filePath); + if (!file.exists()) { + return false; + } else if (file.length() == 0) { + deleteFile(filePath); + return false; + } else { + return true; + } + + + } + + public static boolean exists2(String filePath) { return Files.exists(Paths.get(filePath)); } @@ -147,7 +164,11 @@ public class TextFileUtils { Map map=new HashMap(); if(!list.isEmpty()){ for (String line : list) { - map.put(line.split("=")[0],line.split("=")[1]); + if(StringUtils.isNotBlank(line)){ + String[] keyValue = line.split("=",2); + map.put(keyValue[0],keyValue[1]); + } + } } return map; diff --git a/src/main/java/com/bonus/emergencyrap/vo/TaskProcessVo.java b/src/main/java/com/bonus/emergencyrap/vo/TaskProcessVo.java index ff319e4..cd8bf99 100644 --- a/src/main/java/com/bonus/emergencyrap/vo/TaskProcessVo.java +++ b/src/main/java/com/bonus/emergencyrap/vo/TaskProcessVo.java @@ -8,6 +8,7 @@ public class TaskProcessVo { private String taskId; private String id; + /** * 操作元素 */ @@ -26,10 +27,14 @@ public class TaskProcessVo { * 点击 、输入 、双击、单击、无操作 */ private String interactive; + /** + * 输入内容 + */ + private String content; /** * 元素路径 */ - private String xPath; + private String xpath; /** * 是否依赖上一步元素 */ @@ -38,4 +43,5 @@ public class TaskProcessVo { * 排序 */ private String sort; + } diff --git a/src/main/java/com/bonus/emergencyrap/vo/TaskVo.java b/src/main/java/com/bonus/emergencyrap/vo/TaskVo.java index c38f29e..c7f503d 100644 --- a/src/main/java/com/bonus/emergencyrap/vo/TaskVo.java +++ b/src/main/java/com/bonus/emergencyrap/vo/TaskVo.java @@ -14,6 +14,8 @@ public class TaskVo { */ private String taskName; + private String systemId; + /** * 平台名称 */ @@ -70,6 +72,18 @@ public class TaskVo { * 操作元素内容 */ private List list; + /** + * 浏览器路径 + */ + private String browserUrl; + /** + * 驱动路径 + */ + private String driverUrl; + /** + * 任务类型 + */ + private String taskType; }