diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserVerifyController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserVerifyController.java index e2acfc5..2fd27bc 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/UserVerifyController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/UserVerifyController.java @@ -1,5 +1,6 @@ package com.gxwebsoft.common.system.controller; +import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -17,6 +18,7 @@ import com.gxwebsoft.common.core.annotation.OperationLog; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -32,120 +34,132 @@ import java.util.List; @RestController @RequestMapping("/api/system/user-verify") public class UserVerifyController extends BaseController { - @Resource - private UserVerifyService userVerifyService; - @Resource - private UserService userService; + @Resource + private UserVerifyService userVerifyService; + @Resource + private UserService userService; - @PreAuthorize("hasAuthority('sys:userVerify:list')") - @ApiOperation("分页查询实名认证") - @GetMapping("/page") - public ApiResult> page(UserVerifyParam param) { - // 使用关联查询 - return success(userVerifyService.pageRel(param)); + @PreAuthorize("hasAuthority('sys:userVerify:list')") + @ApiOperation("分页查询实名认证") + @GetMapping("/page") + public ApiResult> page(UserVerifyParam param) { + // 使用关联查询 + return success(userVerifyService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('sys:userVerify:list')") + @ApiOperation("查询全部实名认证") + @GetMapping() + public ApiResult> list(UserVerifyParam param) { + // 使用关联查询 + return success(userVerifyService.listRel(param)); + } + + @ApiOperation("根据id查询实名认证") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(userVerifyService.getByIdRel(id)); + } + + @ApiOperation("根据userId查询实名认证") + @GetMapping("/myUserVerify") + public ApiResult myUserVerify() { + if (getLoginUser() == null) { + return fail("请先登录", null); + } + return success(userVerifyService.getOne(new LambdaQueryWrapper().eq(UserVerify::getUserId, getLoginUserId()).last("limit 1"))); + } + + @ApiOperation("提交实名认证") + @PostMapping() + public ApiResult save(@RequestBody UserVerify userVerify) { + if (getLoginUser() == null) { + return fail("请先登录"); + } + userVerify.setUserId(getLoginUserId()); + if (userVerifyService.save(userVerify)) { + return success("提交成功"); + } + return fail("提交失败"); + } + + @Transactional(rollbackFor = Exception.class) + @ApiOperation("修改实名认证") + @PutMapping() + public ApiResult update(@RequestBody UserVerify userVerify) { + final User loginUser = getLoginUser(); + if (loginUser == null) { + return fail("请先登录"); } - @PreAuthorize("hasAuthority('sys:userVerify:list')") - @ApiOperation("查询全部实名认证") - @GetMapping() - public ApiResult> list(UserVerifyParam param) { - // 使用关联查询 - return success(userVerifyService.listRel(param)); + final User byUserId = userService.getByUserId(userVerify.getUserId().toString()); + if (ObjUtil.isEmpty(byUserId)) { + return fail("用户不存在"); } - - @ApiOperation("根据id查询实名认证") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(userVerifyService.getByIdRel(id)); - } - - @ApiOperation("根据userId查询实名认证") - @GetMapping("/myUserVerify") - public ApiResult myUserVerify() { - if(getLoginUser() == null){ - return fail("请先登录",null); + // 不通过 + byUserId.setCertification(false); + // 通过认证 + if (userVerify.getStatus().equals(1)) { + byUserId.setRealName(userVerify.getRealName()); + byUserId.setCertification(true); + byUserId.setType(userVerify.getType()); + // 企业认证 + if (userVerify.getType().equals(1)) { + byUserId.setRealName(userVerify.getName()); } - return success(userVerifyService.getOne(new LambdaQueryWrapper().eq(UserVerify::getUserId, getLoginUserId()).last("limit 1"))); } + userService.updateById(byUserId); - @ApiOperation("提交实名认证") - @PostMapping() - public ApiResult save(@RequestBody UserVerify userVerify) { - if (getLoginUser() == null) { - return fail("请先登录"); - } - userVerify.setUserId(getLoginUserId()); - if (userVerifyService.save(userVerify)) { - return success("提交成功"); - } - return fail("提交失败"); + if (userVerifyService.updateById(userVerify)) { + return success("提交成功"); } + return fail("提交失败"); + } - @ApiOperation("修改实名认证") - @PutMapping() - public ApiResult update(@RequestBody UserVerify userVerify) { - final User loginUser = getLoginUser(); - if (loginUser == null) { - return fail("请先登录"); - } - if (userVerify.getStatus().equals(1)){ - loginUser.setRealName(userVerify.getRealName()); - if(userVerify.getType().equals(1)){ - loginUser.setRealName(userVerify.getName()); - loginUser.setCertification(1); - } - userService.updateById(loginUser); - } - if (userVerifyService.updateById(userVerify)) { - return success("提交成功"); - } - return fail("提交失败"); + @PreAuthorize("hasAuthority('sys:userVerify:remove')") + @OperationLog + @ApiOperation("删除实名认证") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userVerifyService.removeById(id)) { + return success("删除成功"); } + return fail("删除失败"); + } - @PreAuthorize("hasAuthority('sys:userVerify:remove')") - @OperationLog - @ApiOperation("删除实名认证") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (userVerifyService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); + @PreAuthorize("hasAuthority('sys:userVerify:save')") + @OperationLog + @ApiOperation("批量添加实名认证") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userVerifyService.saveBatch(list)) { + return success("添加成功"); } + return fail("添加失败"); + } - @PreAuthorize("hasAuthority('sys:userVerify:save')") - @OperationLog - @ApiOperation("批量添加实名认证") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (userVerifyService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); + @PreAuthorize("hasAuthority('sys:userVerify:update')") + @OperationLog + @ApiOperation("批量修改实名认证") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userVerifyService, "id")) { + return success("修改成功"); } + return fail("修改失败"); + } - @PreAuthorize("hasAuthority('sys:userVerify:update')") - @OperationLog - @ApiOperation("批量修改实名认证") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(userVerifyService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:userVerify:remove')") - @OperationLog - @ApiOperation("批量删除实名认证") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (userVerifyService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); + @PreAuthorize("hasAuthority('sys:userVerify:remove')") + @OperationLog + @ApiOperation("批量删除实名认证") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userVerifyService.removeByIds(ids)) { + return success("删除成功"); } + return fail("删除失败"); + } } diff --git a/src/main/java/com/gxwebsoft/common/system/entity/User.java b/src/main/java/com/gxwebsoft/common/system/entity/User.java index 6f77f9a..14b7118 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/User.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java @@ -248,7 +248,7 @@ public class User implements UserDetails { private String companyName; @ApiModelProperty("是否已实名认证") - private Integer certification; + private Boolean certification; @ApiModelProperty("机构名称") @TableField(exist = false)