diff --git a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsExaminationController.java b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsExaminationController.java index 844edd703..082563e4f 100644 --- a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsExaminationController.java +++ b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsExaminationController.java @@ -1,5 +1,6 @@ package com.ruoyi.cms.controller; +import com.github.pagehelper.PageInfo; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.exam.domain.*; import com.ruoyi.exam.service.*; @@ -14,6 +15,7 @@ import org.springframework.ui.ModelMap; 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.ResponseBody; import java.util.*; @@ -59,6 +61,47 @@ public class CmsExaminationController { return prefix + "list"; } + /** + * 考试列表 + * @param map + * @return + */ + @RequestMapping("/examination/list") + @GetMapping() + @ResponseBody + public AjaxResult list(ExamExamination examExamination) { + SysUser sysUser = sysUserService.selectUserByLoginName( ShiroUtils.getLoginName() ); + Map map = new HashMap<>(); + map.put( "ination", examExamination ); + map.put( "userId", sysUser.getUserId() ); + List list = examExaminationService.selectListFromWeb( map ); + AjaxResult success = AjaxResult.success( "查询成功" ); + success.put( "data", list ); + success.put("total",new PageInfo(list).getTotal()); + return success; + } + + /** + * 报名列表 + * @param map + * @return + */ + @RequestMapping("/examination/signuplist") + @GetMapping() + @ResponseBody + public AjaxResult signupist(ExamExamination examExamination) { + SysUser sysUser = sysUserService.selectUserByLoginName( ShiroUtils.getLoginName() ); + + Map map = new HashMap<>(); + map.put( "ination", examExamination ); + map.put( "userId", sysUser.getUserId() ); + List list = examExaminationService.selectEnterNameListFromWeb( map ); + AjaxResult success = AjaxResult.success( "查询成功" ); + success.put("total",new PageInfo(list).getTotal()); + success.put( "data", list ); + return success; + } + @RequestMapping("/examination/start/{id}") @GetMapping() public String start(@PathVariable String id, ModelMap mmap) { diff --git a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java index a83e56500..fb853abdc 100644 --- a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java +++ b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java @@ -1,9 +1,9 @@ package com.ruoyi.cms.controller; -import com.ruoyi.exam.domain.ExamPractice; -import com.ruoyi.exam.domain.ExamUserErrorQuestion; -import com.ruoyi.exam.domain.ExamUserErrorQuestionVO; +import com.ruoyi.common.base.AjaxResult; +import com.ruoyi.exam.domain.*; import com.ruoyi.exam.service.IExamPracticeService; +import com.ruoyi.exam.service.IExamUserCollectionQuestionService; import com.ruoyi.exam.service.IExamUserErrorQuestionService; import com.ruoyi.framework.jwt.JwtUtil; import com.ruoyi.framework.web.util.ShiroUtils; @@ -23,6 +23,7 @@ import org.springframework.ui.ModelMap; 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.ResponseBody; import java.util.List; @@ -44,6 +45,9 @@ public class CmsUserController { @Autowired private IExamUserErrorQuestionService examUserErrorQuestionService; + @Autowired + private IExamUserCollectionQuestionService examUserCollectionQuestionService; + @RequestMapping("/user/login.html") @@ -93,4 +97,60 @@ public class CmsUserController { map.put( "user", ShiroUtils.getSysUser() ); return prefix + "/user/errorquestion"; } + + @RequestMapping("/user/collectquestion.html") + public String collectQuestion(ModelMap map) { + ExamUserCollectionQuestionVO examUserCollectionQuestion = new ExamUserCollectionQuestionVO(); + SysUser sysUser = ShiroUtils.getSysUser(); + examUserCollectionQuestion.setVipUserId( sysUser.getUserId().intValue() ); + List list = examUserCollectionQuestionService.selectExamUserCollectionQuestionList( examUserCollectionQuestion ); + map.put("data", list); + map.put( "user", ShiroUtils.getSysUser() ); + return prefix + "/user/collectquestion"; + } + + /** + * 增加错题 + * @param questionId + * @return + */ + @RequestMapping("/user/adderrorquestion") + @ResponseBody + public AjaxResult addErrorquestion(String questionId) { + SysUser sysUser = ShiroUtils.getSysUser(); + examUserErrorQuestionService.insertError(questionId,sysUser); + AjaxResult success = AjaxResult.success("插入成功"); + return success; + } + + @RequestMapping("/user/addcollectquestion") + @ResponseBody + public AjaxResult addCollectionquestion(String questionId) { + SysUser sysUser = ShiroUtils.getSysUser(); + examUserCollectionQuestionService.insertSelectiveBySelf(Integer.parseInt(questionId),sysUser); + AjaxResult success = AjaxResult.success("插入成功"); + return success; + } + + @RequestMapping("/user/delerrorquestion") + @ResponseBody + public AjaxResult delErrorquestion(Integer questionId) { + ExamUserErrorQuestion question = new ExamUserErrorQuestion(); + question.setVipUserId(ShiroUtils.getUserId().intValue()); + question.setExamQuestionId(questionId); + examUserErrorQuestionService.delete(question); + AjaxResult success = AjaxResult.success("删除成功"); + return success; + } + + @RequestMapping("/user/delcollectquestion") + @ResponseBody + public AjaxResult delCollectionquestion(Integer questionId) { + ExamUserCollectionQuestion examUserCollectionQuestion = new ExamUserCollectionQuestion(); + examUserCollectionQuestion.setVipUserId(ShiroUtils.getUserId().intValue()); + examUserCollectionQuestion.setExamQuestionId(questionId); + examUserCollectionQuestionService.delete(examUserCollectionQuestion); + AjaxResult success = AjaxResult.success("删除成功"); + return success; + } } diff --git a/ruoyi-cms/src/main/resources/templates/web/examination/list.html b/ruoyi-cms/src/main/resources/templates/web/examination/list.html index bb427bffb..b29315524 100644 --- a/ruoyi-cms/src/main/resources/templates/web/examination/list.html +++ b/ruoyi-cms/src/main/resources/templates/web/examination/list.html @@ -8,110 +8,130 @@
-
-
-
-
+
+
+
+ +
+
    +
  • 考试列表
  • +
  • 报名列表
  • + +
+
+
+
+
+
+ +
+
- + -
+ +
+ +
-
- + - + diff --git a/ruoyi-cms/src/main/resources/templates/web/index.html b/ruoyi-cms/src/main/resources/templates/web/index.html index 638b86437..13582f050 100644 --- a/ruoyi-cms/src/main/resources/templates/web/index.html +++ b/ruoyi-cms/src/main/resources/templates/web/index.html @@ -186,11 +186,12 @@
+ + +
基本设置
-
我的消息
-
我的主页
-
我的错题本
-
我的收藏
+
更多...
+
退出
diff --git a/ruoyi-cms/src/main/resources/templates/web/practice/detail.html b/ruoyi-cms/src/main/resources/templates/web/practice/detail.html index 3b3044172..f12914a12 100644 --- a/ruoyi-cms/src/main/resources/templates/web/practice/detail.html +++ b/ruoyi-cms/src/main/resources/templates/web/practice/detail.html @@ -81,12 +81,11 @@ document.write(unescape("%3Cspan id='cnzz_stat_icon_30088308'%3E%3C/span%3E%3Csc $.ajax({ type: 'post', - url: "/api/v1/practice/answer", - contentType: "application/json", - data: "[" + id + "]", + url: "/web/user/adderrorquestion", + data: {questionId:id}, success: function (result) { if (result.code != web_status.SUCCESS) { - layer.msg('result.msg', {icon: 2}); + layer.msg(result.msg, {icon: 2}); } } }); @@ -98,6 +97,19 @@ document.write(unescape("%3Cspan id='cnzz_stat_icon_30088308'%3E%3C/span%3E%3Csc $("#" + id + "answer").show() } + function shoucang(id){ + $.ajax({ + type: 'post', + url: "/web/user/addcollectquestion", + data: {questionId:id}, + success: function (result) { + if (result.code != web_status.SUCCESS) { + layer.msg(result.msg, {icon: 2}); + } + } + }); + } + function checkbox(value) { $(value).prev().prop("checked", !$(value).prev().prop("checked")); } diff --git a/ruoyi-cms/src/main/resources/templates/web/user/collectquestion.html b/ruoyi-cms/src/main/resources/templates/web/user/collectquestion.html new file mode 100644 index 000000000..1a968415d --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/user/collectquestion.html @@ -0,0 +1,74 @@ + + + + + + + +
+
+ +
+
+
+ +
+
+ 我的收藏 +
+
+
+

[[${itemStat.index+1}]]:[[${item.question.title}]] + (单选) + (多选) + (判断) +

+
+

[[${qItem.number}]]:[[${qItem.content}]]

+

解析:正确答案[[${item.question.answer}]]

+

[[${item.question.label}]]

+
+
+
+ + + +
+
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/user/errorquestion.html b/ruoyi-cms/src/main/resources/templates/web/user/errorquestion.html index 2fea31c33..62733b9ca 100644 --- a/ruoyi-cms/src/main/resources/templates/web/user/errorquestion.html +++ b/ruoyi-cms/src/main/resources/templates/web/user/errorquestion.html @@ -6,51 +6,37 @@
-
-
-
-
-
- -
-
-
-
[[${itemStat.index+1}]]: - (单选) - (多选) - (判断) -
-
- [[${qItem.number}]]: - -
-
- 解析:正确答案[[${item.question.answer}]]
- [[${item.question.label}]] -
- - -
- - -
- - -
- - - -
-
+
+
+
+
+ 我的错题 +
+
+
+

[[${itemStat.index+1}]]:[[${item.question.title}]] + (单选) + (多选) + (判断) + +

+ +
+

[[${qItem.number}]]:[[${qItem.content}]]

+

解析:正确答案[[${item.question.answer}]]

+

[[${item.question.label}]]

+
+
+
+
-