diff --git a/maxkey-core/src/main/java/org/maxkey/entity/RoleMember.java b/maxkey-core/src/main/java/org/maxkey/entity/RoleMember.java index 6f50ef449..c31b57a65 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/RoleMember.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/RoleMember.java @@ -48,7 +48,7 @@ public class RoleMember extends UserInfo implements Serializable{ @Column private String roleId; private String roleName; - private String dynamic; + private String category; @Column private String memberId; private String memberName; @@ -160,14 +160,17 @@ public class RoleMember extends UserInfo implements Serializable{ this.memberName = memberName; } - public String getDynamic() { - return dynamic; + + public String getCategory() { + return category; } - public void setDynamic(String dynamic) { - this.dynamic = dynamic; + + public void setCategory(String category) { + this.category = category; } + public String getInstId() { return instId; } @@ -197,8 +200,8 @@ public class RoleMember extends UserInfo implements Serializable{ builder.append(roleId); builder.append(", roleName="); builder.append(roleName); - builder.append(", dynamic="); - builder.append(dynamic); + builder.append(", category="); + builder.append(category); builder.append(", memberId="); builder.append(memberId); builder.append(", memberName="); diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Roles.java b/maxkey-core/src/main/java/org/maxkey/entity/Roles.java index 1d01fc9bc..46bba6603 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Roles.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/Roles.java @@ -1,5 +1,5 @@ /* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] + * Copyright [2022] [MaxKey of copyright http://www.maxkey.top] * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +31,16 @@ import org.hibernate.validator.constraints.Length; public class Roles extends JpaBaseEntity implements Serializable { private static final long serialVersionUID = 4660258495864814777L; + + public class Category{ + public static final String DYNAMIC = "dynamic"; + + public static final String STATIC = "static"; + + public static final String APP = "app"; + } + + @Id @Column @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") @@ -45,7 +55,7 @@ public class Roles extends JpaBaseEntity implements Serializable { String roleName; @Column - String dynamic; + String category; @Column String filters ; @@ -185,20 +195,20 @@ public class Roles extends JpaBaseEntity implements Serializable { * 3, not filters */ public void setDefaultAllUser() { - this.dynamic = "1"; + this.category = "dynamic"; this.orgIdsList =""; this.filters =""; } - - public String getDynamic() { - return dynamic; - } - public void setDynamic(String dynamic) { - this.dynamic = dynamic; - } + public String getCategory() { + return category; + } - public String getFilters() { + public void setCategory(String category) { + this.category = category; + } + + public String getFilters() { return filters; } @@ -255,8 +265,8 @@ public class Roles extends JpaBaseEntity implements Serializable { builder.append(roleCode); builder.append(", roleName="); builder.append(roleName); - builder.append(", dynamic="); - builder.append(dynamic); + builder.append(", category="); + builder.append(category); builder.append(", filters="); builder.append(filters); builder.append(", orgIdsList="); diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolesService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolesService.java index c4109399d..7732df29a 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolesService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolesService.java @@ -1,5 +1,5 @@ /* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] + * Copyright [2022] [MaxKey of copyright http://www.maxkey.top] * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -79,7 +79,7 @@ public class RolesService extends JpaBaseService implements Serializable } public void refreshDynamicRoles(Roles dynamicRole){ - if(dynamicRole.getDynamic().equals(ConstsStatus.ACTIVE+"")) { + if(dynamicRole.getCategory().equals(Roles.Category.DYNAMIC)) { boolean isDynamicTimeSupport = false; boolean isBetweenEffectiveTime = false; if(StringUtils.isNotBlank(dynamicRole.getResumeTime()) diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml index 3192f3ac8..c263a8082 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml @@ -16,7 +16,7 @@ rm.id as id, r.id as roleid, r.rolename, - r.dynamic dynamic, + r.category category, u.username, u.usertype, u.windowsaccount, diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Roles.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Roles.ts index 02bcbf376..c6ff53b06 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Roles.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Roles.ts @@ -21,14 +21,13 @@ import { BaseEntity } from './BaseEntity'; export class Roles extends BaseEntity { roleCode!: String; roleName!: String; - dynamic!: String; + category!: String; filters!: String; orgIdsList!: String; resumeTime!: String; suspendTime!: String; isdefault!: String; - switch_dynamic: boolean = false; picker_resumeTime: Date = new Date(format(new Date(), 'yyyy-MM-dd 00:00:00')); picker_suspendTime: Date = new Date(format(new Date(), 'yyyy-MM-dd 00:00:00')); @@ -41,9 +40,7 @@ export class Roles extends BaseEntity { if (this.status == 1) { this.switch_status = true; } - if (this.dynamic == '1') { - this.switch_dynamic = true; - } + if (this.resumeTime != '') { this.picker_resumeTime = new Date(format(new Date(), `yyyy-MM-dd ${this.resumeTime}:00`)); } @@ -57,11 +54,6 @@ export class Roles extends BaseEntity { } else { this.status = 0; } - if (this.switch_dynamic) { - this.dynamic = '1'; - } else { - this.dynamic = '0'; - } if (this.picker_resumeTime) { this.resumeTime = format(this.picker_resumeTime, 'HH:mm'); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.ts index 9ddbb0133..1db8d795f 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.ts @@ -16,6 +16,7 @@ import { ChangeDetectionStrategy, ViewContainerRef, ChangeDetectorRef, Component, OnInit, Inject } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { ActivatedRoute, Router } from '@angular/router'; import { I18NService } from '@core'; import { _HttpClient, ALAIN_I18N_TOKEN, SettingsService } from '@delon/theme'; import { format, addDays } from 'date-fns'; @@ -100,11 +101,16 @@ export class PermissionsComponent implements OnInit { private fb: FormBuilder, private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, + private route: ActivatedRoute, private cdr: ChangeDetectorRef, private http: _HttpClient ) { } ngOnInit(): void { + if (this.route.snapshot.queryParams['roleId']) { + this.query.params.roleId = this.route.snapshot.queryParams['roleId']; + this.query.params.roleName = this.route.snapshot.queryParams['roleName']; + } this.query.tableInitialize = false; } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members.component.html index 09ca44e11..3b3492960 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members.component.html @@ -57,7 +57,6 @@ (nzCheckedChange)="onTableAllChecked($event)"> {{ 'mxk.roles.name' | i18n }} {{ 'mxk.users.username' | i18n }} - {{ 'mxk.users.employeeNumber' | i18n }} {{ 'mxk.users.displayName' | i18n }} {{ 'mxk.users.department' | i18n }} {{ 'mxk.users.jobTitle' | i18n }} @@ -71,7 +70,6 @@ (nzCheckedChange)="onTableItemChecked(data.id, $event)"> {{ data.roleName }} {{ data.username }} - {{ data.employeeNumber }} {{ data.displayName }} {{ data.department }} {{ data.jobTitle }} @@ -79,7 +77,7 @@ i18n) }}
- diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members.component.ts index 504aec37f..f9ef10417 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members.component.ts @@ -110,6 +110,10 @@ export class RoleMembersComponent implements OnInit { if (this.route.snapshot.queryParams['username']) { this.query.params.username = this.route.snapshot.queryParams['username']; } + if (this.route.snapshot.queryParams['roleId']) { + this.query.params.roleId = this.route.snapshot.queryParams['roleId']; + this.query.params.roleName = this.route.snapshot.queryParams['roleName']; + } this.query.tableInitialize = false; } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/role-editer/role-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/role-editer/role-editer.component.html index af51befa4..5e6bd8dfe 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/role-editer/role-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/role-editer/role-editer.component.html @@ -22,29 +22,29 @@ - {{ 'mxk.roles.dynamic' | i18n }} + {{ 'mxk.roles.category' | i18n }} - - - + + + + - + {{ 'mxk.roles.resumeTime' | i18n }} - + {{ 'mxk.roles.suspendTime' | i18n }} - + {{ 'mxk.roles.orgIdsList' | i18n }} - + {{ 'mxk.roles.filters' | i18n }}