剔除word片段处理逻辑

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/ClonePaperService.java

@@ -44,8 +44,8 @@ public class ClonePaperService {
     private PaperDetailUnitRepo paperDetailUnitRepo;
     @Autowired
     private QuestionAudioService questionAudioService;
-    @Autowired
-    private QuesPkgPathRepo quesPkgPathRepo;
+//    @Autowired
+//    private QuesPkgPathRepo quesPkgPathRepo;
     @Autowired
     private QuesRepo quesRepo;
     @Autowired
@@ -155,9 +155,9 @@ public class ClonePaperService {
             }
         }
         //更新试题的PkgPath
-        for (Question question : newQuestions) {
-            this.updateQuestionPkgPath(question);
-        }
+//        for (Question question : newQuestions) {
+//            this.updateQuestionPkgPath(question);
+//        }
         //批量新增试题
         quesRepo.saveAll(newQuestions);
 
@@ -227,12 +227,12 @@ public class ClonePaperService {
     /**
      * 更新试题的“word package path”
      */
-    private void updateQuestionPkgPath(Question question) {
-        QuestionPkgPath pkgPath = quesPkgPathRepo.findFirstById(question.getQuesPkgPathId());
-        pkgPath.setId(null);
-        quesPkgPathRepo.save(pkgPath);
-        question.setQuesPkgPathId(pkgPath.getId());
-    }
+//    private void updateQuestionPkgPath(Question question) {
+//        QuestionPkgPath pkgPath = quesPkgPathRepo.findFirstById(question.getQuesPkgPathId());
+//        pkgPath.setId(null);
+//        quesPkgPathRepo.save(pkgPath);
+//        question.setQuesPkgPathId(pkgPath.getId());
+//    }
 
     /**
      * 处理试题的音频(下载上传到云存储)

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/ImportDdCollegePaperService.java

@@ -39,7 +39,6 @@ import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
 import cn.com.qmth.examcloud.core.questions.dao.PaperDetailRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperDetailUnitRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperRepo;
-import cn.com.qmth.examcloud.core.questions.dao.QuesPkgPathRepo;
 import cn.com.qmth.examcloud.core.questions.dao.QuesRepo;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
@@ -82,8 +81,8 @@ public class ImportDdCollegePaperService {
     @Autowired
     private QuesTypeNameService quesTypeNameService;
 
-    @Autowired
-    private QuesPkgPathRepo quesPkgPathRepo;
+//    @Autowired
+//    private QuesPkgPathRepo quesPkgPathRepo;
     
     @Autowired
     private SystemProperties systemProperties;
@@ -178,10 +177,10 @@ public class ImportDdCollegePaperService {
                     paperDetails.add(paperDetail);
                 }
                 // 保存试题资源
-                quesPkgPathRepo.saveAll(map2.values());
-                for (Map.Entry<Question, QuestionPkgPath> entry : map2.entrySet()) {
-                    entry.getKey().setQuesPkgPathId(entry.getValue().getId());
-                }
+//                quesPkgPathRepo.saveAll(map2.values());
+//                for (Map.Entry<Question, QuestionPkgPath> entry : map2.entrySet()) {
+//                    entry.getKey().setQuesPkgPathId(entry.getValue().getId());
+//                }
                 // 计算试卷难度
                 paper.setDifficultyDegree(0.5);
                 // 重新计算试题序号

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/ImportPaperService.java

@@ -53,7 +53,6 @@ import cn.com.qmth.examcloud.core.questions.dao.PaperDetailRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperDetailUnitRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PropertyRepo;
-import cn.com.qmth.examcloud.core.questions.dao.QuesPkgPathRepo;
 import cn.com.qmth.examcloud.core.questions.dao.QuesRepo;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
 import cn.com.qmth.examcloud.core.questions.dao.entity.CourseProperty;
@@ -67,7 +66,6 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.QuesOption;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuesProperty;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionAudio;
-import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionPkgPath;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionType;
 import cn.com.qmth.examcloud.core.questions.service.config.SysProperty;
 import cn.com.qmth.examcloud.core.questions.service.impl.CourseService;
@@ -115,8 +113,8 @@ public class ImportPaperService {
     @Autowired
     QuesTypeNameService quesTypeNameService;
 
-    @Autowired
-    QuesPkgPathRepo quesPkgPathRepo;
+//    @Autowired
+//    QuesPkgPathRepo quesPkgPathRepo;
 
     @Autowired
     CoursePropertyRepo coursePropertyRepo;
@@ -377,11 +375,11 @@ public class ImportPaperService {
                     }
                 }
                 // 设置WordMlPackage二进制数据
-                byte[] pkgByte = getZipResource(wordMLPackage, question);
-                QuestionPkgPath quesPkgPath = quesPkgPathRepo.save(new QuestionPkgPath(pkgByte));
-                question.setQuesPkgPathId(quesPkgPath.getId());
-                pkgByte = null;
-                quesPkgPath.setQuesPkg(null);
+//                byte[] pkgByte = getZipResource(wordMLPackage, question);
+//                QuestionPkgPath quesPkgPath = quesPkgPathRepo.save(new QuestionPkgPath(pkgByte));
+//                question.setQuesPkgPathId(quesPkgPath.getId());
+//                pkgByte = null;
+//                quesPkgPath.setQuesPkg(null);
                 // 设置question与Unit集合数据
                 question.setCourse(paper.getCourse());
                 question.setOrgId(user.getRootOrgId().toString());
@@ -419,16 +417,16 @@ public class ImportPaperService {
         return paper;
     }
 
-    private byte[] getZipResource(WordprocessingMLPackage wordMLPackage, Question question) throws Exception {
-        List<String> wordXmls = getWordXmlByQuestion(question);
-        List<Question> subQuestions = question.getSubQuestions();
-        if (subQuestions != null && subQuestions.size() > 0) {
-            for (Question subQuestion : subQuestions) {
-                wordXmls.addAll(getWordXmlByQuestion(subQuestion));
-            }
-        }
-        return DocxProcessUtil.getWordBytesByQuestion(wordMLPackage, wordXmls);
-    }
+//    private byte[] getZipResource(WordprocessingMLPackage wordMLPackage, Question question) throws Exception {
+//        List<String> wordXmls = getWordXmlByQuestion(question);
+//        List<Question> subQuestions = question.getSubQuestions();
+//        if (subQuestions != null && subQuestions.size() > 0) {
+//            for (Question subQuestion : subQuestions) {
+//                wordXmls.addAll(getWordXmlByQuestion(subQuestion));
+//            }
+//        }
+//        return DocxProcessUtil.getWordBytesByQuestion(wordMLPackage, wordXmls);
+//    }
 
     public List<String> getWordXmlByQuestion(Question question) {
         List<String> wordXmls = new ArrayList<>();
@@ -1941,11 +1939,11 @@ public class ImportPaperService {
             User user) {
         Question oldQuestion = oldPaperDetailUnit.getQuestion();
         Question newQuestion = BeanCopierUtil.copyProperties(oldQuestion, Question.class);
-        QuestionPkgPath oldQuesPkgPath = quesPkgPathRepo.findFirstById(oldQuestion.getQuesPkgPathId());
-        QuestionPkgPath newQuestionPkgPath = BeanCopierUtil.copyProperties(oldQuesPkgPath, QuestionPkgPath.class);
-        newQuestionPkgPath.setId(null);
-        newQuestionPkgPath = quesPkgPathRepo.save(newQuestionPkgPath);
-        newQuestion.setQuesPkgPathId(newQuestionPkgPath.getId());
+//        QuestionPkgPath oldQuesPkgPath = quesPkgPathRepo.findFirstById(oldQuestion.getQuesPkgPathId());
+//        QuestionPkgPath newQuestionPkgPath = BeanCopierUtil.copyProperties(oldQuesPkgPath, QuestionPkgPath.class);
+//        newQuestionPkgPath.setId(null);
+//        newQuestionPkgPath = quesPkgPathRepo.save(newQuestionPkgPath);
+//        newQuestion.setQuesPkgPathId(newQuestionPkgPath.getId());
         newQuestion.setCourse(course);
         newQuestion.setId(null);
         newQuestion.setQuesProperties(null);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/ExportPaperAbstractService.java

@@ -38,7 +38,6 @@ import cn.com.qmth.examcloud.core.questions.dao.AudioTimeConfigRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperDetailRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperDetailUnitRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperRepo;
-import cn.com.qmth.examcloud.core.questions.dao.QuesPkgPathRepo;
 import cn.com.qmth.examcloud.core.questions.dao.QuesRepo;
 import cn.com.qmth.examcloud.core.questions.dao.entity.AudioTimeConfig;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExamFile;
@@ -120,8 +119,8 @@ public abstract class ExportPaperAbstractService {
     @Autowired
     protected AudioTimeConfigRepo audioTimeConfigRepo;
 
-    @Autowired
-    protected QuesPkgPathRepo quesPkgPathRepo;
+//    @Autowired
+//    protected QuesPkgPathRepo quesPkgPathRepo;
 
     @Autowired
     private SysProperty sysProperty;

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExportPaperServiceImpl.java

@@ -47,7 +47,6 @@ import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.core.questions.dao.CoursePropertyRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperDetailUnitRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperRepo;
-import cn.com.qmth.examcloud.core.questions.dao.QuesPkgPathRepo;
 import cn.com.qmth.examcloud.core.questions.dao.QuestionAudioRepo;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
 import cn.com.qmth.examcloud.core.questions.dao.entity.CourseProperty;
@@ -118,8 +117,8 @@ public class ExportPaperServiceImpl implements ExportPaperService {
     @Autowired
     private PaperDetailUnitRepo paperDetailUnitRepo;
 
-    @Autowired
-    protected QuesPkgPathRepo quesPkgPathRepo;
+//    @Autowired
+//    protected QuesPkgPathRepo quesPkgPathRepo;
 
     @Autowired
     private SysProperty sysProperty;