From cd40d3dfd1859c4139cdedbd5bb3b602fe065b59 Mon Sep 17 00:00:00 2001 From: zhujunjieit Date: Fri, 18 Jan 2019 00:46:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F/=E6=88=91?= =?UTF-8?q?=E7=9A=84=E9=94=99=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiUserCollectionQuestionController.java | 59 ++++---- .../ApiUserErrorQuestionController.java | 18 ++- .../ExamUserCollectionQuestionController.java | 12 +- .../domain/ExamUserCollectionQuestionVO.java | 19 +++ .../ExamUserCollectionQuestionMapper.java | 4 +- .../IExamUserCollectionQuestionService.java | 6 +- .../IExamUserErrorQuestionService.java | 15 +- ...ExamUserCollectionQuestionServiceImpl.java | 6 +- .../ExamUserErrorQuestionServiceImpl.java | 5 +- .../exam/ExamUserCollectionQuestionMapper.xml | 50 +++++-- .../ApiVipUserCertificationController.java | 140 ++++++++++++++++++ .../vip/controller/ApiVipUserController.java | 111 ++------------ 12 files changed, 292 insertions(+), 153 deletions(-) create mode 100644 ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamUserCollectionQuestionVO.java create mode 100644 ruoyi-vip/src/main/java/com/ruoyi/vip/controller/ApiVipUserCertificationController.java diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserCollectionQuestionController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserCollectionQuestionController.java index 6db2d5fa3..9bde72c98 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserCollectionQuestionController.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserCollectionQuestionController.java @@ -32,63 +32,68 @@ public class ApiUserCollectionQuestionController extends BaseController { /** * 保存收藏记录 + * * @param id * @return */ - @PostMapping("/v1/practice/collection/{id}") + @PostMapping("/v1/question/collection/{id}") public AjaxResult answer(@PathVariable("id") Integer id) { ExamUserCollectionQuestion examUserCollectionQuestion = new ExamUserCollectionQuestion(); - examUserCollectionQuestion.setExamQuestionId(id); + examUserCollectionQuestion.setExamQuestionId( id ); SysUser sysUser = sysUserService.selectUserByLoginName( JwtUtil.getLoginName() ); - examUserCollectionQuestion.setVipUserId(sysUser.getUserId().intValue()); - examUserCollectionQuestion.setCreateBy(sysUser.getLoginName()); - examUserCollectionQuestion.setCreateDate(new Date()); - examUserCollectionQuestion.setDelFlag("0"); - examUserCollectionQuestion.setUpdateBy(sysUser.getLoginName()); - examUserCollectionQuestion.setUpdateDate(new Date()); - int insert = examUserCollectionQuestionService.insertSelectiveBySelf(examUserCollectionQuestion ); - AjaxResult success = success("插入我的收藏记录成功"); + examUserCollectionQuestion.setVipUserId( sysUser.getUserId().intValue() ); + examUserCollectionQuestion.setCreateBy( sysUser.getLoginName() ); + examUserCollectionQuestion.setCreateDate( new Date() ); + examUserCollectionQuestion.setDelFlag( "0" ); + examUserCollectionQuestion.setUpdateBy( sysUser.getLoginName() ); + examUserCollectionQuestion.setUpdateDate( new Date() ); + int insert = examUserCollectionQuestionService.insertSelectiveBySelf( examUserCollectionQuestion ); + AjaxResult success = success( "插入我的收藏记录成功" ); return success; } /** * 我的收藏显示列表（分页） + * * @return */ - @PostMapping("/v1/question/collection/page") - public AjaxResult collectionPage(){ - ExamUserCollectionQuestion examUserCollectionQuestion=new ExamUserCollectionQuestion(); + @GetMapping("/v1/question/collection/page") + public AjaxResult collectionPage() { + ExamUserCollectionQuestionVO examUserCollectionQuestion = new ExamUserCollectionQuestionVO(); SysUser sysUser = sysUserService.selectUserByLoginName( JwtUtil.getLoginName() ); - examUserCollectionQuestion.setVipUserId(sysUser.getUserId().intValue()); - List list = examUserCollectionQuestionService.selectExamUserCollectionQuestionPage(examUserCollectionQuestion); - AjaxResult success = success("查询我的收藏成功"); - success.put("data", list); + examUserCollectionQuestion.setVipUserId( sysUser.getUserId().intValue() ); + List list = examUserCollectionQuestionService.selectExamUserCollectionQuestionPage( examUserCollectionQuestion ); + AjaxResult success = success( "查询我的收藏成功" ); + success.put( "data", list ); return success; } + /** * 我的收藏显示列表（不分页） + * * @return */ - @PostMapping("/v1/question/collection/list") - public AjaxResult collectionList(){ - ExamUserCollectionQuestion examUserCollectionQuestion=new ExamUserCollectionQuestion(); + @GetMapping("/v1/question/collection/list") + public AjaxResult collectionList() { + ExamUserCollectionQuestionVO examUserCollectionQuestion = new ExamUserCollectionQuestionVO(); SysUser sysUser = sysUserService.selectUserByLoginName( JwtUtil.getLoginName() ); - examUserCollectionQuestion.setVipUserId(sysUser.getUserId().intValue()); - List list = examUserCollectionQuestionService.selectExamUserCollectionQuestionPage(examUserCollectionQuestion); - AjaxResult success = success("查询我的收藏成功"); - success.put("data", list); + examUserCollectionQuestion.setVipUserId( sysUser.getUserId().intValue() ); + List list = examUserCollectionQuestionService.selectExamUserCollectionQuestionPage( examUserCollectionQuestion ); + AjaxResult success = success( "查询我的收藏成功" ); + success.put( "data", list ); return success; } + /** * 删除我的收藏记录 * * @param id * @return */ - @PostMapping("/v1/question/collection/delete/{id}") + @GetMapping("/v1/question/collection/delete/{id}") public AjaxResult deleteCollectionQuestion(@PathVariable("id") String id) { - examUserCollectionQuestionService.deleteById(id); - AjaxResult success = success("删除成功"); + examUserCollectionQuestionService.deleteById( id ); + AjaxResult success = success( "删除成功" ); return success; } } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserErrorQuestionController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserErrorQuestionController.java index 7d09924a2..b8d519a32 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserErrorQuestionController.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserErrorQuestionController.java @@ -83,7 +83,21 @@ public class ApiUserErrorQuestionController extends BaseController { success.put("data", list); return success; } - + /** + * 查询我的错题列表(不分页) + * + * @return + */ + @GetMapping("/v1/question/error/list") + public AjaxResult queryErrorList() { + ExamUserErrorQuestion examUserErrorQuestion = new ExamUserErrorQuestion(); + SysUser sysUser = sysUserService.selectUserByLoginName( JwtUtil.getLoginName() ); + examUserErrorQuestion.setVipUserId(sysUser.getUserId().intValue()); + List list = examUserErrorQuestionService.selectExamUserErrorQuestionDetailList(examUserErrorQuestion); + AjaxResult success = success("查询成功"); + success.put("data", list); + return success; + } /** * 查询问题详情 * @@ -103,7 +117,7 @@ public class ApiUserErrorQuestionController extends BaseController { * @param id * @return */ - @PostMapping("/v1/question/error/delete/{id}") + @GetMapping("/v1/question/error/delete/{id}") public AjaxResult deleteErrorQuestion(@PathVariable("id") String id) { examUserErrorQuestionService.deleteById(id); AjaxResult success = success("删除成功"); diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamUserCollectionQuestionController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamUserCollectionQuestionController.java index 4cbf3ca29..d50ffedc5 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamUserCollectionQuestionController.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamUserCollectionQuestionController.java @@ -1,6 +1,8 @@ package com.ruoyi.exam.controller; import java.util.List; + +import com.ruoyi.exam.domain.ExamUserCollectionQuestionVO; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -47,9 +49,9 @@ public class ExamUserCollectionQuestionController extends BaseController @RequiresPermissions("exam:examUserCollectionQuestion:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(ExamUserCollectionQuestion examUserCollectionQuestion) + public TableDataInfo list(ExamUserCollectionQuestionVO examUserCollectionQuestion) { - List list = examUserCollectionQuestionService.selectExamUserCollectionQuestionPage(examUserCollectionQuestion); + List list = examUserCollectionQuestionService.selectExamUserCollectionQuestionPage(examUserCollectionQuestion); return getDataTable(list); } @@ -60,10 +62,10 @@ public class ExamUserCollectionQuestionController extends BaseController @RequiresPermissions("exam:examUserCollectionQuestion:export") @PostMapping("/export") @ResponseBody - public AjaxResult export(ExamUserCollectionQuestion examUserCollectionQuestion) + public AjaxResult export(ExamUserCollectionQuestionVO examUserCollectionQuestion) { - List list = examUserCollectionQuestionService.selectExamUserCollectionQuestionList(examUserCollectionQuestion); - ExcelUtil util = new ExcelUtil(ExamUserCollectionQuestion.class); + List list = examUserCollectionQuestionService.selectExamUserCollectionQuestionList(examUserCollectionQuestion); + ExcelUtil util = new ExcelUtil(ExamUserCollectionQuestionVO.class); return util.exportExcel(list, "examUserCollectionQuestion"); } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamUserCollectionQuestionVO.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamUserCollectionQuestionVO.java new file mode 100644 index 000000000..7d5bd53c1 --- /dev/null +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamUserCollectionQuestionVO.java @@ -0,0 +1,19 @@ +package com.ruoyi.exam.domain; + +/** + * 我的收藏 exam_user_error_question + * + * @author zhujj + * @date 2019-01-10 + */ +public class ExamUserCollectionQuestionVO extends ExamUserCollectionQuestion { + private ExamQuestion question; + + public ExamQuestion getQuestion() { + return question; + } + + public void setQuestion(ExamQuestion question) { + this.question = question; + } +} diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamUserCollectionQuestionMapper.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamUserCollectionQuestionMapper.java index 8a39ef5d5..eb2ad976d 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamUserCollectionQuestionMapper.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamUserCollectionQuestionMapper.java @@ -2,6 +2,8 @@ package com.ruoyi.exam.mapper; import com.ruoyi.exam.domain.ExamUserCollectionQuestion; import java.util.List; + +import com.ruoyi.exam.domain.ExamUserCollectionQuestionVO; import com.ruoyi.framework.web.base.MyMapper; /** @@ -19,6 +21,6 @@ public interface ExamUserCollectionQuestionMapper extends MyMapper selectExamUserCollectionQuestionList(ExamUserCollectionQuestion examUserCollectionQuestion); + public List selectExamUserCollectionQuestionList(ExamUserCollectionQuestionVO examUserCollectionQuestion); } \ No newline at end of file diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamUserCollectionQuestionService.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamUserCollectionQuestionService.java index 1391a880a..c74079ac1 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamUserCollectionQuestionService.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamUserCollectionQuestionService.java @@ -2,6 +2,8 @@ package com.ruoyi.exam.service; import com.ruoyi.exam.domain.ExamUserCollectionQuestion; import java.util.List; + +import com.ruoyi.exam.domain.ExamUserCollectionQuestionVO; import com.ruoyi.framework.web.base.AbstractBaseService; /** * 我的收藏 服务层 @@ -17,14 +19,14 @@ public interface IExamUserCollectionQuestionService extends AbstractBaseService< * @param examUserCollectionQuestion 我的收藏信息 * @return 我的收藏集合 */ - public List selectExamUserCollectionQuestionPage(ExamUserCollectionQuestion examUserCollectionQuestion); + public List selectExamUserCollectionQuestionPage(ExamUserCollectionQuestionVO examUserCollectionQuestion); /** * 查询我的收藏列表 * * @param examUserCollectionQuestion 我的收藏信息 * @return 我的收藏集合 */ - public List selectExamUserCollectionQuestionList(ExamUserCollectionQuestion examUserCollectionQuestion); + public List selectExamUserCollectionQuestionList(ExamUserCollectionQuestionVO examUserCollectionQuestion); /** * 插入收藏题库 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 3df6eb0dd..ada86b4d7 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 @@ -28,8 +28,21 @@ public interface IExamUserErrorQuestionService extends AbstractBaseService selectExamUserErrorQuestionList(ExamUserErrorQuestion examUserErrorQuestion); - + /** + * 查询我的错题详情列表 + * + * @param examUserErrorQuestion 我的错题信息 + * @return 我的错题集合 + */ List selectExamUserErrorQuestionDetailPage(ExamUserErrorQuestion examUserErrorQuestion); + /** + * 查询我的错题详情列表（不分页） + * + * @param examUserErrorQuestion 我的错题信息 + * @return 我的错题集合 + */ + List selectExamUserErrorQuestionDetailList(ExamUserErrorQuestion examUserErrorQuestion); + int insertError(ExamUserErrorQuestion examUserErrorQuestion); } 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 d53c940cb..0cc7a9fbd 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 @@ -1,6 +1,8 @@ package com.ruoyi.exam.service.impl; import java.util.List; + +import com.ruoyi.exam.domain.ExamUserCollectionQuestionVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.exam.mapper.ExamUserCollectionQuestionMapper; @@ -28,7 +30,7 @@ public class ExamUserCollectionQuestionServiceImpl extends AbstractBaseServiceIm * @return 我的收藏集合 */ @Override - public List selectExamUserCollectionQuestionList(ExamUserCollectionQuestion examUserCollectionQuestion) + public List selectExamUserCollectionQuestionList(ExamUserCollectionQuestionVO examUserCollectionQuestion) { return examUserCollectionQuestionMapper.selectExamUserCollectionQuestionList(examUserCollectionQuestion); } @@ -45,7 +47,7 @@ public class ExamUserCollectionQuestionServiceImpl extends AbstractBaseServiceIm * @return 我的收藏集合 */ @Override - public List selectExamUserCollectionQuestionPage(ExamUserCollectionQuestion examUserCollectionQuestion) + public List selectExamUserCollectionQuestionPage(ExamUserCollectionQuestionVO examUserCollectionQuestion) { startPage(); return examUserCollectionQuestionMapper.selectExamUserCollectionQuestionList(examUserCollectionQuestion); 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 c7ba0fc2c..d9a902c79 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 @@ -39,7 +39,10 @@ public class ExamUserErrorQuestionServiceImpl extends AbstractBaseServiceImpl selectExamUserErrorQuestionDetailList(ExamUserErrorQuestion examUserErrorQuestion) { + return examUserErrorQuestionMapper.selectExamUserErrorQuestionDetailPage(examUserErrorQuestion); + } @Override public int insertError(ExamUserErrorQuestion examUserErrorQuestion) { diff --git a/ruoyi-exam/src/main/resources/mapper/exam/ExamUserCollectionQuestionMapper.xml b/ruoyi-exam/src/main/resources/mapper/exam/ExamUserCollectionQuestionMapper.xml index aced2852a..5c233cf7e 100644 --- a/ruoyi-exam/src/main/resources/mapper/exam/ExamUserCollectionQuestionMapper.xml +++ b/ruoyi-exam/src/main/resources/mapper/exam/ExamUserCollectionQuestionMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -14,24 +14,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + - id, vip_user_id, exam_question_id, create_by, create_date, update_by, update_date, remarks, del_flag + eucq.id, eucq.vip_user_id, eucq.exam_question_id, eucq.create_by, eucq.create_date, eucq.update_by, + eucq.update_date, eucq.remarks, eucq.del_flag - select - - from exam_user_collection_question + , + eq.id as eq_id, + eq.title as eq_title, + eq.answer as eq_answer, + eq.type as eq_type, + eq.label as eq_label, + eq.category_id as eq_category_id, + eq.create_by as eq_create_by, + eq.create_date as eq_create_date, + eq.update_by as eq_update_by, + eq.update_date as eq_update_date, + eq.remarks as eq_remarks, + eq.del_flag as eq_del_flag + from exam_user_collection_question eucq + INNER JOIN exam_question eq ON eq.id = eucq.exam_question_id - and id = #{id} - and vip_user_id = #{vipUserId} - and exam_question_id = #{examQuestionId} - and create_by = #{createBy} - and create_date = #{createDate} - and update_by = #{updateBy} - and update_date = #{updateDate} - and remarks = #{remarks} + and eucq.id = #{id} + and eucq.vip_user_id = #{vipUserId} + and eucq.exam_question_id = #{examQuestionId} and del_flag = #{delFlag} diff --git a/ruoyi-vip/src/main/java/com/ruoyi/vip/controller/ApiVipUserCertificationController.java b/ruoyi-vip/src/main/java/com/ruoyi/vip/controller/ApiVipUserCertificationController.java new file mode 100644 index 000000000..1bc0d08aa --- /dev/null +++ b/ruoyi-vip/src/main/java/com/ruoyi/vip/controller/ApiVipUserCertificationController.java @@ -0,0 +1,140 @@ +package com.ruoyi.vip.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.base.AjaxResult; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.json.JSONObject; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.framework.jwt.JwtUtil; +import com.ruoyi.framework.shiro.service.SysPasswordService; +import com.ruoyi.framework.web.base.BaseController; +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 io.swagger.annotations.ApiOperation; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authc.AuthenticationException; +import org.apache.shiro.authc.UsernamePasswordToken; +import org.apache.shiro.subject.Subject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; + +/** + * 用户信息 + * + * @author ruoyi + */ +@Api("用户信息管理") +@RestController +@RequestMapping("/api/v1") +public class ApiVipUserCertificationController extends BaseController { + + + @Autowired + private ISysUserService sysUserService; + @Autowired + private SysPasswordService passwordService; + + @ApiOperation("用户登陆") + @Log(title = "用户登陆", businessType = BusinessType.EXPORT) + @RequestMapping(value = "/user/login", method = RequestMethod.POST, produces = "application/json;charset=UTF-8") + public AjaxResult login(@RequestBody SysUser user) { + AjaxResult success = success( "登陆成功" ); + boolean rememberMe = false; + UsernamePasswordToken token = new UsernamePasswordToken( user.getUserName(), user.getPassword(), rememberMe ); + Subject subject = SecurityUtils.getSubject(); + try { + subject.login( token ); + String tokenSign = JwtUtil.sign( user.getUserName(), user.getPassword() ); + JSONObject json = new JSONObject(); + + json.put( "token", tokenSign ); + SysUser sysUser = sysUserService.selectUserByLoginName( user.getUserName()); + json.put( "user", sysUser ); + success.put( "data", json ); + return success; + } catch (AuthenticationException e) { + String msg = "用户或密码错误"; + if (StringUtils.isNotEmpty( e.getMessage() )) { + msg = e.getMessage(); + } + return error( msg ); + } + } + + @GetMapping("/member/user/info") + public AjaxResult get() { + AjaxResult success = success( "获取用户信息成功" ); + SysUser sysUser = sysUserService.selectUserByLoginName( JwtUtil.getLoginName() ); + success.put( "data", sysUser ); + return success; + } + + + /** + * 新增保存用户 + */ + @Log(title = "用户管理", businessType = BusinessType.INSERT) + @PostMapping("/user/add") + @Transactional(rollbackFor = Exception.class) + @ResponseBody + public AjaxResult addSave(@RequestBody SysUser user) { + user.setSalt( ShiroUtils.randomSalt() ); + user.setUserType( UserConstants.USER_VIP ); + user.setPassword( passwordService.encryptPassword( user.getLoginName(), user.getPassword(), user.getSalt() ) ); + return toAjax( sysUserService.insertUser( user ) ); + } + + + /** + * 修改保存用户 + */ + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @PostMapping("/member/user/edit") + @Transactional(rollbackFor = Exception.class) + @ResponseBody + public AjaxResult editSave(SysUser user) { + + user.setUpdateBy( ShiroUtils.getLoginName() ); + return toAjax( sysUserService.updateUser( user ) ); + } + + @Log(title = "重置密码", businessType = BusinessType.UPDATE) + @PostMapping("/member/user/resetPwd") + @ResponseBody + public AjaxResult resetPwdSave(SysUser user) { + user.setSalt( ShiroUtils.randomSalt() ); + user.setPassword( passwordService.encryptPassword( user.getLoginName(), user.getPassword(), user.getSalt() ) ); + return toAjax( sysUserService.resetUserPwd( user ) ); + } + + /** + * 校验用户名 + */ + @PostMapping("/member/user/checkLoginNameUnique") + @ResponseBody + public String checkLoginNameUnique(SysUser user) { + return sysUserService.checkLoginNameUnique( user.getLoginName() ); + } + + /** + * 校验手机号码 + */ + @PostMapping("/member/user/checkPhoneUnique") + @ResponseBody + public String checkPhoneUnique(SysUser user) { + return sysUserService.checkPhoneUnique( user ); + } + + /** + * 校验email邮箱 + */ + @PostMapping("/member/user/checkEmailUnique") + @ResponseBody + public String checkEmailUnique(SysUser user) { + return sysUserService.checkEmailUnique( user ); + } +} \ No newline at end of file diff --git a/ruoyi-vip/src/main/java/com/ruoyi/vip/controller/ApiVipUserController.java b/ruoyi-vip/src/main/java/com/ruoyi/vip/controller/ApiVipUserController.java index 93b88668f..3127129a9 100644 --- a/ruoyi-vip/src/main/java/com/ruoyi/vip/controller/ApiVipUserController.java +++ b/ruoyi-vip/src/main/java/com/ruoyi/vip/controller/ApiVipUserController.java @@ -16,6 +16,8 @@ import com.ruoyi.framework.web.util.ServletUtils; import com.ruoyi.framework.web.util.ShiroUtils; import com.ruoyi.system.domain.SysUser; import com.ruoyi.system.service.ISysUserService; +import com.ruoyi.vip.domain.vo.VipUserCertificateVO; +import com.ruoyi.vip.service.IVipUserCertificateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.shiro.SecurityUtils; @@ -34,114 +36,25 @@ import java.util.List; * * @author ruoyi */ -@Api("用户信息管理") +@Api("我的证书管理") @RestController -@RequestMapping("/api/v1") +@RequestMapping("/api") public class ApiVipUserController extends BaseController { - @Autowired private ISysUserService sysUserService; + @Autowired - private SysPasswordService passwordService; - - @ApiOperation("用户登陆") - @Log(title = "用户登陆", businessType = BusinessType.EXPORT) - @RequestMapping(value = "/user/login", method = RequestMethod.POST, produces = "application/json;charset=UTF-8") - public AjaxResult login(@RequestBody SysUser user) { - AjaxResult success = success( "登陆成功" ); - boolean rememberMe = false; - UsernamePasswordToken token = new UsernamePasswordToken( user.getUserName(), user.getPassword(), rememberMe ); - Subject subject = SecurityUtils.getSubject(); - try { - subject.login( token ); - String tokenSign = JwtUtil.sign( user.getUserName(), user.getPassword() ); - JSONObject json = new JSONObject(); - - json.put( "token", tokenSign ); - SysUser sysUser = sysUserService.selectUserByLoginName( user.getUserName()); - json.put( "user", sysUser ); - success.put( "data", json ); - return success; - } catch (AuthenticationException e) { - String msg = "用户或密码错误"; - if (StringUtils.isNotEmpty( e.getMessage() )) { - msg = e.getMessage(); - } - return error( msg ); - } - } - - @GetMapping("/member/user/info") + private IVipUserCertificateService vipUserCertificateService; + @GetMapping("/v1/user/cerificate/page") public AjaxResult get() { - AjaxResult success = success( "获取用户信息成功" ); + AjaxResult success = success( "获取我的证书成功" ); SysUser sysUser = sysUserService.selectUserByLoginName( JwtUtil.getLoginName() ); - success.put( "data", sysUser ); + VipUserCertificateVO certificateVO = new VipUserCertificateVO(); + certificateVO.setVipUserId( sysUser.getUserId().intValue() ); + List list = vipUserCertificateService.selectVipUserCertificatePage( certificateVO ); + success.put( "data", list ); return success; } - - /** - * 新增保存用户 - */ - @Log(title = "用户管理", businessType = BusinessType.INSERT) - @PostMapping("/user/add") - @Transactional(rollbackFor = Exception.class) - @ResponseBody - public AjaxResult addSave(@RequestBody SysUser user) { - user.setSalt( ShiroUtils.randomSalt() ); - user.setUserType( UserConstants.USER_VIP ); - user.setPassword( passwordService.encryptPassword( user.getLoginName(), user.getPassword(), user.getSalt() ) ); - return toAjax( sysUserService.insertUser( user ) ); - } - - - /** - * 修改保存用户 - */ - @Log(title = "用户管理", businessType = BusinessType.UPDATE) - @PostMapping("/member/user/edit") - @Transactional(rollbackFor = Exception.class) - @ResponseBody - public AjaxResult editSave(SysUser user) { - - user.setUpdateBy( ShiroUtils.getLoginName() ); - return toAjax( sysUserService.updateUser( user ) ); - } - - @Log(title = "重置密码", businessType = BusinessType.UPDATE) - @PostMapping("/member/user/resetPwd") - @ResponseBody - public AjaxResult resetPwdSave(SysUser user) { - user.setSalt( ShiroUtils.randomSalt() ); - user.setPassword( passwordService.encryptPassword( user.getLoginName(), user.getPassword(), user.getSalt() ) ); - return toAjax( sysUserService.resetUserPwd( user ) ); - } - - /** - * 校验用户名 - */ - @PostMapping("/member/user//checkLoginNameUnique") - @ResponseBody - public String checkLoginNameUnique(SysUser user) { - return sysUserService.checkLoginNameUnique( user.getLoginName() ); - } - - /** - * 校验手机号码 - */ - @PostMapping("/member/user//checkPhoneUnique") - @ResponseBody - public String checkPhoneUnique(SysUser user) { - return sysUserService.checkPhoneUnique( user ); - } - - /** - * 校验email邮箱 - */ - @PostMapping("/member/user//checkEmailUnique") - @ResponseBody - public String checkEmailUnique(SysUser user) { - return sysUserService.checkEmailUnique( user ); - } } \ No newline at end of file