diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/service/wps_pptx/JudgementWpsPptxServiceImpl.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/service/wps_pptx/JudgementWpsPptxServiceImpl.java index cd601788..2cb5401a 100644 --- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/service/wps_pptx/JudgementWpsPptxServiceImpl.java +++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/service/wps_pptx/JudgementWpsPptxServiceImpl.java @@ -47,7 +47,7 @@ public class JudgementWpsPptxServiceImpl implements JudgementWpsPptxService { @Override public List judgementWpsPptx(List judgementReq, String path) throws Exception { - return JudgementWpsPPT.getValues(judgementReq, path); + return JudgementWpsPPT.getValues(judgementReq); } @@ -97,9 +97,10 @@ public class JudgementWpsPptxServiceImpl implements JudgementWpsPptxService { judgementReqVo.setIsText(pptxInfos[5]); judgementReqVo.setIsTrue(pptxInfos[6]); judgementReqVo.setIsParameter(pptxInfos[7]); + judgementReqVo.setPath(path); judgementReq.add(judgementReqVo); } - List judgementDtos = JudgementWpsPPT.getValues(judgementReq, path); + List judgementDtos = JudgementWpsPPT.getValues(judgementReq); // 4、进行关联判断 for (ExamQuestionAnswer examQuestionAnswer : answerList) { boolean flag = false; diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_pptx/JudgementWpsPPT.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_pptx/JudgementWpsPPT.java index 105011f4..b93bc034 100644 --- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_pptx/JudgementWpsPPT.java +++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_pptx/JudgementWpsPPT.java @@ -30,7 +30,7 @@ import java.util.*; * @author REN */ public class JudgementWpsPPT { - public static List getValues(List judgementReq, String path) throws InvalidFormatException, IOException, ParserConfigurationException, SAXException { + public static List getValues(List judgementReq) throws InvalidFormatException, IOException, ParserConfigurationException, SAXException { // 1、文件路径或者文件的属性 // 2、查找文件的属性其中字段为:name firstFunction SecondFunction ThirdFunction FourthFunction isboo betong 转换 // 3、名称 标签 标签段落 值标签 关联关系 关联文件名称 ) @@ -43,6 +43,7 @@ public class JudgementWpsPPT { List judgementList = new ArrayList<>(); for (JudgementReqVo reqVo : judgementReq) { + String path = reqVo.getPath(); String chineseName = reqVo.getChineseName(); String fileNama = reqVo.getFileNama(); String paragraph = reqVo.getParagraph(); diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_pptx/judgementVO/JudgementReqVo.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_pptx/judgementVO/JudgementReqVo.java index 0e266fa0..24f0129e 100644 --- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_pptx/judgementVO/JudgementReqVo.java +++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_pptx/judgementVO/JudgementReqVo.java @@ -7,6 +7,7 @@ import lombok.Data; */ @Data public class JudgementReqVo { + private String path; // 中文考点 private String chineseName;