|
@@ -48,6 +48,8 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import cn.com.qmth.examcloud.core.print.api.CoursePaperCloudService;
|
|
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.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.print.CoursePaperDto;
|
|
import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
|
|
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.core.questions.base.word.DocxProcessUtil;
|
|
@@ -157,6 +159,9 @@ public class PaperServiceImpl implements PaperService{
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private PrintCoursePaperClient printCoursePaperClient;
|
|
private PrintCoursePaperClient printCoursePaperClient;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
|
|
+ private CoursePaperCloudService coursePaperCloudService1;
|
|
|
|
|
|
@Value("${upyun.radioType}")
|
|
@Value("${upyun.radioType}")
|
|
private String radioType;
|
|
private String radioType;
|
|
@@ -1282,7 +1287,7 @@ public class PaperServiceImpl implements PaperService{
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public Map<String, Object> getPaperPDF(String paperId) {
|
|
|
|
|
|
+ public Map<String, Object> getPaperPDF(String paperId,String type) {
|
|
PaperExp paperExp = getPaperDto(paperId);
|
|
PaperExp paperExp = getPaperDto(paperId);
|
|
Map<String, Object> map = new HashMap<String, Object>();
|
|
Map<String, Object> map = new HashMap<String, Object>();
|
|
map.put("courseName", paperExp.getCourseName());
|
|
map.put("courseName", paperExp.getCourseName());
|
|
@@ -1300,35 +1305,53 @@ public class PaperServiceImpl implements PaperService{
|
|
if(paperDetail.getPaperDetailUnits() != null && paperDetail.getPaperDetailUnits().size()>0){
|
|
if(paperDetail.getPaperDetailUnits() != null && paperDetail.getPaperDetailUnits().size()>0){
|
|
for(PaperDetailUnitExp paperDetailUnitExp:paperDetail.getPaperDetailUnits()){
|
|
for(PaperDetailUnitExp paperDetailUnitExp:paperDetail.getPaperDetailUnits()){
|
|
Question question = paperDetailUnitExp.getQuestion();
|
|
Question question = paperDetailUnitExp.getQuestion();
|
|
- //添加题干
|
|
|
|
- String questionBody = CommonUtils.deleteHtmlP(paperDetailUnitExp.getNumber()+"."+question.getQuesBody()+"("+paperDetailUnitExp.getScore()+"分)");
|
|
|
|
- htmlList.add("<p class='questionBody'>"+questionBody+"</p>");
|
|
|
|
- //判断是否为选择题
|
|
|
|
- if(paperDetailUnitExp.getQuestionType()==QuesStructType.SINGLE_ANSWER_QUESTION || paperDetailUnitExp.getQuestionType()==QuesStructType.MULTIPLE_ANSWER_QUESTION){
|
|
|
|
- for(QuesOption quesOption:question.getQuesOptions()){
|
|
|
|
- //添加选项
|
|
|
|
- String questionOption = CommonUtils.deleteHtmlP(CommonUtils.getOptionNum(Integer.parseInt(quesOption.getNumber())-1)+"."+quesOption.getOptionBody());
|
|
|
|
- htmlList.add("<p class='selectOption'>"+questionOption+"</p>");
|
|
|
|
|
|
+ if(type.equals("paper")){
|
|
|
|
+ //添加题干
|
|
|
|
+ String questionBody = CommonUtils.deleteHtmlP(paperDetailUnitExp.getNumber()+"."+question.getQuesBody()+"("+paperDetailUnitExp.getScore()+"分)");
|
|
|
|
+ htmlList.add("<p class='questionBody'>"+questionBody+"</p>");
|
|
|
|
+ //判断是否为选择题
|
|
|
|
+ if(paperDetailUnitExp.getQuestionType()==QuesStructType.SINGLE_ANSWER_QUESTION || paperDetailUnitExp.getQuestionType()==QuesStructType.MULTIPLE_ANSWER_QUESTION){
|
|
|
|
+ for(QuesOption quesOption:question.getQuesOptions()){
|
|
|
|
+ //添加选项
|
|
|
|
+ String questionOption = CommonUtils.deleteHtmlP(CommonUtils.getOptionNum(Integer.parseInt(quesOption.getNumber())-1)+"."+quesOption.getOptionBody());
|
|
|
|
+ htmlList.add("<p class='selectOption'>"+questionOption+"</p>");
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- }
|
|
|
|
- //判断是否为套题
|
|
|
|
- if(paperDetailUnitExp.getQuestionType()==QuesStructType.NESTED_ANSWER_QUESTION){
|
|
|
|
- //得到子题
|
|
|
|
- List<Question> subQuestions = question.getSubQuestions();
|
|
|
|
- for(Question subQuestion:subQuestions){
|
|
|
|
- //添加子题题干
|
|
|
|
- String subQuestionBody = CommonUtils.deleteHtmlP(subQuestion.getQuesParams().get("number")+"."+subQuestion.getQuesBody()+"("+subQuestion.getScore()+"分)");
|
|
|
|
- htmlList.add("<p class='questionBody'>"+subQuestionBody+"</p>");
|
|
|
|
- //判断是否为选择题
|
|
|
|
- if(subQuestion.getQuestionType()==QuesStructType.SINGLE_ANSWER_QUESTION || subQuestion.getQuestionType()==QuesStructType.MULTIPLE_ANSWER_QUESTION){
|
|
|
|
- for(QuesOption quesOption:subQuestion.getQuesOptions()){
|
|
|
|
- //添加选项
|
|
|
|
- String questionOption = CommonUtils.deleteHtmlP(CommonUtils.getOptionNum(Integer.parseInt(quesOption.getNumber())-1)+"."+quesOption.getOptionBody());
|
|
|
|
- htmlList.add("<p class='selectOption'>"+questionOption+"</p>");
|
|
|
|
|
|
+ //判断是否为套题
|
|
|
|
+ if(paperDetailUnitExp.getQuestionType()==QuesStructType.NESTED_ANSWER_QUESTION){
|
|
|
|
+ //得到子题
|
|
|
|
+ List<Question> subQuestions = question.getSubQuestions();
|
|
|
|
+ for(Question subQuestion:subQuestions){
|
|
|
|
+ //添加子题题干
|
|
|
|
+ String subQuestionBody = CommonUtils.deleteHtmlP(subQuestion.getQuesParams().get("number")+"."+subQuestion.getQuesBody()+"("+subQuestion.getScore()+"分)");
|
|
|
|
+ htmlList.add("<p class='questionBody'>"+subQuestionBody+"</p>");
|
|
|
|
+ //判断是否为选择题
|
|
|
|
+ if(subQuestion.getQuestionType()==QuesStructType.SINGLE_ANSWER_QUESTION || subQuestion.getQuestionType()==QuesStructType.MULTIPLE_ANSWER_QUESTION){
|
|
|
|
+ for(QuesOption quesOption:subQuestion.getQuesOptions()){
|
|
|
|
+ //添加选项
|
|
|
|
+ String questionOption = CommonUtils.deleteHtmlP(CommonUtils.getOptionNum(Integer.parseInt(quesOption.getNumber())-1)+"."+quesOption.getOptionBody());
|
|
|
|
+ htmlList.add("<p class='selectOption'>"+questionOption+"</p>");
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ }else {
|
|
|
|
+ //判断是否为套题
|
|
|
|
+ if(paperDetailUnitExp.getQuestionType()==QuesStructType.NESTED_ANSWER_QUESTION){
|
|
|
|
+ //得到子题
|
|
|
|
+ List<Question> subQuestions = question.getSubQuestions();
|
|
|
|
+ for(Question subQuestion:subQuestions){
|
|
|
|
+ //添加答案
|
|
|
|
+ String questionAnswer = CommonUtils.deleteHtmlP(subQuestion.getNumber()+"."+subQuestion.getQuesAnswer()+"("+subQuestion.getScore()+"分)");
|
|
|
|
+ htmlList.add("<p class='questionAnswer'>"+questionAnswer+"</p>");
|
|
|
|
+ }
|
|
|
|
+ }else {
|
|
|
|
+ //添加答案
|
|
|
|
+ String questionAnswer = CommonUtils.deleteHtmlP(paperDetailUnitExp.getNumber()+"."+question.getQuesAnswer()+"("+paperDetailUnitExp.getScore()+"分)");
|
|
|
|
+ htmlList.add("<p class='questionAnswer'>"+questionAnswer+"</p>");
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1349,8 +1372,10 @@ public class PaperServiceImpl implements PaperService{
|
|
bean.setCourseName(paper.getCourse().getName());
|
|
bean.setCourseName(paper.getCourse().getName());
|
|
bean.setPaperId(paper.getId());
|
|
bean.setPaperId(paper.getId());
|
|
bean.setPaperName(paper.getName());
|
|
bean.setPaperName(paper.getName());
|
|
-
|
|
|
|
- return "";
|
|
|
|
|
|
+ SyncCoursePaperReq req = new SyncCoursePaperReq();
|
|
|
|
+ req.setBean(bean);
|
|
|
|
+ SyncCoursePaperResp resp = coursePaperCloudService.syncCoursePaper(req);
|
|
|
|
+ return "success";
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|