阅卷待办短信

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/GenericExamCardModelFourParams.java

@@ -6,7 +6,6 @@ import com.qmth.distributed.print.business.enums.ExamCardStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -24,33 +23,26 @@ public class GenericExamCardModelFourParams implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "题卡标题")
-    @NotNull(message = "题卡标题不能为空")
     private String title;
 
     @ApiModelProperty(value = "考试id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "考试id不能为空")
     private Long examId;
 
     @ApiModelProperty(value = "课程id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "课程id不能为空")
     private Long courseId;
 
     @ApiModelProperty(value = "题卡内容附件")
-    @NotNull(message = "题卡内容附件不能为空")
     private MultipartFile contentFile;
 
     @ApiModelProperty(value = "题卡内容附件md5")
-    @NotNull(message = "题卡内容附件md5不能为空")
     private String contentMd5;
 
     @ApiModelProperty(value = "题卡html附件")
-    @NotNull(message = "题卡html附件不能为空")
     private MultipartFile htmlContentFile;
 
     @ApiModelProperty(value = "题卡html附件md5")
-    @NotNull(message = "题卡html附件md5不能为空")
     private String htmlContentMd5;
 
     @ApiModelProperty(value = "备注")
@@ -58,15 +50,12 @@ public class GenericExamCardModelFourParams implements Serializable {
 
     @ApiModelProperty(value = "题卡规则id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "题卡规则id不能为空")
     private Long cardRuleId;
 
     @ApiModelProperty(value = "STAGE-暂存，SUBMIT-提交")
-    @NotNull(message = "提交状态不能为空")
     private ExamCardStatusEnum status;
 
     @ApiModelProperty(value = "题卡纸张大小（A3，8K）")
-    @NotNull(message = "题卡纸张大小不能为空")
     private String pageSize;
 
     public Long getId() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamCardModelFourServiceImpl.java

@@ -108,13 +108,23 @@ public class ExamCardModelFourServiceImpl extends ServiceImpl<ExamCardModelFourM
     @Override
     @Transactional
     public Map<String, String> saveGeneric(GenericExamCardModelFourParams params) throws Exception {
+        Objects.requireNonNull(params, "题卡信息不能为空");
+        Objects.requireNonNull(params.getExamId(), "考试id不能为空");
+        Objects.requireNonNull(params.getCourseId(), "课程id不能为空");
+        Objects.requireNonNull(params.getTitle(), "题卡标题不能为空");
+        Objects.requireNonNull(params.getContentFile(), "题卡内容附件不能为空");
+        Objects.requireNonNull(params.getContentMd5(), "题卡内容附件md5不能为空");
+        Objects.requireNonNull(params.getHtmlContentFile(), "题卡html附件不能为空");
+        Objects.requireNonNull(params.getHtmlContentMd5(), "题卡html附件md5不能为空");
+        Objects.requireNonNull(params.getCardRuleId(), "题卡规则id不能为空");
+        Objects.requireNonNull(params.getStatus(), "提交状态不能为空");
+        Objects.requireNonNull(params.getPageSize(), "题卡纸张大小不能为空");
+
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-
         ExamCardModelFour examCardModelFour = null;
         concurrentService.getReadWriteLock(LockType.CUSTOM_MODEL_FOUR_CARD_SAVE + "-" + schoolId + CardTypeEnum.CUSTOM + params.getTitle()).writeLock().tryLock();
         try {
-
             QueryWrapper<ExamCardModelFour> checkTitleQueryWrapper = new QueryWrapper<>();
             checkTitleQueryWrapper.lambda().eq(ExamCardModelFour::getSchoolId, schoolId)
                     .eq(ExamCardModelFour::getTitle, params.getTitle().trim());
@@ -183,7 +193,7 @@ public class ExamCardModelFourServiceImpl extends ServiceImpl<ExamCardModelFourM
                 printFinishService.insertMarkQuestion(dto.getExamId(), dto.getCourseId(), dto.getPaperNumber(), examCardModelFour.getContent(), null);
                 // 生成并保存卡格式文件（后缀为.json）
                 ScanAnswerCard scanAnswerCard = printFinishService.insertScanAnswerCard(dto, examCardModelFour.getId().toString(), examCardModelFour.getContent());
-                if (scanAnswerCard != null) {
+                if (Objects.nonNull(scanAnswerCard)) {
                     printFinishService.insertScanAnswerCardQuestion(dto.getExamId(), dto.getPaperNumber(), examCardModelFour.getContent(), scanAnswerCard.getNumber());
                 }
             }

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamCardModelFourController.java

@@ -94,7 +94,7 @@ public class ExamCardModelFourController {
     @ApiOperation(value = "批量导出题卡文件")
     @RequestMapping(value = "/batch_download_card", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "批量导出题卡文件", response = EditResult.class)})
-    public void batchDownloadCard(@ApiParam(value = "主键", required = true) @RequestParam(value = "id") List<Long> ids) {
+    public void batchDownloadCard(@ApiParam(value = "主键", required = true) @RequestParam(value = "ids") List<Long> ids) {
         examCardModelFourService.batchDownloadCard(ids);
     }
 }