liangwen/hb_resource_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

注册申请审核接口漏提交文件

Browse Source
This commit is contained in:
liangwen 2025-09-12 09:45:10 +08:00
parent efcff29963
commit 375858c943
1 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
hb-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterRequestController.java
View File

@ -1,10 +1,16 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@ -36,6 +42,12 @@ public class SysRegisterRequestController extends BaseController
@Autowired @Autowired
private ISysRegisterRequestService sysRegisterRequestService; private ISysRegisterRequestService sysRegisterRequestService;
@Autowired
private ISysRoleService roleService;
@Autowired
private ISysUserService userService;
/** /**
* 查询注册申请列表 * 查询注册申请列表
*/ */
@ -70,7 +82,18 @@ public class SysRegisterRequestController extends BaseController
@GetMapping(value = "/{requestId}") @GetMapping(value = "/{requestId}")
public AjaxResult getInfo(@PathVariable("requestId") Long requestId) public AjaxResult getInfo(@PathVariable("requestId") Long requestId)
{ {
return success(sysRegisterRequestService.selectSysRegisterRequestByRequestId(requestId)); AjaxResult ajax = AjaxResult.success();
SysRegisterRequest sysRegisterRequest = sysRegisterRequestService.selectSysRegisterRequestByRequestId(requestId);
if (sysRegisterRequest != null)
{
Long userId = sysRegisterRequest.getUserId();
List<SysRole> roles = roleService.selectRoleAll();
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
SysUser sysUser = userService.selectUserById(userId);
ajax.put(AjaxResult.DATA_TAG, sysRegisterRequest);
ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
}
return ajax;
} }
/** /**
@ -106,24 +129,27 @@ public class SysRegisterRequestController extends BaseController
return toAjax(sysRegisterRequestService.deleteSysRegisterRequestByRequestIds(requestIds)); return toAjax(sysRegisterRequestService.deleteSysRegisterRequestByRequestIds(requestIds));
} }
@ApiOperation(value = "2.2 注册申请审核通过") @ApiOperation(value = "2.2 注册申请人工审核通过")
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "requestId", value = "申请id", dataType = "Integer", dataTypeClass = Integer.class), @ApiImplicitParam(name = "requestId", value = "申请id", dataType = "Integer", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "remark", value = "备注", dataType = "String", dataTypeClass = String.class, required = false), @ApiImplicitParam(name = "remark", value = "备注", dataType = "String", dataTypeClass = String.class, required = false),
@ApiImplicitParam(name = "roleIds", value = "角色id数组", required = false),
}) })
@PostMapping("/approve/{requestId}") @PostMapping("/approve/{requestId}")
public AjaxResult approve(@PathVariable Long requestId, @RequestParam(required = false) String remark) { public AjaxResult approve(@PathVariable Long requestId,
@RequestParam(required = false) String remark,
@RequestParam(required = false) Long[] roleIds) {
try { try {
sysRegisterRequestService.approve(requestId, true, remark); sysRegisterRequestService.approve(requestId, true, remark, roleIds);
return AjaxResult.success("审批通过"); return AjaxResult.success();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return AjaxResult.error("审批出错"); return AjaxResult.error(e.getMessage());
} }
} }
@ApiOperation(value = "2.3 注册申请驳回") @ApiOperation(value = "2.3 注册申请人工审核驳回")
@ApiOperationSupport(order = 3) @ApiOperationSupport(order = 3)
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "requestId", value = "申请id", dataType = "Integer", dataTypeClass = Integer.class), @ApiImplicitParam(name = "requestId", value = "申请id", dataType = "Integer", dataTypeClass = Integer.class),
@ -132,11 +158,11 @@ public class SysRegisterRequestController extends BaseController
@PostMapping("/reject/{requestId}") @PostMapping("/reject/{requestId}")
public AjaxResult reject(@PathVariable Long requestId, @RequestParam String remark) { public AjaxResult reject(@PathVariable Long requestId, @RequestParam String remark) {
try { try {
sysRegisterRequestService.approve(requestId, false, remark); sysRegisterRequestService.approve(requestId, false, remark, null);
return AjaxResult.success("已驳回"); return AjaxResult.success();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return AjaxResult.error("已驳回出错"); return AjaxResult.error(e.getMessage());
} }
} }
} }