Jelajahi Sumber

提交题库后端代码

weiwenhai 6 tahun lalu
induk
melakukan
3da31b309c
26 mengubah file dengan 252 tambahan dan 29 penghapusan
  1. 28 18
      examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/PaperController.java
  2. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/BjhkExportPaperService.java
  3. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/BjjtExportPaperService.java
  4. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/BjsfExportPaperService.java
  5. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/CqdxExportPaperService.java
  6. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/DbsfExportPaperService.java
  7. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/DzkdExportPaperService.java
  8. 90 1
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/ExportPaperAbstractService.java
  9. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/FjsfExportPaperService.java
  10. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/HnsfExportPaperService.java
  11. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/HzkjExportPaperService.java
  12. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/NkdxExportPaperService.java
  13. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/RjgcExportPaperService.java
  14. 9 5
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/SddxExportPaperService.java
  15. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/SxsfExportPaperService.java
  16. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/SydxExportPaperService.java
  17. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/TjdxExportPaperService.java
  18. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/XnjdExportPaperService.java
  19. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/YkdxExportPaperService.java
  20. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/ZgddbExportPaperService.java
  21. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/ZgddwExportPaperService.java
  22. 6 0
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/xajdExportPaperService.java
  23. 1 1
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/PaperServiceImpl.java
  24. 2 2
      examcloud-core-questions-starter/src/main/resources/security-exclusions.conf
  25. 0 0
      examcloud-core-questions-starter/src/main/resources/templates/sddxExportPaperService_answer.ftl
  26. 8 2
      examcloud-core-questions-starter/src/main/resources/templates/sddxExportPaperService_paper.ftl

+ 28 - 18
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/PaperController.java

@@ -6,10 +6,13 @@ import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.questions.api.bean.ParsePaper;
 import cn.com.qmth.examcloud.core.questions.base.BeanCopierUtil;
+import cn.com.qmth.examcloud.core.questions.base.SpringContextUtils;
 import cn.com.qmth.examcloud.core.questions.base.StringSimilarityUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
 import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.dao.ExportServiceManageRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperRepo;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExportServiceManage;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperSearchInfo;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
@@ -18,8 +21,12 @@ import cn.com.qmth.examcloud.core.questions.service.QuesService;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailUnitExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+import cn.com.qmth.examcloud.core.questions.service.export.ExportPaperAbstractService;
+
 import com.google.gson.Gson;
