From ec71a0849d06393003c4fb6eb78c81bf5c67ca21 Mon Sep 17 00:00:00 2001 From: WenG <450292408@qq.com> Date: Tue, 24 May 2022 00:29:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E8=AF=95=E9=A2=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../question/PaperQuestionController.java | 46 +++++++++++++- .../{ => question}/IPaperQuestionDao.java | 11 +++- .../{ => question}/PaperQuestionDTO.java | 45 ++++++------- .../pojo/pos/paper/PaperQuestionPO.java | 10 +-- .../paper/question/IPaperQuestionService.java | 36 +++++++++++ .../impl/PaperQuestionServiceImpl.java | 42 +++++++++++++ .../{ => question}/paper-question-mapper.xml | 63 +++++++++++++++++-- .../templates/paper/question/list.html | 14 ++--- 8 files changed, 221 insertions(+), 46 deletions(-) rename module-examine/src/main/java/ink/wgink/module/examine/dao/paper/{ => question}/IPaperQuestionDao.java (79%) rename module-examine/src/main/java/ink/wgink/module/examine/pojo/dtos/paper/{ => question}/PaperQuestionDTO.java (69%) create mode 100644 module-examine/src/main/java/ink/wgink/module/examine/service/paper/question/IPaperQuestionService.java create mode 100644 module-examine/src/main/java/ink/wgink/module/examine/service/paper/question/impl/PaperQuestionServiceImpl.java rename module-examine/src/main/resources/mybatis/mapper/paper/{ => question}/paper-question-mapper.xml (53%) diff --git a/module-examine/src/main/java/ink/wgink/module/examine/controller/api/paper/question/PaperQuestionController.java b/module-examine/src/main/java/ink/wgink/module/examine/controller/api/paper/question/PaperQuestionController.java index 1d2b1682..6705b9f5 100644 --- a/module-examine/src/main/java/ink/wgink/module/examine/controller/api/paper/question/PaperQuestionController.java +++ b/module-examine/src/main/java/ink/wgink/module/examine/controller/api/paper/question/PaperQuestionController.java @@ -1,10 +1,23 @@ package ink.wgink.module.examine.controller.api.paper.question; +import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; -import io.swagger.annotations.Api; +import ink.wgink.module.examine.pojo.dtos.paper.question.PaperQuestionDTO; +import ink.wgink.module.examine.service.paper.question.IPaperQuestionService; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResultList; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.Map; + /** * @ClassName: PaperQuestionController * @Description: 试卷试题 @@ -15,8 +28,37 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "试卷试题接口") @RestController @RequestMapping(ISystemConstant.API_PREFIX + "/paper/question") -public class PaperQuestionController { +public class PaperQuestionController extends DefaultBaseController { + @Autowired + private IPaperQuestionService paperQuestionService; + @ApiOperation(value = "试卷试题列表", notes = "试卷试题列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "paperId", value = "试卷ID", paramType = "path"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list/paper-id/{paperId}") + public List listPage(@PathVariable("paperId") String paperId) throws SearchException { + Map params = requestParams(); + return paperQuestionService.list(paperId, params); + } + + @ApiOperation(value = "试卷试题分页列表", notes = "试卷试题分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "paperId", value = "试卷ID", paramType = "path"), + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpage/paper-id/{paperId}") + public SuccessResultList> listPage(@PathVariable("paperId") String paperId, ListPage page) throws SearchException { + Map params = requestParams(); + page.setParams(params); + return paperQuestionService.listPage(paperId, page); + } } diff --git a/module-examine/src/main/java/ink/wgink/module/examine/dao/paper/IPaperQuestionDao.java b/module-examine/src/main/java/ink/wgink/module/examine/dao/paper/question/IPaperQuestionDao.java similarity index 79% rename from module-examine/src/main/java/ink/wgink/module/examine/dao/paper/IPaperQuestionDao.java rename to module-examine/src/main/java/ink/wgink/module/examine/dao/paper/question/IPaperQuestionDao.java index c2cc3d9c..1220e5f9 100644 --- a/module-examine/src/main/java/ink/wgink/module/examine/dao/paper/IPaperQuestionDao.java +++ b/module-examine/src/main/java/ink/wgink/module/examine/dao/paper/question/IPaperQuestionDao.java @@ -1,4 +1,4 @@ -package ink.wgink.module.examine.dao.paper; +package ink.wgink.module.examine.dao.paper.question; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; @@ -6,6 +6,7 @@ import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; import ink.wgink.interfaces.init.IInitBaseTable; import ink.wgink.module.examine.pojo.dtos.paper.PaperDTO; +import ink.wgink.module.examine.pojo.dtos.paper.question.PaperQuestionDTO; import org.springframework.stereotype.Repository; import java.util.List; @@ -53,4 +54,12 @@ public interface IPaperQuestionDao extends IInitBaseTable { */ List listPO(Map params) throws SearchException; + /** + * 列表 + * + * @param params + * @return + * @throws SearchException + */ + List list(Map params) throws SearchException; } diff --git a/module-examine/src/main/java/ink/wgink/module/examine/pojo/dtos/paper/PaperQuestionDTO.java b/module-examine/src/main/java/ink/wgink/module/examine/pojo/dtos/paper/question/PaperQuestionDTO.java similarity index 69% rename from module-examine/src/main/java/ink/wgink/module/examine/pojo/dtos/paper/PaperQuestionDTO.java rename to module-examine/src/main/java/ink/wgink/module/examine/pojo/dtos/paper/question/PaperQuestionDTO.java index 37271e7c..b244e529 100644 --- a/module-examine/src/main/java/ink/wgink/module/examine/pojo/dtos/paper/PaperQuestionDTO.java +++ b/module-examine/src/main/java/ink/wgink/module/examine/pojo/dtos/paper/question/PaperQuestionDTO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.examine.pojo.dtos.paper; +package ink.wgink.module.examine.pojo.dtos.paper.question; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -14,25 +14,23 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel public class PaperQuestionDTO { - @ApiModelProperty(name = "paperQuestionId", value = "试卷问题ID") + @ApiModelProperty(name = "paperQuestionId", value = "试卷试题ID") private String paperQuestionId; @ApiModelProperty(name = "paperId", value = "试卷ID") private String paperId; - @ApiModelProperty(name = "paperName", value = "试卷名称") - private String paperName; - @ApiModelProperty(name = "questionId", value = "问题") + @ApiModelProperty(name = "questionId", value = "试题ID") private String questionId; - @ApiModelProperty(name = "questionSubject", value = "问题题目") + @ApiModelProperty(name = "questionSort", value = "试题排序") + private String questionSort; + @ApiModelProperty(name = "questionSubject", value = "试题题目") private String questionSubject; - @ApiModelProperty(name = "questionType", value = "问题种类") + @ApiModelProperty(name = "questionType", value = "试题种类") private String questionType; - @ApiModelProperty(name = "questionChoiceType", value = "问题选择类别") + @ApiModelProperty(name = "questionChoiceType", value = "试题选择类别") private String questionChoiceType; - @ApiModelProperty(name = "questionAnalysis", value = "问题解析") - private String questionAnalysis; @ApiModelProperty(name = "questionDifficulty", value = "难度") private String questionDifficulty; - @ApiModelProperty(name = "questionSource", value = "问题来源") + @ApiModelProperty(name = "questionSource", value = "试题来源") private String questionSource; public String getPaperQuestionId() { @@ -51,14 +49,6 @@ public class PaperQuestionDTO { this.paperId = paperId; } - public String getPaperName() { - return paperName; - } - - public void setPaperName(String paperName) { - this.paperName = paperName; - } - public String getQuestionId() { return questionId; } @@ -67,6 +57,14 @@ public class PaperQuestionDTO { this.questionId = questionId; } + public String getQuestionSort() { + return questionSort; + } + + public void setQuestionSort(String questionSort) { + this.questionSort = questionSort; + } + public String getQuestionSubject() { return questionSubject; } @@ -91,14 +89,6 @@ public class PaperQuestionDTO { this.questionChoiceType = questionChoiceType; } - public String getQuestionAnalysis() { - return questionAnalysis; - } - - public void setQuestionAnalysis(String questionAnalysis) { - this.questionAnalysis = questionAnalysis; - } - public String getQuestionDifficulty() { return questionDifficulty; } @@ -114,4 +104,5 @@ public class PaperQuestionDTO { public void setQuestionSource(String questionSource) { this.questionSource = questionSource; } + } diff --git a/module-examine/src/main/java/ink/wgink/module/examine/pojo/pos/paper/PaperQuestionPO.java b/module-examine/src/main/java/ink/wgink/module/examine/pojo/pos/paper/PaperQuestionPO.java index 2741e903..b15eec9b 100644 --- a/module-examine/src/main/java/ink/wgink/module/examine/pojo/pos/paper/PaperQuestionPO.java +++ b/module-examine/src/main/java/ink/wgink/module/examine/pojo/pos/paper/PaperQuestionPO.java @@ -16,7 +16,7 @@ public class PaperQuestionPO implements Serializable { private String paperQuestionId; private String paperId; private String questionId; - private String questionType; + private String questionSort; public String getPaperQuestionId() { return paperQuestionId; @@ -42,11 +42,11 @@ public class PaperQuestionPO implements Serializable { this.questionId = questionId; } - public String getQuestionType() { - return questionType; + public String getQuestionSort() { + return questionSort; } - public void setQuestionType(String questionType) { - this.questionType = questionType; + public void setQuestionSort(String questionSort) { + this.questionSort = questionSort; } } diff --git a/module-examine/src/main/java/ink/wgink/module/examine/service/paper/question/IPaperQuestionService.java b/module-examine/src/main/java/ink/wgink/module/examine/service/paper/question/IPaperQuestionService.java new file mode 100644 index 00000000..83c5392e --- /dev/null +++ b/module-examine/src/main/java/ink/wgink/module/examine/service/paper/question/IPaperQuestionService.java @@ -0,0 +1,36 @@ +package ink.wgink.module.examine.service.paper.question; + +import ink.wgink.module.examine.pojo.dtos.paper.question.PaperQuestionDTO; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.SuccessResultList; + +import java.util.List; +import java.util.Map; + +/** + * @Description: 试卷试题 + * @Author: WenG + * @Date: 2022/5/23 23:44 + * @Version: 1.0 + **/ +public interface IPaperQuestionService { + + /** + * 试卷试题列表 + * + * @param paperId + * @param params + * @return + */ + List list(String paperId, Map params); + + /** + * 试卷试题分页列表 + * + * @param paperId + * @param page + * @return + */ + SuccessResultList> listPage(String paperId, ListPage page); + +} diff --git a/module-examine/src/main/java/ink/wgink/module/examine/service/paper/question/impl/PaperQuestionServiceImpl.java b/module-examine/src/main/java/ink/wgink/module/examine/service/paper/question/impl/PaperQuestionServiceImpl.java new file mode 100644 index 00000000..274a9673 --- /dev/null +++ b/module-examine/src/main/java/ink/wgink/module/examine/service/paper/question/impl/PaperQuestionServiceImpl.java @@ -0,0 +1,42 @@ +package ink.wgink.module.examine.service.paper.question.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import ink.wgink.common.base.DefaultBaseService; +import ink.wgink.module.examine.dao.paper.question.IPaperQuestionDao; +import ink.wgink.module.examine.pojo.dtos.paper.question.PaperQuestionDTO; +import ink.wgink.module.examine.service.paper.question.IPaperQuestionService; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.SuccessResultList; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * @Description: 试卷试题 + * @Author: WenG + * @Date: 2022/5/23 23:44 + * @Version: 1.0 + **/ +@Service +public class PaperQuestionServiceImpl extends DefaultBaseService implements IPaperQuestionService { + + @Autowired + private IPaperQuestionDao paperQuestionDao; + + @Override + public List list(String paperId, Map params) { + params = params == null ? getHashMap(0) : params; + return paperQuestionDao.list(params); + } + + @Override + public SuccessResultList> listPage(String paperId, ListPage page) { + PageHelper.startPage(page.getPage(), page.getRows()); + List paperQuestionDTOS = paperQuestionDao.list(page.getParams()); + PageInfo pageInfo = new PageInfo<>(paperQuestionDTOS); + return new SuccessResultList<>(paperQuestionDTOS, pageInfo.getPageNum(), pageInfo.getTotal()); + } +} diff --git a/module-examine/src/main/resources/mybatis/mapper/paper/paper-question-mapper.xml b/module-examine/src/main/resources/mybatis/mapper/paper/question/paper-question-mapper.xml similarity index 53% rename from module-examine/src/main/resources/mybatis/mapper/paper/paper-question-mapper.xml rename to module-examine/src/main/resources/mybatis/mapper/paper/question/paper-question-mapper.xml index a23f6be1..865ac786 100644 --- a/module-examine/src/main/resources/mybatis/mapper/paper/paper-question-mapper.xml +++ b/module-examine/src/main/resources/mybatis/mapper/paper/question/paper-question-mapper.xml @@ -1,16 +1,24 @@ - + - - - + + + + + + + + + + + @@ -84,4 +92,51 @@ + + + \ No newline at end of file diff --git a/module-examine/src/main/resources/templates/paper/question/list.html b/module-examine/src/main/resources/templates/paper/question/list.html index 391619d3..f8063287 100644 --- a/module-examine/src/main/resources/templates/paper/question/list.html +++ b/module-examine/src/main/resources/templates/paper/question/list.html @@ -18,7 +18,7 @@
- +