fix

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/controller/ExtractConfigController.java

@@ -15,7 +15,14 @@ import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import cn.com.qmth.examcloud.api.commons.enums.AdminOperateType;
 import cn.com.qmth.examcloud.api.commons.enums.CallType;
@@ -33,7 +40,7 @@ import cn.com.qmth.examcloud.core.questions.service.ExtractConfigFileService;
 import cn.com.qmth.examcloud.core.questions.service.ExtractConfigService;
 import cn.com.qmth.examcloud.core.questions.service.bean.CouresInfo;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.ExportPaperInfoModel;
-import cn.com.qmth.examcloud.core.questions.service.bean.extract.SaveRandomPaperExtractConfigDomain;
+import cn.com.qmth.examcloud.core.questions.service.bean.extract.SaveRandomPaperExtractConfigForToolDomain;
 import cn.com.qmth.examcloud.core.questions.service.cache.ExtractConfigCache;
 import cn.com.qmth.examcloud.reports.commons.bean.AdminOperateReport;
 import cn.com.qmth.examcloud.reports.commons.util.ReportsUtil;
@@ -381,8 +388,8 @@ public class ExtractConfigController extends ControllerSupport {
 	@ResponseBody
 	@ApiOperation("随机抽卷调卷规则创建")
     @PostMapping("extract_config/randompaper/save")
-	public void saveRandomPaperExtractConfig(@RequestBody SaveRandomPaperExtractConfigDomain req) {
-    	extractConfigService.saveExtractConfigForRandomPaper(getAccessUser().getRootOrgId(),req);
+	public void saveRandomPaperExtractConfig(@RequestBody SaveRandomPaperExtractConfigForToolDomain req) {
+    	extractConfigService.saveExtractConfigForRandomPaper(req);
 	}
 
 }

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/ExtractConfigService.java

@@ -1,5 +1,10 @@
 package cn.com.qmth.examcloud.core.questions.service;
 
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.domain.Page;
+
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.api.commons.security.bean.UserDataRule;
 import cn.com.qmth.examcloud.core.questions.api.request.SaveRandomPaperExtractConfigReq;
@@ -10,12 +15,7 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
 import cn.com.qmth.examcloud.core.questions.service.bean.CouresInfo;
-import cn.com.qmth.examcloud.core.questions.service.bean.extract.SaveRandomPaperExtractConfigDomain;
-
-import org.springframework.data.domain.Page;
-
-import java.util.List;
-import java.util.Map;
+import cn.com.qmth.examcloud.core.questions.service.bean.extract.SaveRandomPaperExtractConfigForToolDomain;
 
 /**
  * @author chenken
@@ -156,6 +156,6 @@ public interface ExtractConfigService {
 
 	void saveExtractConfigForRandomPaperByOuter(SaveRandomPaperExtractConfigReq savereq);
 
-	public void saveExtractConfigForRandomPaper(Long rootOrgId, SaveRandomPaperExtractConfigDomain req);
+	public void saveExtractConfigForRandomPaper(SaveRandomPaperExtractConfigForToolDomain req);
 
 }

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/extract/SaveRandomPaperExtractConfigForToolDomain.java

@@ -0,0 +1,31 @@
+package cn.com.qmth.examcloud.core.questions.service.bean.extract;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class SaveRandomPaperExtractConfigForToolDomain {
+
+    @ApiModelProperty(value = "考试ID", required = true)
+    private Long examId;
+
+    @ApiModelProperty(value = " 课程代码", required = true)
+    private String courseCode;
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+
+}

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExtractConfigServiceImpl.java

@@ -81,7 +81,7 @@ import cn.com.qmth.examcloud.core.questions.service.bean.PaperDetailDtoAssembler
 import cn.com.qmth.examcloud.core.questions.service.bean.PaperDetailUnitDtoAssembler;
 import cn.com.qmth.examcloud.core.questions.service.bean.PaperDtoAssembler;
 import cn.com.qmth.examcloud.core.questions.service.bean.SubQuestionDtoAssembler;
-import cn.com.qmth.examcloud.core.questions.service.bean.extract.SaveRandomPaperExtractConfigDomain;
+import cn.com.qmth.examcloud.core.questions.service.bean.extract.SaveRandomPaperExtractConfigForToolDomain;
 import cn.com.qmth.examcloud.core.questions.service.bean.randompaper.RandomPaperListVo;
 import cn.com.qmth.examcloud.core.questions.service.cache.ExtractConfigCache;
 import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
@@ -1503,19 +1503,17 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 
     @Transactional
 	@Override
-	public void saveExtractConfigForRandomPaper(Long rootOrgId, SaveRandomPaperExtractConfigDomain req) {
-    	if(rootOrgId==null) {
-    		throw new StatusException("rootOrgId不能为空");
+	public void saveExtractConfigForRandomPaper(SaveRandomPaperExtractConfigForToolDomain req) {
+    	if(req.getExamId()==null) {
+    		throw new StatusException("ExamId不能为空");
     	}
     	GetExamReq examReq=new GetExamReq();
-    	examReq.setRootOrgId(rootOrgId);
     	examReq.setId(req.getExamId());
-    	examReq.setName(req.getExamName());
-    	examReq.setCode(req.getExamCode());
     	GetExamResp examRes=examCloudService.getExam(examReq);
     	if(ExamType.OFFLINE.name().equals(examRes.getExamBean().getExamType())) {
     		throw new StatusException("不能对离线考试创建调卷规则");
     	}
+    	Long rootOrgId=examRes.getExamBean().getRootOrgId();
     	Course course = courseService.getCourse(rootOrgId, req.getCourseCode());
     	GetExamCourseReq settingReq = new GetExamCourseReq();
         settingReq.setExamId(examRes.getExamBean().getId());