+
 import io.swagger.annotations.ApiOperation;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -61,10 +68,12 @@ public class PaperController extends ControllerSupport {
 
     @Autowired
     QuesService quesService;
+    
+    @Autowired
+    ExportServiceManageRepo exportServiceManageRepo;
 
     /**
      * 根据Id获取试卷
-     *
      * @param paperId
      * @return
      */
@@ -579,34 +588,35 @@ public class PaperController extends ControllerSupport {
     }
 
     @ApiOperation(value = "预览试卷页面")
-    @GetMapping(value = "/paper/pdf/{paperId}")
-    public String viewPaper(Model model, @PathVariable String paperId) {
-        PaperExp paper;
-        try {
-            paper = paperService.getPaperDto(paperId);
-        } catch (Exception e) {
-            log.error(e.getMessage());
-            throw new StatusException("500", "试卷信息不存在!");
+    @GetMapping(value = "/paper/pdf/{paperId}/{orgName}")
+    public String viewPaper(Model model, @PathVariable String paperId, @PathVariable String orgName) {
+    	ExportServiceManage esm = exportServiceManageRepo.findByOrgName(orgName);
+    	if (esm == null) {
+            esm = exportServiceManageRepo.findByOrgName("山东大学");
         }
+    	ExportPaperAbstractService exportPaperAbstractService = (ExportPaperAbstractService) SpringContextUtils.getBeanById(esm.getExportServiceName());
+        PaperExp paper  = exportPaperAbstractService.previewPDF(paperId);
         model.addAttribute("htmlList", JsonUtil.toJson(ParsePaper.convertPaperHtml(paper)));
         model.addAttribute("courseName", paper.getCourseName());
         model.addAttribute("courseNo", paper.getCourseNo());
-        return "paper";
+        String html = esm.getExportServiceName() + "_paper";
+        return html;
     }
 
     @ApiOperation(value = "预览试卷答案页面")
-    @GetMapping(value = "/paper/answer/pdf/{paperId}")
-    public String viewPaperAnswer(Model model, @PathVariable String paperId) {
-        PaperExp paper;
-        try {
-            paper = paperService.getPaperDto(paperId);
-        } catch (Exception e) {
-            throw new StatusException("500", "试卷信息不存在!");
+    @GetMapping(value = "/paper/answer/pdf/{paperId}/{orgName}")
+    public String viewPaperAnswer(Model model, @PathVariable String paperId, @PathVariable String orgName) {
+    	ExportServiceManage esm = exportServiceManageRepo.findByOrgName(orgName);
+    	if (esm == null) {
+            esm = exportServiceManageRepo.findByOrgName("山东大学");
         }
+    	ExportPaperAbstractService exportPaperAbstractService = (ExportPaperAbstractService) SpringContextUtils.getBeanById(esm.getExportServiceName());
+        PaperExp paper  = exportPaperAbstractService.previewPDF(paperId);
         model.addAttribute("htmlList", JsonUtil.toJson(ParsePaper.convertAnswerHtml(paper)));
         model.addAttribute("courseNo", paper.getCourseNo());
         model.addAttribute("courseName", paper.getCourseName());
-        return "paperAnswer";
+        String html = esm.getExportServiceName() + "_answer";
+        return html;
     }
 
     /**

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/BjhkExportPaperService.java

@@ -89,4 +89,10 @@ public class BjhkExportPaperService extends ExportPaperAbstractService {
         	}
         }
     }
+
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/BjjtExportPaperService.java

@@ -78,4 +78,10 @@ public class BjjtExportPaperService extends ExportPaperAbstractService {
         	}
         }
     }
+
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/BjsfExportPaperService.java

@@ -89,4 +89,10 @@ public class BjsfExportPaperService extends ExportPaperAbstractService {
         	}
         }
     }
+
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/CqdxExportPaperService.java

@@ -128,4 +128,10 @@ public class CqdxExportPaperService extends ExportPaperAbstractService {
         	}
         }
     }
+
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/DbsfExportPaperService.java

@@ -89,4 +89,10 @@ public class DbsfExportPaperService extends ExportPaperAbstractService {
         	}
         }
     }
+
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/DzkdExportPaperService.java

@@ -320,4 +320,10 @@ public class DzkdExportPaperService extends ExportPaperAbstractService {
         }
     }
 
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 }

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

@@ -354,6 +354,8 @@ public abstract class ExportPaperAbstractService {
 	 * @throws Exception
 	 */
 	public abstract void downloadPaperAnswer(String paperId,String zipFileName)throws Exception;
+	
+	public abstract PaperExp previewPDF(String paperId);
 	/**
 	 * 上传试卷相关文件
 	 * @param extractConfig
@@ -377,6 +379,19 @@ public abstract class ExportPaperAbstractService {
     	return paperExp;
     }
     
+    public PaperExp previewPDF2(String paperId){
+    	PaperExp paperExp = initPaperExpService.initPaperExp(paperId);
+    	//给新的大题下所有小题排序
+    	sortPaperDetailUnitExps(paperExp.getPaperDetails());
+    	//如果每个小题分数不一样,题干后面添加分数
+    	appendScoreToQuestionBodyHtml(paperExp.getPaperDetails());
+    	//1.设置题号 2.给小题选项进行排序 3.设置选项号 4.替换题干中的##为____
+    	setUnitExpNumberHtml(paperExp.getPaperDetails());
+    	//设置大题标题
+    	setExpDtoTitle(paperExp.getPaperDetails());
+    	return paperExp;
+    }
+    
     /**
      * 设置选项号
      * @param optionWordMl
@@ -601,6 +616,49 @@ public abstract class ExportPaperAbstractService {
 		}
 	}
 	
+	public void setUnitExpNumberHtml(List<PaperDetailExp> paperDetails) {
+		for (PaperDetailExp paperDetail : paperDetails) {
+			List<PaperDetailUnitExp> paperDetailUnitExpList = paperDetail.getPaperDetailUnits();
+			for (PaperDetailUnitExp paperDetailUnit:paperDetailUnitExpList) {
+				List<QuesOption> optionList = paperDetailUnit.getQuestion().getQuesOptions();
+				if (optionList != null && optionList.size() > 0) {
+					for (QuesOption quesOption : optionList) {
+						quesOption.setOptionBodyWord(null);
+						quesOption.setOptionBody(CommonUtils.relaceQuestionIdx(quesOption.getOptionBody().replace("###", "____"),0));
+					}
+				}
+				List<Question> subQuesList = paperDetailUnit.getQuestion().getSubQuestions();
+				Question question = paperDetailUnit.getQuestion();
+				if (subQuesList != null && subQuesList.size() > 0) {
+					//套题主题干
+					question.setQuesBodyWord(null);
+					for (Question subQues : subQuesList) {
+						Map<String, String> params = new HashMap<String, String>();
+                        params.put("number", String.valueOf(subQues.getNumber()));
+                        subQues.setQuesParams(params);
+						//处理子题题干,答案
+						subQues.setQuesBodyWord(null);
+						subQues.setQuesAnswerWord(null);
+						subQues.setQuesBodyWord(null);
+						List<QuesOption> subOptionList = subQues.getQuesOptions();
+						if (subOptionList != null && subOptionList.size() > 0) {
+							for (QuesOption quesOption : subOptionList) {
+								quesOption.setOptionBodyWord(null);
+								quesOption.setOptionBody(CommonUtils.relaceQuestionIdx(quesOption.getOptionBody().replace("###", "____"),0));
+							}
+						}
+					}
+				} else {
+					//处理非套题题干、答案
+					question.setQuesBodyWord(null);
+					question.setQuesAnswerWord(null);
+					question.setQuesBody(CommonUtils.relaceQuestionIdx(question.getQuesBody().replace("###", "____"),0));
+					question.setQuesAnswer(CommonUtils.relaceQuestionIdx(question.getQuesAnswer().replace("###", "____"),0));
+				}
+			}
+		}
+	}
+	
 	/**
 	 * 检测同一行可以放多少个选项
 	 * @param optionList
@@ -856,6 +914,13 @@ public abstract class ExportPaperAbstractService {
         return pWordMl.toString();
     }
     
+    public String appendScoreToQuestionBodyHtml(String quesBodyHtml,double score){
+    	String html = quesBodyHtml.replaceAll("<p>", "").replaceAll("</p>", "");
+    	html = "<P>" + html + "(" + score + ")分</p>"; 
+    	return html;
+    }
+    
+    
     //去掉分数后面的小数点
   	protected String deletePoint(String str) {
   		if(str.indexOf(".0")>-1){
@@ -892,6 +957,29 @@ public abstract class ExportPaperAbstractService {
     	}
     }
     
+    public void appendScoreToQuestionBodyHtml(List<PaperDetailExp> details){
+    	for(PaperDetailExp paperDetailExp:details){
+    		if(checkPaperDetailUnitScore(paperDetailExp)==null){
+    			for(PaperDetailUnitExp paperDetailUnit:paperDetailExp.getPaperDetailUnits()){
+    				//判断小题是否为套题
+    				if(paperDetailUnit.getQuestionType() == QuesStructType.NESTED_ANSWER_QUESTION){
+    					List<Question> subQuestions = paperDetailUnit.getQuestion().getSubQuestions();
+    					for(int i = 0;i < subQuestions.size();i++){
+    						Question subQuestion = subQuestions.get(i);
+							double subScore = paperDetailUnit.getSubScoreList().get(i);
+    						String questionBodyHtml = appendScoreToQuestionBodyHtml(subQuestion.getQuesBody(),subScore);
+    						subQuestion.setQuesBody(questionBodyHtml);
+    					}
+    				}else {
+    					Question question = paperDetailUnit.getQuestion();
+    					String questionBodyHtml = appendScoreToQuestionBodyHtml(question.getQuesBody(),paperDetailUnit.getScore());
+        				question.setQuesBody(questionBodyHtml);
+					}
+    			}
+    		}
+    	}
+    }
+    
     /**
      * 小题排序
      * @describle 大题排序完成之后,放在一个集合里面。然后对相同类型的大题分组,生成不同的集合,在对小题进行
@@ -1497,7 +1585,8 @@ public abstract class ExportPaperAbstractService {
      * @param paperId
      * @return
      */
-    private String findPaperType(ExtractConfig extractConfig,String paperId){
+    @SuppressWarnings("unused")
+	private String findPaperType(ExtractConfig extractConfig,String paperId){
     	String paperType = "";
     	Map<String,String> paperIdMap = extractConfig.getFinishedPaperIdMap();
     	Set<Entry<String,String>> entry = paperIdMap.entrySet();

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/FjsfExportPaperService.java

@@ -112,4 +112,10 @@ public class FjsfExportPaperService extends ExportPaperAbstractService {
         	}
         }
     }
+
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/HnsfExportPaperService.java

@@ -78,4 +78,10 @@ public class HnsfExportPaperService extends ExportPaperAbstractService {
         	}
         }
     }
+
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/HzkjExportPaperService.java

@@ -113,5 +113,11 @@ public class HzkjExportPaperService extends ExportPaperAbstractService {
 		}
 	}
 
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 }
 

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/NkdxExportPaperService.java

@@ -113,4 +113,10 @@ public class NkdxExportPaperService extends ExportPaperAbstractService {
         }
     }
 
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 }

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/RjgcExportPaperService.java

