From eb41f4c328df97ec896b329fa3d6c33a2f8e1f2b Mon Sep 17 00:00:00 2001 From: wgf <121463602@qq.com> Date: Thu, 27 Jul 2023 18:28:04 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AF=95=E9=A2=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/题库导入模板.xlsx | Bin 10894 -> 10725 bytes .../jlw/service/ResourcesQuestionService.java | 120 +++++++++--------- 2 files changed, 61 insertions(+), 59 deletions(-) diff --git a/web/filesystem/template/题库导入模板.xlsx b/web/filesystem/template/题库导入模板.xlsx index 7a16c3c3baf7772c6bcad9ebc60b22a6a65f23b4..c78cef88d46dec477902209d69f347fa96947859 100644 GIT binary patch delta 6374 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 KkYM?1=zjnh{Jn4h delta 6538 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 diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java index 57422a9c..7a1d2f0a 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java @@ -378,7 +378,7 @@ public class ResourcesQuestionService extends CoreBaseService //获取最大列数 int colNum = firstRow.getPhysicalNumberOfCells(); - String[] columns = {"归属课程", "理论课程分类", "归属章节", "题型", "分值", "题干", "选项A", "选项B", "选项C", "选项D", "选项E", "答案", "解析"}; + String[] columns = {"归属课程", "归属章节", "题型", "分值", "题干", "选项A", "选项B", "选项C", "选项D", "选项E", "答案", "解析"}; Map map = new HashMap<>();//获取需要的表头的列 @@ -400,7 +400,7 @@ public class ResourcesQuestionService extends CoreBaseService } } if (flag != columns.length) { - return JsonResult.failMessage("导入失败，表格表头应包含 \"归属课程\",\"理论课程分类\",\"归属章节\",\"题型\",\"分值\",\"题干\",\"选项A\",\"选项B\",\"选项C\",\"选项D\",\"选项E\",\"答案\",\"解析\""); + return JsonResult.failMessage("导入失败，表格表头应包含 \"归属课程\",\"归属章节\",\"题型\",\"分值\",\"题干\",\"选项A\",\"选项B\",\"选项C\",\"选项D\",\"选项E\",\"答案\",\"解析\""); } int count = 0; @@ -426,26 +426,26 @@ public class ResourcesQuestionService extends CoreBaseService continue; } String courseInfoName = getCellFormatValue(row.getCell(map.get(columns[0]))); - String courseLabelName = getCellFormatValue(row.getCell(map.get(columns[1]))); - String chapterName = getCellFormatValue(row.getCell(map.get(columns[2]))); - String questionType = getCellFormatValue(row.getCell(map.get(columns[3]))); +// String courseLabelName = getCellFormatValue(row.getCell(map.get(columns[1]))); + String chapterName = getCellFormatValue(row.getCell(map.get(columns[1]))); + String questionType = getCellFormatValue(row.getCell(map.get(columns[2]))); if (StringUtils.isNotBlank(questionType)) { questionType = questionType.replace("题", "").trim(); } - String questionScore = getCellFormatValue(row.getCell(map.get(columns[4]))); - String questionStem = getCellFormatValue(row.getCell(map.get(columns[5]))); + String questionScore = getCellFormatValue(row.getCell(map.get(columns[3]))); + String questionStem = getCellFormatValue(row.getCell(map.get(columns[4]))); - String questionOptionA = getCellFormatValue(row.getCell(map.get(columns[6]))); - String questionOptionB = getCellFormatValue(row.getCell(map.get(columns[7]))); - String questionOptionC = getCellFormatValue(row.getCell(map.get(columns[8]))); - String questionOptionD = getCellFormatValue(row.getCell(map.get(columns[9]))); - String questionOptionE = getCellFormatValue(row.getCell(map.get(columns[10]))); + String questionOptionA = getCellFormatValue(row.getCell(map.get(columns[5]))); + String questionOptionB = getCellFormatValue(row.getCell(map.get(columns[6]))); + String questionOptionC = getCellFormatValue(row.getCell(map.get(columns[7]))); + String questionOptionD = getCellFormatValue(row.getCell(map.get(columns[8]))); + String questionOptionE = getCellFormatValue(row.getCell(map.get(columns[9]))); - String questionAnswer = getCellFormatValue(row.getCell(map.get(columns[11]))); + String questionAnswer = getCellFormatValue(row.getCell(map.get(columns[10]))); questionAnswer = answerFormat(questionType, questionAnswer);//格式化 - String questionAnalysis = getCellFormatValue(row.getCell(map.get(columns[12]))); + String questionAnalysis = getCellFormatValue(row.getCell(map.get(columns[11]))); if (StringUtils.isBlank(questionScore)) { questionScore = "1";//默认一分 @@ -460,7 +460,7 @@ public class ResourcesQuestionService extends CoreBaseService errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[0]) + 1) + "列，第" + (i + 1) + "行课程为空"}); continue; } else if (StringUtils.isBlank(chapterName)) { - errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[2]) + 1) + "列，第" + (i + 1) + "行归属章节为空"}); + errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[1]) + 1) + "列，第" + (i + 1) + "行归属章节为空"}); continue; } //else if (courseInfoName.split("__ID").length != 2) { @@ -468,25 +468,25 @@ public class ResourcesQuestionService extends CoreBaseService // continue; //} else if (StringUtils.isBlank(questionType)) { - errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[3]) + 1) + "列，第" + (i + 1) + "行题型为空"}); + errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[2]) + 1) + "列，第" + (i + 1) + "行题型为空"}); continue; } else if (!ToolUtils.findInSet("单选,多选,判断", questionType)) { - errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[3]) + 1) + "列，第" + (i + 1) + "行题型异常"}); + errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[2]) + 1) + "列，第" + (i + 1) + "行题型异常"}); continue; } else if (StringUtils.isBlank(questionScore)) { - errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[4]) + 1) + "列，第" + (i + 1) + "行分值为空"}); + errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[3]) + 1) + "列，第" + (i + 1) + "行分值为空"}); continue; } else if (StringUtils.isBlank(questionStem)) { - errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[5]) + 1) + "列，第" + (i + 1) + "行题干为空"}); + errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[4]) + 1) + "列，第" + (i + 1) + "行题干为空"}); continue; } else if (StringUtils.isBlank(questionAnswer)) { - errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[11]) + 1) + "列，第" + (i + 1) + "行答案为空"}); + errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[10]) + 1) + "列，第" + (i + 1) + "行答案为空"}); continue; } else if (StringUtils.isNotBlank(m)) { errMsg.add(new String[]{"第" + (i + 1) + "行" + m}); continue; } else if (!NumberUtil.isNumber(questionScore)) { - errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[4]) + 1) + "列，第" + (i + 1) + "行分值数值格式错误"}); + errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[3]) + 1) + "列，第" + (i + 1) + "行分值数值格式错误"}); continue; } else { questionAnswer = questionAnswer.trim(); @@ -496,9 +496,9 @@ public class ResourcesQuestionService extends CoreBaseService questionScore = questionScore.trim(); questionStem = questionStem.trim(); questionAnswer = questionAnswer.trim(); - if (!StringUtils.isBlank(courseLabelName)) { - courseLabelName = courseLabelName.trim(); - } +// if (!StringUtils.isBlank(courseLabelName)) { +// courseLabelName = courseLabelName.trim(); +// } //去掉最后一个逗号 @@ -527,40 +527,42 @@ public class ResourcesQuestionService extends CoreBaseService //没有课程，添加课程 if (CollectionUtils.isEmpty(courseInfoList)) { - if (StringUtils.isBlank(courseLabelName)) { - errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[1]) + 1) + "列，第" + (i + 1) + "行此课程不存在，并且理论课程分类栏目为空"}); - continue; - } - CourseLabel courseLabel = new CourseLabel(); - courseLabel.setCourseLabelType(THEORY.getType()); - courseLabel.setCourseLabelName(courseLabelName.trim()); - courseLabel.setCourseLabelStatus(1); - CourseLabel once = courseLabelService.getOnce(courseLabel); - if (once == null) { - errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[1]) + 1) + "列，第" + (i + 1) + "行此课程不存在，并且理论课程分类栏目的数据在数据库中检索为空"}); - continue; - } - CourseInfoQuery paras = new CourseInfoQuery(); - paras.setCourseInfoType(1); - paras.setCourseLabelId(once.getCourseLabelId()); - paras.setCourseInfoStatus(2); - paras.setCourseInfoName(courseInfoName); - paras.setOrgId(coreUser.getOrgId()); - paras.setUserId(coreUser.getId()); - paras.setAddTime(now); - paras.setCourseInfoType(1); - paras.setCourseInfoContent(courseInfoName); - - CourseInfo addCourseInfo = courseInfoService.add(paras); - - if (addCourseInfo == null || addCourseInfo.getCourseInfoId() == null) { - errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[0]) + 1) + "列，第" + (i + 1) + "行添加课程到系统失败"}); - continue; - } - //移除缓存 - courseInfoService.flushCache(addCourseInfo.getCourseInfoId()); - corePlatformService.clearDictCache(); - courseInfoCache.put(courseInfoName, addCourseInfo); + errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[0]) + 1) + "列，第" + (i + 1) + "行此课程不存在"}); + continue; +// if (StringUtils.isBlank(courseLabelName)) { +// errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[1]) + 1) + "列，第" + (i + 1) + "行此课程不存在，并且理论课程分类栏目为空"}); +// continue; +// } +// CourseLabel courseLabel = new CourseLabel(); +// courseLabel.setCourseLabelType(THEORY.getType()); +// courseLabel.setCourseLabelName(courseLabelName.trim()); +// courseLabel.setCourseLabelStatus(1); +// CourseLabel once = courseLabelService.getOnce(courseLabel); +// if (once == null) { +// errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[1]) + 1) + "列，第" + (i + 1) + "行此课程不存在，并且理论课程分类栏目的数据在数据库中检索为空"}); +// continue; +// } +// CourseInfoQuery paras = new CourseInfoQuery(); +// paras.setCourseInfoType(1); +// paras.setCourseLabelId(once.getCourseLabelId()); +// paras.setCourseInfoStatus(2); +// paras.setCourseInfoName(courseInfoName); +// paras.setOrgId(coreUser.getOrgId()); +// paras.setUserId(coreUser.getId()); +// paras.setAddTime(now); +// paras.setCourseInfoType(1); +// paras.setCourseInfoContent(courseInfoName); +// +// CourseInfo addCourseInfo = courseInfoService.add(paras); +// +// if (addCourseInfo == null || addCourseInfo.getCourseInfoId() == null) { +// errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[0]) + 1) + "列，第" + (i + 1) + "行添加课程到系统失败"}); +// continue; +// } +// //移除缓存 +// courseInfoService.flushCache(addCourseInfo.getCourseInfoId()); +// corePlatformService.clearDictCache(); +// courseInfoCache.put(courseInfoName, addCourseInfo); } else { courseInfoCache.put(courseInfoName, courseInfoList.get(0)); List chapterList = new ArrayList<>(); @@ -616,7 +618,7 @@ public class ResourcesQuestionService extends CoreBaseService CourseInfo addChild = courseInfoService.add(child); if (addChild == null || addChild.getCourseInfoId() == null) { - errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[2]) + 1) + "列，第" + (i + 1) + "行添加章节到系统失败"}); + errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[1]) + 1) + "列，第" + (i + 1) + "行添加章节到系统失败"}); continue; } //移除缓存