Merge branch 'dev_v3.0.1' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v3.0.1

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/EvaluationParameters.java

@@ -2,6 +2,7 @@ package com.qmth.distributed.print.business.bean.marking;
 
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -11,12 +12,15 @@ import java.util.List;
  */
 public class EvaluationParameters {
     @ApiModelProperty(value = "基础试卷信息")
+    @NotNull(message = "缺少基础试卷信息")
     private BasicPaperInfo basicPaperInfo;
 
     @ApiModelProperty(value = "试卷结构信息")
+    @NotNull(message = "缺少试卷结构信息")
     private PaperStructureInfo paperStructureInfo;
 
     @ApiModelProperty(value = "分组信息")
+    @NotNull(message = "缺少分组信息")
     private List<GroupInfo> groupInfo;
 
     public BasicPaperInfo getBasicPaperInfo() {

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

@@ -2,6 +2,7 @@ package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.distributed.print.business.bean.marking.EvaluationParameters;
 import com.qmth.distributed.print.business.entity.ExamPaperStructure;
 import com.qmth.distributed.print.business.enums.ExamPaperStructureStatusEnum;
 import org.springframework.web.multipart.MultipartFile;
@@ -33,5 +34,5 @@ public interface ExamPaperStructureService extends IService<ExamPaperStructure>
     /**
      * 评卷参数提交
      */
-    void submitExamPaperParams(String evaluationParameters);
+    void submitExamPaperParams(EvaluationParameters evaluationParameters);
 }

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

@@ -275,8 +275,8 @@ public class ExamPaperStructureServiceImpl extends ServiceImpl<ExamPaperStructur
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void submitExamPaperParams(String evaluationParameters) {
-        EvaluationParameters e = JSONObject.parseObject(evaluationParameters, EvaluationParameters.class);
+    public void submitExamPaperParams(EvaluationParameters evaluationParameters) {
+
         // TODO: 2022/4/13 1.保存试卷结构
         // TODO: 2022/4/13 2.保存分组信息 
         // TODO: 2022/4/13 3.保存分组和评卷员的关系 

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

@@ -3,23 +3,25 @@ package com.qmth.distributed.print.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.distributed.print.business.bean.marking.EvaluationParameters;
+import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.entity.ExamPaperStructure;
 import com.qmth.distributed.print.business.service.DataSyncService;
 import com.qmth.distributed.print.business.service.ExamPaperStructureService;
+import com.qmth.teachcloud.common.bean.params.BasicMajorParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import com.qmth.teachcloud.common.util.ServletUtil;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.util.List;
@@ -78,6 +80,18 @@ public class ExamPaperStructureController {
         return ResultUtil.ok(String.valueOf(examPaper.getId()), null);
     }
 
+    @ApiOperation(value = "评卷参数-提交")
+    @RequestMapping(value = "/submit", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = EditResult.class)})
+    public Result submitExamPaperParams(@Valid @RequestBody EvaluationParameters evaluationParameters, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
+        }
+        examPaperStructureService.submitExamPaperParams(evaluationParameters);
+        // 异步推送云阅卷
+        return ResultUtil.ok();
+    }
+
     /**
      * 上传标答文件
      *
@@ -108,5 +122,7 @@ public class ExamPaperStructureController {
         return ResultUtil.ok(list);
     }
 
+
+
 }
 

distributed-print/src/test/java/com/qmth/distributed/print/ExamPaperStructureServiceTest.java

@@ -1,5 +1,7 @@
 package com.qmth.distributed.print;
 
+import com.alibaba.fastjson.JSONObject;
+import com.qmth.distributed.print.business.bean.marking.EvaluationParameters;
 import com.qmth.distributed.print.business.service.ExamPaperStructureService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -242,7 +244,8 @@ public class ExamPaperStructureServiceTest {
                 "\t\t}\n" +
                 "\t]\n" +
                 "}";
-        examPaperStructureService.submitExamPaperParams(e);
+        EvaluationParameters x = JSONObject.parseObject(e, EvaluationParameters.class);
+        examPaperStructureService.submitExamPaperParams(x);
     }
 
 }