@@ -79,4 +79,10 @@ public class RjgcExportPaperService extends ExportPaperAbstractService {
         	}
         }
     }
+
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

+ 9 - 5
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/SddxExportPaperService.java

@@ -2,12 +2,7 @@ package cn.com.qmth.examcloud.core.questions.service.export;
 
 import java.io.File;
 import java.util.List;
-
-
-
-
 import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
@@ -28,6 +23,13 @@ import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
 @Service("sddxExportPaperService")
 public class SddxExportPaperService extends ExportPaperAbstractService{
 	
+	
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		PaperExp paperExp = previewPDF2(paperId);
+		return paperExp;
+	}
+	
 	@Override
     public void downloadPaper(String paperId,String zipFileName,String examType) throws Exception {
 		PaperExp paperExp = initPaperExp(paperId);
@@ -81,4 +83,6 @@ public class SddxExportPaperService extends ExportPaperAbstractService{
         	}
         }
     }
+
+	
 }

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/SxsfExportPaperService.java

@@ -99,4 +99,10 @@ public class SxsfExportPaperService extends ExportPaperAbstractService {
         	}
         }
     }
+
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/SydxExportPaperService.java

@@ -367,4 +367,10 @@ public class SydxExportPaperService extends ExportPaperAbstractService{
         }
     }
 
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 }

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/TjdxExportPaperService.java

