diff --git a/web-client/src/main/java/com/zcloud/edu/dto/resource/QuestionAddCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/resource/QuestionAddCmd.java index d8515e3..a1f9ad8 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/resource/QuestionAddCmd.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/resource/QuestionAddCmd.java @@ -29,7 +29,7 @@ public class QuestionAddCmd extends Command { private String examPaperId; @ApiModelProperty(value = "试题类型（1单选题、2多选题、3判断题）", name = "questionType", required = true) - @NotEmpty(message = "试题类型（单选题、多选题、判断题）不能为空") + @NotNull(message = "试题类型（单选题、多选题、判断题）不能为空") private Integer questionType; @ApiModelProperty(value = "题干", name = "questionDry", required = true) diff --git a/web-client/src/main/java/com/zcloud/edu/dto/resource/QuestionUpdateCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/resource/QuestionUpdateCmd.java index 0093f3a..7bbcaef 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/resource/QuestionUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/resource/QuestionUpdateCmd.java @@ -25,9 +25,6 @@ public class QuestionUpdateCmd extends Command { @NotNull(message = "id不能为空") private Long id; - @ApiModelProperty(value = "主键id", name = "questionId", required = true) - private String questionId; - @ApiModelProperty(value = "课件id", name = "videoCoursewareId") private String videoCoursewareId; @@ -35,7 +32,7 @@ public class QuestionUpdateCmd extends Command { private String examPaperId; @ApiModelProperty(value = "试题类型（1单选题、2多选题、3判断题）", name = "questionType", required = true) - @NotEmpty(message = "试题类型（单选题、多选题、判断题）不能为空") + @NotNull(message = "试题类型（单选题、多选题、判断题）不能为空") private Integer questionType; @ApiModelProperty(value = "题干", name = "questionDry", required = true) diff --git a/web-client/src/main/java/com/zcloud/edu/dto/resource/VideoCoursewareUpdateCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/resource/VideoCoursewareUpdateCmd.java index 4725a32..1322df3 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/resource/VideoCoursewareUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/resource/VideoCoursewareUpdateCmd.java @@ -25,9 +25,7 @@ public class VideoCoursewareUpdateCmd extends Command { @ApiModelProperty(value = "id", name = "id", required = true) @NotNull(message = "id不能为空") private Long id; - @ApiModelProperty(value = "业务主键id", name = "videoCoursewareId", required = true) - @NotEmpty(message = "业务主键id不能为空") - private String videoCoursewareId; + @ApiModelProperty(value = "课件名称", name = "coursewareName", required = true) @NotEmpty(message = "课件名称不能为空") @@ -47,9 +45,7 @@ public class VideoCoursewareUpdateCmd extends Command { @ApiModelProperty(value = "课件描述", name = "coursewareIntroduce", required = true) @NotEmpty(message = "课件描述不能为空") private String coursewareIntroduce; - @ApiModelProperty(value = "课件状态 0未启用, 1-启用", name = "state", required = true) - @NotNull(message = "课件状态 0未启用, 1-启用不能为空") - private Integer state; + @ApiModelProperty(value = "课件时长(视频时间)-秒", name = "videoTime", required = true) @NotNull(message = "课件时长(视频时间)-秒不能为空") private BigDecimal videoTime; diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/enums/QuestionJudgeAnswerTypeEnum.java b/web-domain/src/main/java/com/zcloud/edu/domain/enums/QuestionJudgeAnswerTypeEnum.java new file mode 100644 index 0000000..736d2cf --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/edu/domain/enums/QuestionJudgeAnswerTypeEnum.java @@ -0,0 +1,45 @@ +package com.zcloud.edu.domain.enums; + +import lombok.Getter; + +/** + * 习题判断题答案 类型枚举 + * T 是true + * F 是false + */ +@Getter +public enum QuestionJudgeAnswerTypeEnum { + TRUE("T", "对","A"), + FALSE("F", "错","B"), + + + ; + private final String code; + private final String name; + private final String answer; + + + QuestionJudgeAnswerTypeEnum(String code, String name, String answer) { + this.code = code; + this.name = name; + this.answer = answer; + } + //根据传入值，判断是否是在code 中 + public static boolean isTrueOrFalse(String code) { + for (QuestionJudgeAnswerTypeEnum value : QuestionJudgeAnswerTypeEnum.values()) { + if (value.getCode().equals(code)) { + return true; + } + } + return false; + } + //根据codde获取answer + public static String getAnswerByCode(String code) { + for (QuestionJudgeAnswerTypeEnum value : QuestionJudgeAnswerTypeEnum.values()) { + if (value.getCode().equals(code)) { + return value.getAnswer(); + } + } + return null; + } +} diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/QuestionE.java b/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/QuestionE.java index 89697f5..b00a848 100644 --- a/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/QuestionE.java +++ b/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/QuestionE.java @@ -6,6 +6,7 @@ import com.alibaba.cola.exception.BizException; import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.domain.model.BaseE; import com.zcloud.edu.domain.enums.CoursewareTypeEnum; +import com.zcloud.edu.domain.enums.QuestionJudgeAnswerTypeEnum; import com.zcloud.edu.domain.enums.QuestionTypeEnum; import com.zcloud.gbscommon.excelEntity.QuestionVideoChoiceExcelImportEntity; import com.zcloud.gbscommon.excelEntity.QuestionVideoJudgeExcelImportEntity; @@ -60,12 +61,12 @@ public class QuestionE extends BaseE { private BigDecimal score; public void checkQuestion(QuestionE questionE) { - if (questionE.getCoursewareType() == 1) { + if (CoursewareTypeEnum.VIDEO_COURSEWARE.getCode().equals(questionE.getCoursewareType())) { // 视频课件 if (questionE.getVideoCoursewareId() == null) { throw new RuntimeException("请选择正确的视频课件"); } - } else if (questionE.getCoursewareType() == 2) { + } else if (CoursewareTypeEnum.EXAM_QUESTION.getCode().equals(questionE.getCoursewareType())) { // 试卷习题 if (questionE.getExamPaperId() == null) { throw new RuntimeException("请选择正确的试卷"); @@ -200,6 +201,11 @@ public class QuestionE extends BaseE { if(CoursewareTypeEnum.EXAM_QUESTION.getCode().equals(coursewareType)){ if (StringUtils.isEmpty(entity.getScore())) { errList.add("判断题第" + (i + 2) + "行分值不能为空"); + }else{ + //不为空的话，判断是否是T F + if(!QuestionJudgeAnswerTypeEnum.isTrueOrFalse(entity.getAnswer())){ + errList.add("判断题第" + (i + 2) + "行答案格式错误"); + } } } } @@ -265,7 +271,10 @@ public class QuestionE extends BaseE { questionE.setQuestionId(UuidUtil.get32UUID()); questionE.setQuestionType(QuestionTypeEnum.JUDGE.getCode()); questionE.setQuestionDry(entity.getQuestionDry()); + questionE.setOptionA("对"); + questionE.setOptionB("错"); questionE.setAnswer(entity.getAnswer()); + questionE.setAnswer(QuestionJudgeAnswerTypeEnum.getAnswerByCode(entity.getAnswer())); questionE.setDescr(entity.getDescr()); questionE.setCoursewareType(coursewareType); if(CoursewareTypeEnum.VIDEO_COURSEWARE.getCode().equals(coursewareType)){