From cd5c601a36b626294688f8002ffed45f0c33ca14 Mon Sep 17 00:00:00 2001 From: flower Date: Mon, 28 Jan 2019 23:16:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/cms/controller/CmsUserController.java | 7 +++++-- .../src/main/resources/templates/web/practice/detail.html | 2 ++ .../impl/ExamUserCollectionQuestionServiceImpl.java | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) 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 a8cffac27..2dad54797 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 @@ -168,8 +168,11 @@ public class CmsUserController { @ResponseBody public AjaxResult addCollectionquestion(String questionId) { SysUser sysUser = ShiroUtils.getSysUser(); - examUserCollectionQuestionService.insertSelectiveBySelf(Integer.parseInt(questionId),sysUser); - AjaxResult success = AjaxResult.success("插入成功"); + int i = examUserCollectionQuestionService.insertSelectiveBySelf(Integer.parseInt(questionId), sysUser); + AjaxResult success = AjaxResult.success("收藏成功"); + if(i==0){ + success = AjaxResult.success("已收藏,无法重复收藏"); + } return success; } 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 f12914a12..05b056342 100644 --- a/ruoyi-cms/src/main/resources/templates/web/practice/detail.html +++ b/ruoyi-cms/src/main/resources/templates/web/practice/detail.html @@ -105,6 +105,8 @@ document.write(unescape("%3Cspan id='cnzz_stat_icon_30088308'%3E%3C/span%3E%3Csc success: function (result) { if (result.code != web_status.SUCCESS) { layer.msg(result.msg, {icon: 2}); + }else{ + layer.msg(result.msg, {icon: 1}); } } }); diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamUserCollectionQuestionServiceImpl.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamUserCollectionQuestionServiceImpl.java index f798d7b89..787dc69b8 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamUserCollectionQuestionServiceImpl.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamUserCollectionQuestionServiceImpl.java @@ -52,6 +52,10 @@ public class ExamUserCollectionQuestionServiceImpl extends AbstractBaseServiceIm ExamUserCollectionQuestion examUserCollectionQuestion = new ExamUserCollectionQuestion(); examUserCollectionQuestion.setExamQuestionId( questionId ); examUserCollectionQuestion.setVipUserId( sysUser.getUserId().intValue() ); + List db = examUserCollectionQuestionMapper.select(examUserCollectionQuestion); + if(db.size()>0){ + return 0; + } examUserCollectionQuestion.setCreateBy( sysUser.getLoginName() ); examUserCollectionQuestion.setCreateDate( new Date() ); examUserCollectionQuestion.setDelFlag( "0" ); From 105478f0a670a5e881dfeeef219d1a43fb0f8eeb Mon Sep 17 00:00:00 2001 From: flower Date: Mon, 28 Jan 2019 23:33:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AF=95=E9=A2=98=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/exam/ExamQuestionMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionMapper.xml b/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionMapper.xml index 724b26041..7943f9e41 100644 --- a/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionMapper.xml +++ b/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionMapper.xml @@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, title, answer, type, label, category_id, create_by, create_date, update_by, update_date, remarks, del_flag from exam_question and id = #{id} - and title = #{title} + and title like CONCAT('%',#{title},'%') and answer = #{answer} and type = #{type} and label = #{label} From 08e729931056c1337ca91f5259c2e97716930c13 Mon Sep 17 00:00:00 2001 From: flower Date: Tue, 29 Jan 2019 00:02:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?session=E4=B8=AD=E5=8A=A0=E5=85=A5user?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/cms/controller/CmsUserController.java | 7 +++---- ruoyi-cms/src/main/resources/templates/web/index.html | 10 +++++----- 2 files changed, 8 insertions(+), 9 deletions(-) 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 2dad54797..3e8eb886b 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 @@ -31,10 +31,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; 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 org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import sun.awt.image.IntegerComponentRaster; @@ -49,6 +46,7 @@ import java.util.List; */ @Controller @RequestMapping("/web") +@SessionAttributes("user") public class CmsUserController { private static final Logger log = LoggerFactory.getLogger( CmsUserController.class ); @@ -110,6 +108,7 @@ public class CmsUserController { @RequestMapping("/user/index.html") public String webUserIndex(ModelMap map) { map.put( "user", ShiroUtils.getSysUser() ); + map.addAttribute("user", ShiroUtils.getSysUser()); return prefix + "/user/set"; } @RequestMapping("/user/home.html") diff --git a/ruoyi-cms/src/main/resources/templates/web/index.html b/ruoyi-cms/src/main/resources/templates/web/index.html index b478938e1..0018e7cdb 100644 --- a/ruoyi-cms/src/main/resources/templates/web/index.html +++ b/ruoyi-cms/src/main/resources/templates/web/index.html @@ -173,19 +173,19 @@