@@ -95,4 +95,10 @@ public class TjdxExportPaperService extends ExportPaperAbstractService {
         }
     }
 
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 }

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/XnjdExportPaperService.java

@@ -99,4 +99,10 @@ public class XnjdExportPaperService extends ExportPaperAbstractService {
         	}
         }
     }
+
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/YkdxExportPaperService.java

@@ -78,5 +78,11 @@ public class YkdxExportPaperService extends ExportPaperAbstractService {
         	}
         }
     }
+
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 	
 }

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/ZgddbExportPaperService.java

@@ -89,4 +89,10 @@ public class ZgddbExportPaperService extends ExportPaperAbstractService {
         	}
         }
     }
+
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/ZgddwExportPaperService.java

@@ -90,4 +90,10 @@ public class ZgddwExportPaperService extends ExportPaperAbstractService {
         	}
         }
     }
+
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

+ 6 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/xajdExportPaperService.java

@@ -74,6 +74,12 @@ public class xajdExportPaperService extends ExportPaperAbstractService{
         	}
         }
     }
+
+	@Override
+	public PaperExp previewPDF(String paperId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 	
 }
 

+ 1 - 1
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/PaperServiceImpl.java

@@ -50,7 +50,6 @@ import cn.com.qmth.examcloud.core.print.api.CoursePaperCloudService;
 import cn.com.qmth.examcloud.core.print.api.bean.SyncCoursePaperBean;
 import cn.com.qmth.examcloud.core.print.api.request.SyncCoursePaperReq;
 import cn.com.qmth.examcloud.core.print.api.response.SyncCoursePaperResp;
