hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-13 04:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'java-servse-yx/zcwy0912-llf' into zcwy0912-llf

Browse Source
This commit is contained in:
zhaolongfei
2024-10-21 11:07:47 +08:00
parent 70a87ac812 5285506f0f
commit a8ce10c575
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java
View File

@@ -354,17 +354,17 @@ public class AloneExamApi extends ApiBaseController {
if(StringUtils.isBlank(paperJson)) {
return badRequest("此考试无试卷内容，考试已经过期或试卷已被删除");
}
}
try {
List<TestQuestionVo> qlist=this.randomQuestion(examTest, paperJson);
ObjectMapper objectMapper = new ObjectMapper();
paperJson=objectMapper.writeValueAsString(qlist);
} catch (XaskException e) {
log.error("生成试卷错误",e);
return error("生成考试试卷错误",e.getMessage(),map);
} catch (JsonProcessingException e) {
log.error("生成试卷，解析生成json错误",e);
return error("生成考试试卷解析错误",e.getMessage(),map);
try {
List<TestQuestionVo> qlist=this.randomQuestion(examTest, paperJson);
ObjectMapper objectMapper = new ObjectMapper();
paperJson=objectMapper.writeValueAsString(qlist);
} catch (XaskException e) {
log.error("生成试卷错误",e);
return error("生成考试试卷错误",e.getMessage(),map);
} catch (JsonProcessingException e) {
log.error("生成试卷，解析生成json错误",e);
return error("生成考试试卷解析错误",e.getMessage(),map);
}
}
map.put("paper", paperJson);
long end=System.currentTimeMillis();

19
servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java
View File

@@ -312,14 +312,19 @@ public class ExamQuestionApi extends ApiBaseController {
if(row1.getCell(1).getStringCellValue().equals("多选题")){
examQuestion.setType(2);
}
if(row1.getCell(2).getStringCellValue().equals("中")){
examQuestion.setDifficulty(2f);
}else if(row1.getCell(2).getStringCellValue().equals("难")){
examQuestion.setDifficulty(3f);
} else if(row1.getCell(2).getStringCellValue().equals("易")){
examQuestion.setDifficulty(1f);
}else if(row1.getCell(2).getStringCellValue().equals("")){
log.debug("row1.getCell(2) = " + row1.getCell(2));
if (row1.getCell(2)==null ||row1.getCell(2).getStringCellValue() == null || row1.getCell(2).getStringCellValue().equals("")){
examQuestion.setDifficulty(null);
}else{
if( row1.getCell(2).getStringCellValue().equals("中")){
examQuestion.setDifficulty(2f);
}else if(row1.getCell(2).getStringCellValue().equals("难")){
examQuestion.setDifficulty(3f);
} else if(row1.getCell(2).getStringCellValue().equals("易")){
examQuestion.setDifficulty(1f);
}else if(row1.getCell(2).getStringCellValue().equals("")){
examQuestion.setDifficulty(null);
}
}
Cell cell = row1.getCell(3);
cell.setCellType(CellType.STRING);