diff --git a/src/main/java/com/example/exam/exam/service/autoForEmailSetting/AutoForWinEmailSettingServiceImpl.java b/src/main/java/com/example/exam/exam/service/autoForEmailSetting/AutoForWinEmailSettingServiceImpl.java index dac2e0a..2064e36 100644 --- a/src/main/java/com/example/exam/exam/service/autoForEmailSetting/AutoForWinEmailSettingServiceImpl.java +++ b/src/main/java/com/example/exam/exam/service/autoForEmailSetting/AutoForWinEmailSettingServiceImpl.java @@ -80,11 +80,21 @@ public class AutoForWinEmailSettingServiceImpl implements AutoForWinEmailSetting File dir = new File(stuInfoVo.getFilePath()); File[] files = dir.listFiles(); if (files == null) return null; + // 获取到题型得文件夹 for (File file : files) { - if (file.isFile() - && file.getName().contains("@EmailDummy") - && file.getName().toLowerCase().endsWith(".json")) { - resultFile.add(file); + File[] fileQuNum = file.listFiles(); + if (fileQuNum != null) { + for (File fileNum : fileQuNum) { + if (Objects.requireNonNull(fileNum.listFiles()).length > 0) { + File fileJson = Objects.requireNonNull(fileNum.listFiles())[0]; + if (fileJson.isFile() + && fileJson.getName().contains("@EmailDummy") + && fileJson.getName().toLowerCase().endsWith(".json")) { + resultFile.add(fileJson); + } + } + + } } } List trueFileQuid = new ArrayList<>(); @@ -124,7 +134,7 @@ public class AutoForWinEmailSettingServiceImpl implements AutoForWinEmailSetting // 试题分数 List educationPaperSchemeList = educationPaperSchemeMapper.selectEducationPaperTaskByPaperId(stuInfoVo.getPaperId()); - Optional result = educationPaperSchemeList.stream().filter(quLists -> quLists.getSpName().equals("windows网络设置")).findFirst(); + Optional result = educationPaperSchemeList.stream().filter(quLists -> quLists.getSpName().equals("邮箱")).findFirst(); String quScore = result.get().getQuScores(); // 根据ID查询试题 ExamQuestion examQuestion = examQuestionService.selectExamQuestionByQuId(quId); @@ -212,7 +222,7 @@ public class AutoForWinEmailSettingServiceImpl implements AutoForWinEmailSetting // 试题分数 List educationPaperSchemeList = educationPaperSchemeMapper.selectEducationPaperTaskByPaperId(stuInfoVo.getPaperId()); - Optional result = educationPaperSchemeList.stream().filter(quLists -> quLists.getSpName().equals("windows网络设置")).findFirst(); + Optional result = educationPaperSchemeList.stream().filter(quLists -> quLists.getSpName().equals("邮箱")).findFirst(); String quScore = result.get().getQuScores(); // 根据ID查询试题 ExamQuestion examQuestion = examQuestionService.selectExamQuestionByQuId(quId); diff --git a/src/main/java/com/example/exam/exam/service/autoForWinEdgeSetting/AutoForWinEdgeSettingServiceImpl.java b/src/main/java/com/example/exam/exam/service/autoForWinEdgeSetting/AutoForWinEdgeSettingServiceImpl.java index 994115a..19e0e1e 100644 --- a/src/main/java/com/example/exam/exam/service/autoForWinEdgeSetting/AutoForWinEdgeSettingServiceImpl.java +++ b/src/main/java/com/example/exam/exam/service/autoForWinEdgeSetting/AutoForWinEdgeSettingServiceImpl.java @@ -80,11 +80,21 @@ public class AutoForWinEdgeSettingServiceImpl implements AutoForWinEdgeSettingSe File dir = new File(stuInfoVo.getFilePath()); File[] files = dir.listFiles(); if (files == null) return null; + // 获取到题型得文件夹 for (File file : files) { - if (file.isFile() - && file.getName().contains("@EdgeDummy") - && file.getName().toLowerCase().endsWith(".json")) { - resultFile.add(file); + File[] fileQuNum = file.listFiles(); + if (fileQuNum != null) { + for (File fileNum : fileQuNum) { + if (Objects.requireNonNull(fileNum.listFiles()).length > 0) { + File fileJson = Objects.requireNonNull(fileNum.listFiles())[0]; + if (fileJson.isFile() + && fileJson.getName().contains("@EdgeDummy") + && fileJson.getName().toLowerCase().endsWith(".json")) { + resultFile.add(fileJson); + } + } + + } } } List trueFileQuid = new ArrayList<>();