-import cn.com.qmth.examcloud.core.questions.base.print.CoursePaperDto;
 import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
 import cn.com.qmth.examcloud.commons.base.util.JsonUtil;
@@ -1360,6 +1359,7 @@ public class PaperServiceImpl implements PaperService{
 		return map;
 	}
 
+	@SuppressWarnings("unused")
 	@Override
 	public String sendPrint(String paperId, String orgId, String examId) {
 		//查询原paper对象

+ 2 - 2
examcloud-core-questions-starter/src/main/resources/security-exclusions.conf

@@ -20,5 +20,5 @@ regexp:.*webjars.*
 [${api_cqb}/][/extract/getAnswerHtml/{paperId}][GET]
 [${api_cqb}/][/extract/paper/{paperId}][GET]
 [${api_cqb}/][/checkObjective/{paperId}][GET]
-[${api_cqb}/][/paper/pdf/{paperId}][GET]
-[${api_cqb}/][/paper/answer/pdf/{paperId}][GET]
+[${api_cqb}/][/paper/pdf/{paperId}/{orgName}][GET]
+[${api_cqb}/][/paper/answer/pdf/{paperId}/{orgName}][GET]

+ 0 - 0
examcloud-core-questions-starter/src/main/resources/templates/paperAnswer.ftl → examcloud-core-questions-starter/src/main/resources/templates/sddxExportPaperService_answer.ftl


+ 8 - 2
examcloud-core-questions-starter/src/main/resources/templates/paper.ftl → examcloud-core-questions-starter/src/main/resources/templates/sddxExportPaperService_paper.ftl

@@ -159,8 +159,8 @@
             <div class="secondColumn" id="secondColumn0">
                 <div class="paper_title">
                     <div style="text-align: center">
-                        <h1><span style="margin-right:20%;">网络教育学院考试</span></h1>
-                        <h3><span style="margin-right:20%;">考试试卷</span></h3>
+                        <h1><span style="margin-right:20%;">山东大学继续(网络教育</span></h1>
+                        <h3><span style="margin-right:20%;">2017年12月期末考试</span></h3>
                     </div>
                     <div>
                         <b><span>课程名称:</span><span style="color: #FF0000">${courseName!}</span>
@@ -168,6 +168,12 @@
                                     style="color: #FF0000">${courseNo!}</span>
                         </b>
                     </div>
+                    <div>
+                        <b><span>考试时间:</span><span style="color: #FF0000">90分钟</span>
+                            <span style="margin-left: 20px;">课程层次:</span><span
+                                    style="color: #FF0000">${level!}</span>
+                        </b>
+                    </div>
                     <div class="top_small">
                         <span><b>注意事项:必须按试题顺序在“答题卡”上按要求填涂、作答,答在试卷上的答案无效。</b></span>
                     </div>