|
@@ -51,13 +51,12 @@ public class CqdxService {
|
|
// 获取所有xml的路径
|
|
// 获取所有xml的路径
|
|
List<String> files = this.loadFiles();
|
|
List<String> files = this.loadFiles();
|
|
|
|
|
|
- int i = 1;
|
|
|
|
|
|
+ int i = 0;
|
|
System.out.println("XML的文件数:" + files.size());
|
|
System.out.println("XML的文件数:" + files.size());
|
|
for (String filePath : files) {
|
|
for (String filePath : files) {
|
|
- System.out.println("第" + i + "个xml文件开始处理,文件名为:" + filePath);
|
|
|
|
|
|
+ System.out.println("第" + (++i) + "个xml文件开始处理,文件名为:" + filePath);
|
|
|
|
|
|
-// if (i < 10) {
|
|
|
|
-// i++;
|
|
|
|
|
|
+// if (i < 30) {
|
|
// continue;
|
|
// continue;
|
|
// }
|
|
// }
|
|
|
|
|
|
@@ -69,27 +68,27 @@ public class CqdxService {
|
|
// 大题集合
|
|
// 大题集合
|
|
List<PaperDetail> paperDetails = initPaperDetails(paperInfoMap, paper);
|
|
List<PaperDetail> paperDetails = initPaperDetails(paperInfoMap, paper);
|
|
// 试题---资源 对应关系
|
|
// 试题---资源 对应关系
|
|
- Map<Question, QuestionPkgPath> map2 = new HashMap<>();
|
|
|
|
|
|
+ Map<Question, QuestionPkgPath> questionMaps = new HashMap<>();
|
|
|
|
|
|
// 定义小题集合
|
|
// 定义小题集合
|
|
List<PaperDetailUnit> paperDetailUnits;
|
|
List<PaperDetailUnit> paperDetailUnits;
|
|
try {
|
|
try {
|
|
- paperDetailUnits = initpaperDetailUnits(paper, paperDetails, map2, paperInfoMap, course);
|
|
|
|
|
|
+ paperDetailUnits = initpaperDetailUnits(paper, paperDetails, questionMaps, paperInfoMap, course);
|
|
if (paperDetailUnits == null) {
|
|
if (paperDetailUnits == null) {
|
|
- System.out.println("有问题的xml:" + filePath);
|
|
|
|
- continue;
|
|
|
|
|
|
+ System.out.println("-->有错误的XML:" + filePath);
|
|
|
|
+ break;
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- System.out.println("有问题的xml:" + filePath);
|
|
|
|
- continue;
|
|
|
|
|
|
+ System.out.println("==>有错误的XML:" + filePath);
|
|
|
|
+ break;
|
|
}
|
|
}
|
|
|
|
|
|
// 保存试题资源
|
|
// 保存试题资源
|
|
- /*quesPkgPathRepo.saveAll(map2.values());
|
|
|
|
- for (Map.Entry<Question, QuestionPkgPath> entry : map2.entrySet()) {
|
|
|
|
|
|
+ /*quesPkgPathRepo.saveAll(questionMaps.values());
|
|
|
|
+ for (Map.Entry<Question, QuestionPkgPath> entry : questionMaps.entrySet()) {
|
|
entry.getKey().setQuesPkgPathId(entry.getValue().getId());
|
|
entry.getKey().setQuesPkgPathId(entry.getValue().getId());
|
|
}
|
|
}
|
|
- quesRepo.saveAll(map2.keySet());
|
|
|
|
|
|
+ quesRepo.saveAll(questionMaps.keySet());
|
|
paperRepo.save(paper);
|
|
paperRepo.save(paper);
|
|
paperDetailRepo.saveAll(paperDetails);
|
|
paperDetailRepo.saveAll(paperDetails);
|
|
paperDetailUnitRepo.saveAll(paperDetailUnits);*/
|
|
paperDetailUnitRepo.saveAll(paperDetailUnits);*/
|
|
@@ -101,9 +100,9 @@ public class CqdxService {
|
|
okFile.renameTo(newFile);*/
|
|
okFile.renameTo(newFile);*/
|
|
|
|
|
|
System.out.println("第" + i + "个xml文件已经处理完,文件名为:" + filePath);
|
|
System.out.println("第" + i + "个xml文件已经处理完,文件名为:" + filePath);
|
|
- i++;
|
|
|
|
|
|
+// if (i > 50) break;
|
|
}
|
|
}
|
|
- System.out.println("保存成功...");
|
|
|
|
|
|
+ System.out.println("处理完成...");
|
|
}
|
|
}
|
|
|
|
|
|
// 初始化试卷
|
|
// 初始化试卷
|