weiwenhai 6 жил өмнө
parent
commit
b81238e5fd

+ 0 - 7
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/controller/DefaultPaperController.java

@@ -1,7 +1,5 @@
 package cn.com.qmth.examcloud.core.questions.api.controller;
 
-import java.util.List;
-import java.util.Set;
 
 import io.swagger.annotations.ApiOperation;
 
@@ -17,14 +15,9 @@ import org.springframework.web.bind.annotation.RestController;
 import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
-import cn.com.qmth.examcloud.core.questions.api.bean.PaperK12Bean;
-import cn.com.qmth.examcloud.core.questions.api.request.GetDefaultQuesionsReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetExtractConfigReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetPaperReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
-import cn.com.qmth.examcloud.core.questions.api.response.GetPaperResp;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
-import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 import cn.com.qmth.examcloud.core.questions.service.PaperProviderService;
 import cn.com.qmth.examcloud.question.core.paper.DefaultPaper;
 

+ 28 - 1
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/controller/DefaultQuesionController.java

@@ -23,6 +23,7 @@ import cn.com.qmth.examcloud.core.questions.api.request.GetDefaultQuesionReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetDefaultQuesionsReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionReq;
+import cn.com.qmth.examcloud.core.questions.service.ExtractConfigProviderService;
 import cn.com.qmth.examcloud.core.questions.service.QuestionProviderService;
 import cn.com.qmth.examcloud.question.core.question.DefaultQuestion;
 
@@ -38,7 +39,10 @@ import cn.com.qmth.examcloud.question.core.question.DefaultQuestion;
 public class DefaultQuesionController extends ControllerSupport {
 
 	@Autowired
-	QuestionProviderService questionProviderService;
+	private QuestionProviderService questionProviderService;
+	
+	@Autowired
+	private ExtractConfigProviderService extractConfigExamService;
 	
 	@ApiOperation(value = "外部接口保存单个试题", notes = "外部接口保存单个试题")
     @PostMapping("/save")
@@ -95,4 +99,27 @@ public class DefaultQuesionController extends ControllerSupport {
 		List<DefaultQuestion> defaultQuestions = questionProviderService.findQuestions(questionIds);
 		return new ResponseEntity<Object>(defaultQuestions,HttpStatus.OK);
 	}
+	
+	@ApiOperation(value = "查询试题")
+	@PostMapping("/question")
+	public ResponseEntity<Object> findOne(@RequestBody GetQuestionReq questionReq){
+		Long examId = questionReq.getExamId();
+		if (null == examId) {
+			throw new StatusException("Q-010078", "examId is null");
+		}
+		String courseCode = questionReq.getCourseCode(); 
+		if(StringUtils.isBlank(courseCode)){
+			throw new StatusException("Q-010082", "courseCode is null");
+		}
+		String groupCode = questionReq.getGroupCode();
+		if(StringUtils.isBlank(groupCode)){
+			throw new StatusException("Q-010086", "groupCode is null");
+		}
+		String questionId = questionReq.getQuestionId();
+		if(StringUtils.isBlank(questionId)){
+			throw new StatusException("Q-010090", "questionId is null");
+		}
+		DefaultQuestion defaultQuestion = extractConfigExamService.getDefaultQuestion(examId, courseCode, groupCode, questionId);
+		return new ResponseEntity<Object>(defaultQuestion,HttpStatus.OK);
+	}
 }

+ 0 - 2
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/provider/HandleSyncCloudServiceProvider.java

@@ -26,8 +26,6 @@ import cn.com.qmth.examcloud.commons.api.response.SyncOrgResp;
 import cn.com.qmth.examcloud.commons.api.response.SyncSpecialtyResp;
 import cn.com.qmth.examcloud.commons.api.response.SyncStudentResp;
 import cn.com.qmth.examcloud.commons.base.exception.StatusException;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.dao.ExtractConfigRepo;

+ 1 - 1
examcloud-core-questions-starter/src/main/java/cn/com/qmth/examcloud/core/questions/starter/config/DefaultWebMvcConfigurerAdapter.java

@@ -48,7 +48,7 @@ public class DefaultWebMvcConfigurerAdapter extends WebMvcConfigurerAdapter {
 
 		SpringCloudInterceptor springCloudInterceptor = new SpringCloudInterceptor();
 		springCloudInterceptor.setRedisClient(redisClient);
-		//registry.addInterceptor(springCloudInterceptor).addPathPatterns("/**");
+		registry.addInterceptor(springCloudInterceptor).addPathPatterns("/**");
 
 		RequestPermissionInterceptor requestPermissionInterceptor = getRequestPermissionInterceptor();
 		requestPermissionInterceptor.configureAndWatch("security-exclusions.conf");

+ 2 - 1
examcloud-core-questions-starter/src/main/resources/security-mapping.properties

@@ -1 +1,2 @@
-[s][${api_cqb}/][/paper/export/{id}/{exportContentList}/{orgName}/{loginName}/{examType}][GET]=true
+[s][${api_cqb}/][/paper/export/{id}/{exportContentList}/{orgName}/{loginName}/{examType}][GET]=true
+[s][${api_cqb}/][/default_question/question][POST]=true