gitee
/
eiam
mirror of https://gitee.com/topiam/eiam
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

⚡ 优化代码

pull/65/head
awenes 2023-10-05 13:06:39 +08:00
parent 59f1844d5b
commit c4efe08aa9
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eiam-console/src/main/console-fe/src/pages/account/UserDetail/components/LoginAudit/LoginAudit.tsx
View File

@ -96,6 +96,7 @@ export default (props: { userId: string }) => {
<ProTable <ProTable
columns={columns} columns={columns}
search={false} search={false}
rowKey={'id'}
request={getLoginAuditList} request={getLoginAuditList}
params={{ userId: userId }} params={{ userId: userId }}
pagination={{ pageSize: 10 }} pagination={{ pageSize: 10 }}

2
eiam-console/src/main/java/cn/topiam/employee/console/controller/account/UserController.java
View File

@ -286,7 +286,7 @@ public class UserController {
@Operation(description = "查询用户登录审计列表") @Operation(description = "查询用户登录审计列表")
@GetMapping(value = "/login_audit/list") @GetMapping(value = "/login_audit/list")
@PreAuthorize(value = "authenticated and @sae.hasAuthority(T(cn.topiam.employee.support.security.userdetails.UserType).ADMIN)") @PreAuthorize(value = "authenticated and @sae.hasAuthority(T(cn.topiam.employee.support.security.userdetails.UserType).ADMIN)")
public ApiRestResult<Page<UserLoginAuditListResult>> getUserLoginAuditList(@Parameter(description = "ID") @RequestParam(value = "userId", required = false) @NotBlank(message = "用户ID不能为空") Long id, public ApiRestResult<Page<UserLoginAuditListResult>> getUserLoginAuditList(@Parameter(description = "ID") @RequestParam(value = "userId", required = false) @NotNull(message = "用户ID不能为空") Long id,
PageModel pageModel) { PageModel pageModel) {
Page<UserLoginAuditListResult> list = userService.findUserLoginAuditList(id, pageModel); Page<UserLoginAuditListResult> list = userService.findUserLoginAuditList(id, pageModel);
return ApiRestResult.ok(list); return ApiRestResult.ok(list);

1
eiam-console/src/main/java/cn/topiam/employee/console/converter/account/UserConverter.java
View File

@ -266,6 +266,7 @@ public interface UserConverter {
//总记录数 //总记录数
auditEntityPage.forEach(audit -> { auditEntityPage.forEach(audit -> {
UserLoginAuditListResult result = new UserLoginAuditListResult(); UserLoginAuditListResult result = new UserLoginAuditListResult();
result.setId(audit.getId().toString());
//单点登录 //单点登录
if (audit.getEventType().getCode().equals(PortalEventType.APP_SSO.getCode())) { if (audit.getEventType().getCode().equals(PortalEventType.APP_SSO.getCode())) {
result.setAppName(getAppName(audit.getTargets().get(0).getId())); result.setAppName(getAppName(audit.getTargets().get(0).getId()));

5
eiam-console/src/main/java/cn/topiam/employee/console/pojo/result/account/UserLoginAuditListResult.java
View File

@ -35,6 +35,11 @@ import io.swagger.v3.oas.annotations.media.Schema;
@Data @Data
@Schema(description = "用户登录日志返回响应") @Schema(description = "用户登录日志返回响应")
public class UserLoginAuditListResult { public class UserLoginAuditListResult {
/**
* ID
*/
@Parameter(description = "ID")
private String id;
/** /**
* 应用名称 * 应用名称