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

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseWareApi.java

@@ -9,6 +9,7 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,6 +29,7 @@ import com.xboe.module.course.service.ICourseFileService;
  */
 @RestController
 @RequestMapping(value = "/xboe/m/course/cware")
+@Slf4j
 public class CourseWareApi extends ApiBaseController {
 
 	private String cookieName = "PLAYSIGN_TIME";
@@ -131,6 +133,8 @@ public class CourseWareApi extends ApiBaseController {
 		// 第一个/前端是时间
 		int index = signStr.indexOf("/");
 		if (index <= 0) {
+			log.info("解密后的字符串:"+signStr);
+			log.info("解密后的字符串的时间拼接:"+index);
 			return badRequest("验证错误");
 		}
 
@@ -138,9 +142,13 @@ public class CourseWareApi extends ApiBaseController {
 		String cfid = signStr.substring(index+1);// 文件路径
 
 		if (!time.equals(cookieTime)) {
+			log.info("请求头时间和解析后的时间对比:"+"解析时间:"+time+"    请求头时间："+cookieTime);
+			log.info("解密后的字符串的时间拼接:"+signStr);
 			return badRequest("验证错误");
 		}
 		if(StringUtils.isBlank(cfid) || cfid.length()<10) {
+			log.info("查看时间文件路径："+cfid);
+			log.info("解密后的字符串的时间拼接:"+signStr);
 			return badRequest("验证错误");
 		}
 

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

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

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

@@ -166,118 +166,258 @@ public class ExamQuestionApi extends ApiBaseController {
                 return badRequest("请上传正确的试题文件");
             }
             //获取表头
-            Row row = sheetAt.getRow(1);
+            Row row ;
             //从第二行开始获取数据
             List<ExamQuestion> examQuestions1 = new ArrayList<>();
             QuestionDto questionDto = new QuestionDto();
+            if(sheetAt.getRow(1).getCell(0).getStringCellValue().equals("标题(*)") && !sheetAt.getRow(1).getCell(0).getStringCellValue().equals("")){
+                row = sheetAt.getRow(1);
+                for (int i = 2;i<sheetAt.getPhysicalNumberOfRows();i++) {
+                    //获取每一行
 
-            for (int i=2;i<sheetAt.getPhysicalNumberOfRows();i++) {
+                    Row row1 = sheetAt.getRow(i);
-                //获取每一行
+                    if(row1==null || row1.getCell(0)==null){
-
+                        break;
-                Row row1 = sheetAt.getRow(i);
+                    }
-                if(row1==null || row1.getCell(0)==null){
+                    if(StringUtil.isBlank(row1.getCell(0).getStringCellValue())){
-                    break;
+                        break;
-                }
+                    }
-                if(StringUtil.isBlank(row1.getCell(0).getStringCellValue())){
+                    ExamQuestion examQuestion = new ExamQuestion();
-                    break;
+                    examQuestion.setTitle(row1.getCell(0).getStringCellValue());
-                }
+                    if(row1.getCell(1).getStringCellValue().equals("单选题")){
-                ExamQuestion examQuestion = new ExamQuestion();
+                        examQuestion.setType(1);
-                examQuestion.setTitle(row1.getCell(0).getStringCellValue());
+                    }
-                if(row1.getCell(1).getStringCellValue().equals("单选题")){
+                    if(row1.getCell(1).getStringCellValue().equals("多选题")){
-                    examQuestion.setType(1);
+                        examQuestion.setType(2);
-                }
+                    }
-                if(row1.getCell(1).getStringCellValue().equals("多选题")){
+                    if(row1.getCell(2).getStringCellValue().equals("中")){
-                    examQuestion.setType(2);
+                        examQuestion.setDifficulty(2f);
-                }
+                    }else if(row1.getCell(2).getStringCellValue().equals("难")){
-                examQuestion.setKnowledge(row1.getCell(2).getStringCellValue());
+                        examQuestion.setDifficulty(3f);
-                if(row1.getCell(3).getStringCellValue().equals("中")){
+                    } else if(row1.getCell(2).getStringCellValue().equals("易")){
-                    examQuestion.setDifficulty(2f);
+                        examQuestion.setDifficulty(1f);
-                }
+                    }else  if(row1.getCell(2).getStringCellValue().equals("")){
-                if(row1.getCell(3).getStringCellValue().equals("难")){
+                        examQuestion.setDifficulty(null);
-                    examQuestion.setDifficulty(3f);
+                    }
-                }
+                    Cell cell = row1.getCell(3);
-                if(row1.getCell(3).getStringCellValue().equals("低")){
+                    cell.setCellType(CellType.STRING);
-                    examQuestion.setDifficulty(1f);
-                }
-                Cell cell = row1.getCell(4);
-                cell.setCellType(CellType.STRING);
 
 //                examQuestion.setDefaultScore(Float.valueOf(cell.getStringCellValue()));
 
-                //单选
+                    //单选
-                if (!cell.getStringCellValue().contains(",")){
+                    if (!cell.getStringCellValue().contains(",")){
-                    examQuestion.setAnswer(row1.getCell(6).getStringCellValue());
+                        examQuestion.setAnswer(row1.getCell(5).getStringCellValue());
-                    examQuestion.setDefaultScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
+                        if (row1.getCell(3).getStringCellValue().isEmpty()){
-                    Cell cell1 = row1.getCell(5, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+                            examQuestion.setDefaultScore(null);
-                    cell1.setCellType(CellType.STRING);
+                        }else {
-                    examQuestion.setAnalysis(cell1.getStringCellValue());
+                            examQuestion.setDefaultScore(Float.valueOf(row1.getCell(3).getStringCellValue()));
+                        }
+                        Cell cell1 = row1.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+                        cell1.setCellType(CellType.STRING);
+                        examQuestion.setAnalysis(cell1.getStringCellValue());
 
-                    List<ExamOption> examOptions = new ArrayList<>();
+                        List<ExamOption> examOptions = new ArrayList<>();
-                    for (int j=7;j<=13;j++) {
+                        for (int j=6;j<=12;j++) {
 
-                        if(row1.getCell(j)!=null) {
+                            if(row1.getCell(j)!=null) {
-                            ExamOption examOption = new ExamOption();
+                                ExamOption examOption = new ExamOption();
 //                            截取表头
-                            String substring = row.getCell(j).getStringCellValue().substring(3, 4);
+                                String substring = row.getCell(j).getStringCellValue().substring(3, 4);
-                            if (row1.getCell(6).getStringCellValue().contains(substring)) {
+                                if (row1.getCell(5).getStringCellValue().contains(substring)) {
 
-                                examOption.setIsAnswer(true);
+                                    examOption.setIsAnswer(true);
-                                examOption.setScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
+                                    if (row1.getCell(3).getStringCellValue().isEmpty()){
-                            } else {
+                                        examOption.setScore(null);
-                                examOption.setIsAnswer(false);
+                                    }else {
-                            }
+                                        examOption.setScore(Float.valueOf(row1.getCell(3).getStringCellValue()));
-                            if (examOption.getIsAnswer()) {
+                                    }
-                                examOption.setScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
+                                } else {
-                            }
+                                    examOption.setIsAnswer(false);
+                                }
+                                if (examOption.getIsAnswer()) {
+                                    if (row1.getCell(3).getStringCellValue().isEmpty()){
+                                        examOption.setScore(null);
+                                    }else {
+                                        examOption.setScore(Float.valueOf(row1.getCell(3).getStringCellValue()));
+                                    }
+                                }
 
-                            examOption.setOptions(row.getCell(j).getStringCellValue());
+                                examOption.setOptions(row.getCell(j).getStringCellValue());
 
-                            Cell cell2 = row1.getCell(j);
+                                Cell cell2 = row1.getCell(j);
-                            cell2.setCellType(CellType.STRING);
+                                cell2.setCellType(CellType.STRING);
-                            examOption.setContent(cell2.getStringCellValue());
+                                examOption.setContent(cell2.getStringCellValue());
 
-                            if (examOption != null && StringUtil.isNotBlank(examOption.getContent())) {
+                                if (examOption != null && StringUtil.isNotBlank(examOption.getContent())) {
-                                examOptions.add(examOption);
+                                    examOptions.add(examOption);
+                                }
                             }
                         }
-                    }
 
-                    examQuestion.setOptionList(examOptions);
+                        examQuestion.setOptionList(examOptions);
-                    examQuestions1.add(examQuestion);
+                        examQuestions1.add(examQuestion);
-                }
+                    }
-                //多选 多选的默认分存的是最大分
+                    //多选 多选的默认分存的是最大分
-                else{
+                    else{
-                    String stringCellValue = row1.getCell(4).getStringCellValue();
+                        String stringCellValue = row1.getCell(4).getStringCellValue();
-                    String[] strings = stringCellValue.split(",");
+                        String[] strings = stringCellValue.split(",");
 //                    String[] strings = new String[stringCellValue.length()];
-                    String max=strings[0];
+                        String max=strings[0];
-                    for (int j=0;j<strings.length;j++) {
+                        for (int j=0;j<strings.length;j++) {
-                        if(Float.valueOf(max)<Float.valueOf(strings[j])){
+                            if(Float.valueOf(max)<Float.valueOf(strings[j])){
-                            max=strings[j];
+                                max=strings[j];
-                        }
-                    }
-                    examQuestion.setDefaultScore(Float.valueOf(max));
-                    Cell cell1 = row1.getCell(5, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
-                    cell1.setCellType(CellType.STRING);
-                    examQuestion.setAnalysis(cell1.getStringCellValue());
-                    examQuestion.setAnswer(row1.getCell(6).getStringCellValue());
-                    List<ExamOption> examOptions = new ArrayList<>();
-                    //A
-                    for (int j=7;j<=13;j++){
-                        if(row1.getCell(j)!=null && StringUtil.isNotBlank(row1.getCell(j).getStringCellValue())){
-                            ExamOption examOption=new ExamOption();
-                            examOption.setOptions(row.getCell(j).getStringCellValue());
-                            examOption.setContent(row1.getCell(j).getStringCellValue());
-                            examOption.setIsAnswer(true);
-                            examOption.setScore(Float.valueOf(strings[j-7]));
-                            if(examOption!=null && StringUtil.isNotBlank(examOption.getContent())){
-                                examOptions.add(examOption);
                             }
+                        }
+                        examQuestion.setDefaultScore(Float.valueOf(max));
+                        Cell cell1 = row1.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+                        cell1.setCellType(CellType.STRING);
+                        examQuestion.setAnalysis(cell1.getStringCellValue());
+                        examQuestion.setAnswer(row1.getCell(5).getStringCellValue());
+                        List<ExamOption> examOptions = new ArrayList<>();
+                        //A
+                        for (int j=6;j<=12;j++){
+                            if(row1.getCell(j)!=null && StringUtil.isNotBlank(row1.getCell(j).getStringCellValue())){
+                                ExamOption examOption=new ExamOption();
+                                examOption.setOptions(row.getCell(j).getStringCellValue());
+                                examOption.setContent(row1.getCell(j).getStringCellValue());
+                                examOption.setIsAnswer(true);
+                                examOption.setScore(Float.valueOf(strings[j-6]));
+                                if(examOption!=null && StringUtil.isNotBlank(examOption.getContent())){
+                                    examOptions.add(examOption);
+                                }
 
+                            }
+                        }
+                        examQuestion.setOptionList(examOptions);
+                        examQuestions1.add(examQuestion);
+                    }
+                }
+            }else {
+                row = sheetAt.getRow(2);
+                for (int i = 3;i<sheetAt.getPhysicalNumberOfRows();i++) {
+                    //获取每一行
+
+                    Row row1 = sheetAt.getRow(i);
+                    if(row1==null || row1.getCell(0)==null){
+                        break;
+                    }
+                    if(StringUtil.isBlank(row1.getCell(0).getStringCellValue())){
+                        break;
+                    }
+                    ExamQuestion examQuestion = new ExamQuestion();
+                    examQuestion.setTitle(row1.getCell(0).getStringCellValue());
+                    if(row1.getCell(1).getStringCellValue().equals("单选题")){
+                        examQuestion.setType(1);
+                    }
+                    if(row1.getCell(1).getStringCellValue().equals("多选题")){
+                        examQuestion.setType(2);
+                    }
+                    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);
                         }
                     }
-                    examQuestion.setOptionList(examOptions);
+                    Cell cell = row1.getCell(3);
-                    examQuestions1.add(examQuestion);
+                    cell.setCellType(CellType.STRING);
+
+//                examQuestion.setDefaultScore(Float.valueOf(cell.getStringCellValue()));
+
+                    //单选
+                    if (!cell.getStringCellValue().contains(",")){
+                        examQuestion.setAnswer(row1.getCell(5).getStringCellValue());
+                        if (row1.getCell(3).getStringCellValue().isEmpty()){
+                            examQuestion.setDefaultScore(null);
+                        }else {
+                            examQuestion.setDefaultScore(Float.valueOf(row1.getCell(3).getStringCellValue()));
+                        }
+                        Cell cell1 = row1.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+                        cell1.setCellType(CellType.STRING);
+                        examQuestion.setAnalysis(cell1.getStringCellValue());
+
+                        List<ExamOption> examOptions = new ArrayList<>();
+                        for (int j=6;j<=12;j++) {
+
+                            if(row1.getCell(j)!=null) {
+                                ExamOption examOption = new ExamOption();
+//                            截取表头
+                                String substring = row.getCell(j).getStringCellValue().substring(3, 4);
+                                if (row1.getCell(5).getStringCellValue().contains(substring)) {
+
+                                    examOption.setIsAnswer(true);
+                                    if (row1.getCell(3).getStringCellValue().isEmpty()){
+                                        examOption.setScore(null);
+                                    }else {
+                                        examOption.setScore(Float.valueOf(row1.getCell(3).getStringCellValue()));
+                                    }
+                                } else {
+                                    examOption.setIsAnswer(false);
+                                }
+                                if (examOption.getIsAnswer()) {
+                                    if (row1.getCell(3).getStringCellValue().isEmpty()){
+                                        examOption.setScore(null);
+                                    }else {
+                                        examOption.setScore(Float.valueOf(row1.getCell(3).getStringCellValue()));
+                                    }
+                                }
+
+                                examOption.setOptions(row.getCell(j).getStringCellValue());
+
+                                Cell cell2 = row1.getCell(j);
+                                cell2.setCellType(CellType.STRING);
+                                examOption.setContent(cell2.getStringCellValue());
+
+                                if (examOption != null && StringUtil.isNotBlank(examOption.getContent())) {
+                                    examOptions.add(examOption);
+                                }
+                            }
+                        }
+
+                        examQuestion.setOptionList(examOptions);
+                        examQuestions1.add(examQuestion);
+                    }
+                    //多选 多选的默认分存的是最大分
+                    else{
+                        String stringCellValue = row1.getCell(4).getStringCellValue();
+                        String[] strings = stringCellValue.split(",");
+//                    String[] strings = new String[stringCellValue.length()];
+                        String max=strings[0];
+                        for (int j=0;j<strings.length;j++) {
+                            if(Float.valueOf(max)<Float.valueOf(strings[j])){
+                                max=strings[j];
+                            }
+                        }
+                        examQuestion.setDefaultScore(Float.valueOf(max));
+                        Cell cell1 = row1.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+                        cell1.setCellType(CellType.STRING);
+                        examQuestion.setAnalysis(cell1.getStringCellValue());
+                        examQuestion.setAnswer(row1.getCell(5).getStringCellValue());
+                        List<ExamOption> examOptions = new ArrayList<>();
+                        //A
+                        for (int j=6;j<=13;j++){
+                            if(row1.getCell(j)!=null && StringUtil.isNotBlank(row1.getCell(j).getStringCellValue())){
+                                ExamOption examOption=new ExamOption();
+                                examOption.setOptions(row.getCell(j).getStringCellValue());
+                                examOption.setContent(row1.getCell(j).getStringCellValue());
+                                examOption.setIsAnswer(true);
+                                examOption.setScore(Float.valueOf(strings[j-6]));
+                                if(examOption!=null && StringUtil.isNotBlank(examOption.getContent())){
+                                    examOptions.add(examOption);
+                                }
+
+                            }
+                        }
+                        examQuestion.setOptionList(examOptions);
+                        examQuestions1.add(examQuestion);
+                    }
                 }
             }
             //判断题  只存在试题表中
@@ -300,27 +440,30 @@ public class ExamQuestionApi extends ApiBaseController {
                 ExamQuestion examQuestion1 = new ExamQuestion();
                 examQuestion1.setTitle(row2.getCell(0).getStringCellValue());
                 examQuestion1.setType(3);
-                examQuestion1.setKnowledge(row2.getCell(1).getStringCellValue());
+                System.out.println("1+++++++"+row2.getCell(1));
-                if(row2.getCell(2).getStringCellValue().equals("中")){
+                if(row2.getCell(1).getStringCellValue().equals("中")){
                     examQuestion1.setDifficulty(2f);
-                }
+                }else if(row2.getCell(1).getStringCellValue().equals("难")){
-                if(row2.getCell(2).getStringCellValue().equals("难")){
                     examQuestion1.setDifficulty(3f);
-                }
+                } else if(row2.getCell(1).getStringCellValue().equals("易")){
-                if(row2.getCell(2).getStringCellValue().equals("易")){
                     examQuestion1.setDifficulty(1f);
+                }else  if(row2.getCell(1).getStringCellValue().equals("")){
+                    examQuestion1.setDifficulty(null);
                 }
-                Cell cell1 = row2.getCell(3);
+                Cell cell1 = row2.getCell(2);
                 cell1.setCellType(CellType.STRING);
-                examQuestion1.setDefaultScore(Float.valueOf(cell1.getStringCellValue()));
+                if (row2.getCell(2).getStringCellValue().isEmpty()){
-                
+                    examQuestion1.setDefaultScore(null);
-                if(row2.getCell(4)!=null) {
+                }else {
-                	examQuestion1.setAnalysis(row2.getCell(4).getStringCellValue());
+                    examQuestion1.setDefaultScore(Float.valueOf(row2.getCell(2).getStringCellValue()));
+                }
+                if(row2.getCell(3)!=null) {
+                	examQuestion1.setAnalysis(row2.getCell(3).getStringCellValue());
                 }else {
                 	examQuestion1.setAnalysis("");
                 }
                 
-                String cvalue=row2.getCell(5).getStringCellValue();
+                String cvalue=row2.getCell(4).getStringCellValue();
                 examQuestion1.setAnswer(cvalue.equals("正确")? "true":"false");
                 if(examQuestion1!=null){
                     examQuestions2.add(examQuestion1);