From e67fb27f3f678892f153454aeb898fa7a336ade5 Mon Sep 17 00:00:00 2001
From: dlaren <dla.ren@outlook.com>
Date: Mon, 18 Aug 2025 16:37:34 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9Edge=EF=BC=8CQQ=E9=82=AE=E7=AE=B1=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A4=E5=88=86=E6=96=87=E4=BB=B6=E5=88=A4=E6=96=AD=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AutoForWinEmailSettingServiceImpl.java    | 22 ++++++++++++++-----
 .../AutoForWinEdgeSettingServiceImpl.java     | 18 +++++++++++----
 2 files changed, 30 insertions(+), 10 deletions(-)

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<String> trueFileQuid = new ArrayList<>();
@@ -124,7 +134,7 @@ public class AutoForWinEmailSettingServiceImpl implements AutoForWinEmailSetting
 
                     // 试题分数
                     List<EducationPaperScheme> educationPaperSchemeList = educationPaperSchemeMapper.selectEducationPaperTaskByPaperId(stuInfoVo.getPaperId());
-                    Optional<EducationPaperScheme> result = educationPaperSchemeList.stream().filter(quLists -> quLists.getSpName().equals("windows网络设置")).findFirst();
+                    Optional<EducationPaperScheme> 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<EducationPaperScheme> educationPaperSchemeList = educationPaperSchemeMapper.selectEducationPaperTaskByPaperId(stuInfoVo.getPaperId());
-            Optional<EducationPaperScheme> result = educationPaperSchemeList.stream().filter(quLists -> quLists.getSpName().equals("windows网络设置")).findFirst();
+            Optional<EducationPaperScheme> 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<String> trueFileQuid = new ArrayList<>();