|
@@ -4,14 +4,16 @@ import com.miaxis.common.constant.Constants;
|
|
|
import com.miaxis.common.core.controller.BaseController;
|
|
|
import com.miaxis.common.core.domain.Response;
|
|
|
import com.miaxis.common.core.page.ResponsePageInfo;
|
|
|
-import com.miaxis.question.domain.QuestionInfo;
|
|
|
+import com.miaxis.question.domain.QuestionColumn;
|
|
|
import com.miaxis.question.domain.QuestionInfoKtNew;
|
|
|
import com.miaxis.question.dto.QuestionInfoFreeDTO;
|
|
|
+import com.miaxis.question.dto.QuestionInfoNewDTO;
|
|
|
import com.miaxis.question.dto.QuestionInfoNewTestDTO;
|
|
|
-import com.miaxis.question.dto.QuestionInfoTestDTO;
|
|
|
+import com.miaxis.question.service.IQuestionColumnService;
|
|
|
import com.miaxis.question.service.IQuestionInfoKtNewService;
|
|
|
-import com.miaxis.question.service.IQuestionInfoService;
|
|
|
import io.swagger.annotations.Api;
|
|
|
+import io.swagger.annotations.ApiImplicitParam;
|
|
|
+import io.swagger.annotations.ApiImplicitParams;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
@@ -36,6 +38,9 @@ public class CommonQuestionInfoNewController extends BaseController{
|
|
|
@Autowired
|
|
|
private IQuestionInfoKtNewService questionInfoKtNewService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IQuestionColumnService questionColumnService;
|
|
|
+
|
|
|
/**
|
|
|
* 查询模拟考试科目1与4题库
|
|
|
*/
|
|
@@ -65,5 +70,43 @@ public class CommonQuestionInfoNewController extends BaseController{
|
|
|
List<QuestionInfoKtNew> list = questionInfoKtNewService.selectFreeQuestionInfo(freeDTO);
|
|
|
return toResponsePageInfo(list);
|
|
|
}
|
|
|
+
|
|
|
+ @GetMapping(value = "/getQuestionColumn")
|
|
|
+ @ApiOperation("获取题库分类")
|
|
|
+ public Response<List<QuestionColumn>> getQuestionColumn(@ModelAttribute QuestionColumn questionColumn){
|
|
|
+ List<QuestionColumn> list = questionColumnService.selectQuestionColumnList(questionColumn);
|
|
|
+ return Response.success(list);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 查询题库列表
|
|
|
+ */
|
|
|
+ @GetMapping("/list")
|
|
|
+ @ApiOperation("查询题库列表")
|
|
|
+ @ApiImplicitParams({
|
|
|
+ @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
|
|
|
+ @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
|
|
|
+ })
|
|
|
+ public ResponsePageInfo<QuestionInfoKtNew> list(@ModelAttribute QuestionInfoNewDTO questionInfoNewDTO){
|
|
|
+ startPage();
|
|
|
+ List<QuestionInfoKtNew> list = questionInfoKtNewService.selectQuestionInfoList(questionInfoNewDTO);
|
|
|
+ return toResponsePageInfo(list);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取题库详细信息多个题库
|
|
|
+ */
|
|
|
+ @GetMapping(value = "/getQuestionInfoByIds")
|
|
|
+ @ApiOperation("获取题库详细信息批量取题")
|
|
|
+ @ApiImplicitParams({
|
|
|
+ @ApiImplicitParam(name = "ids",value = "题目ids" ,dataType = "List", required = true)})
|
|
|
+ public ResponsePageInfo<QuestionInfoKtNew> getQuestionInfoByIds(Long[] ids){
|
|
|
+ List<QuestionInfoKtNew> list = questionInfoKtNewService.selectQuestionInfoListByIds(ids);
|
|
|
+ return toResponsePageInfo(list);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|