From 20a71a467f034afb2ee4321bbd3d40d7068b1a83 Mon Sep 17 00:00:00 2001 From: zhujunjieit Date: Sun, 13 Jan 2019 23:35:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-common/pom.xml | 6 ++++ .../controller/ApiPracticeController.java | 31 ++++++++++++------- .../exam/domain/ExamUserErrorQuestion.java | 6 ++-- .../IExamUserErrorQuestionService.java | 2 ++ .../ExamUserErrorQuestionServiceImpl.java | 27 ++++++++++------ 5 files changed, 48 insertions(+), 24 deletions(-) diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 9aae4a0b7..5a0aad1be 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -75,6 +75,12 @@ hutool-all 4.2.1 + + + com.alibaba + fastjson + 1.2.4 + tk.mybatis diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiPracticeController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiPracticeController.java index 4f8132dec..a023d6c12 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiPracticeController.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiPracticeController.java @@ -6,9 +6,13 @@ import com.ruoyi.exam.service.IExamPracticeQuestionService; import com.ruoyi.exam.service.IExamPracticeService; import com.ruoyi.exam.service.IExamQuestionService; import com.ruoyi.exam.service.IExamUserErrorQuestionService; +import com.ruoyi.framework.jwt.JwtUtil; import com.ruoyi.framework.web.base.BaseController; import com.ruoyi.framework.web.page.TableDataInfo; +import com.ruoyi.framework.web.util.EntityUtils; import com.ruoyi.framework.web.util.ShiroUtils; +import com.ruoyi.system.domain.SysUser; +import com.ruoyi.system.service.ISysUserService; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -35,6 +39,8 @@ public class ApiPracticeController extends BaseController { @Autowired private IExamUserErrorQuestionService examUserErrorQuestionService; + @Autowired + private ISysUserService sysUserService; @GetMapping("/v1/practice/list") public AjaxResult list(ExamPractice examPractice) { @@ -65,22 +71,25 @@ public class ApiPracticeController extends BaseController { /** * 保存错题记录 * - * @param questionId + * @param questionIds * @return * @description 练习时答错题就保存到错题记录中 * 传入问题id */ @PostMapping("/v1/practice/answer") - public AjaxResult answer(String questionId) { - - ExamUserErrorQuestion examUserErrorQuestion = new ExamUserErrorQuestion(); - examUserErrorQuestion.setExamQuestionId(Integer.parseInt(questionId)); - examUserErrorQuestion.setVipUserId(Integer.parseInt(ShiroUtils.getUserId().toString())); - examUserErrorQuestion.setCreateBy(ShiroUtils.getLoginName()); - examUserErrorQuestion.setCreateDate(new Date()); - examUserErrorQuestion.setDelFlag("0"); - examUserErrorQuestionService.insert(examUserErrorQuestion); - + public AjaxResult answer(@RequestBody List questionIds) { + for (String questionId : questionIds) { + ExamUserErrorQuestion examUserErrorQuestion = new ExamUserErrorQuestion(); + examUserErrorQuestion.setExamQuestionId(Integer.parseInt(questionId)); + SysUser sysUser = sysUserService.selectUserByLoginName( JwtUtil.getLoginName() ); + examUserErrorQuestion.setVipUserId(sysUser.getUserId().intValue()); + examUserErrorQuestion.setCreateBy(sysUser.getLoginName()); + examUserErrorQuestion.setCreateDate(new Date()); + examUserErrorQuestion.setDelFlag("0"); + examUserErrorQuestion.setUpdateBy(sysUser.getLoginName()); + examUserErrorQuestion.setUpdateDate(new Date()); + int insert = examUserErrorQuestionService.insertError( examUserErrorQuestion ); + } AjaxResult success = success("插入错题本成功"); return success; } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamUserErrorQuestion.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamUserErrorQuestion.java index 9cac2754c..627cbcb33 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamUserErrorQuestion.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamUserErrorQuestion.java @@ -49,9 +49,9 @@ private static final long serialVersionUID = 1L; } /** 设置会员代码 */ public void setVipUserId(Integer vipUserId) - { - this.vipUserId = vipUserId; - } + { + this.vipUserId = vipUserId; + } /** 获取会员代码 */ public Integer getVipUserId() diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamUserErrorQuestionService.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamUserErrorQuestionService.java index 6d4da1bbf..3df6eb0dd 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamUserErrorQuestionService.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamUserErrorQuestionService.java @@ -30,4 +30,6 @@ public interface IExamUserErrorQuestionService extends AbstractBaseService selectExamUserErrorQuestionDetailPage(ExamUserErrorQuestion examUserErrorQuestion); + + int insertError(ExamUserErrorQuestion examUserErrorQuestion); } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamUserErrorQuestionServiceImpl.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamUserErrorQuestionServiceImpl.java index 2b0fc60ab..c7ba0fc2c 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamUserErrorQuestionServiceImpl.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamUserErrorQuestionServiceImpl.java @@ -11,28 +11,28 @@ import com.ruoyi.exam.service.IExamUserErrorQuestionService; import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; /** * 我的错题 服务层实现 - * + * * @author zhujj * @date 2019-01-10 */ @Service public class ExamUserErrorQuestionServiceImpl extends AbstractBaseServiceImpl implements IExamUserErrorQuestionService { - @Autowired - private ExamUserErrorQuestionMapper examUserErrorQuestionMapper; + @Autowired + private ExamUserErrorQuestionMapper examUserErrorQuestionMapper; - - /** + + /** * 查询我的错题列表 - * + * * @param examUserErrorQuestion 我的错题信息 * @return 我的错题集合 */ - @Override - public List selectExamUserErrorQuestionList(ExamUserErrorQuestion examUserErrorQuestion) - { + @Override + public List selectExamUserErrorQuestionList(ExamUserErrorQuestion examUserErrorQuestion) + { return examUserErrorQuestionMapper.selectExamUserErrorQuestionList(examUserErrorQuestion); - } + } @Override public List selectExamUserErrorQuestionDetailPage(ExamUserErrorQuestion examUserErrorQuestion) { @@ -40,6 +40,13 @@ public class ExamUserErrorQuestionServiceImpl extends AbstractBaseServiceImpl