From b1b021e63ff81bef82ce711f5612e59b8c699dcd Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Wed, 27 Apr 2022 15:23:36 +0800
Subject: [PATCH] dynamic Groups and Roles

---
 .../java/org/maxkey/entity/GroupMember.java   |  9 +++-
 .../java/org/maxkey/entity/RoleMember.java    | 11 +++-
 .../persistence/mapper/GroupMemberMapper.java |  1 -
 .../persistence/mapper/RoleMemberMapper.java  |  1 -
 .../mapper/xml/mysql/GroupMemberMapper.xml    | 53 +++----------------
 .../mapper/xml/mysql/RoleMemberMapper.xml     | 51 +++---------------
 .../group-members.component.html              | 14 +++--
 .../group-editer/group-editer.component.html  |  8 +--
 .../role-members/role-members.component.html  | 14 +++--
 .../role-editer/role-editer.component.html    |  8 +--
 .../contorller/GroupMemberController.java     | 10 ++--
 .../access/contorller/GroupsController.java   |  2 +-
 .../contorller/RoleMemberController.java      |  9 +---
 13 files changed, 68 insertions(+), 123 deletions(-)

diff --git a/maxkey-core/src/main/java/org/maxkey/entity/GroupMember.java b/maxkey-core/src/main/java/org/maxkey/entity/GroupMember.java
index e11486a98..7dcd7341e 100644
--- a/maxkey-core/src/main/java/org/maxkey/entity/GroupMember.java
+++ b/maxkey-core/src/main/java/org/maxkey/entity/GroupMember.java
@@ -48,6 +48,7 @@ public class GroupMember extends UserInfo implements Serializable{
 	@Column
 	private String groupId;
 	private String groupName;
+	private String dynamic;
 	@Column
 	private String memberId;
 	private String memberName;
@@ -163,11 +164,17 @@ public class GroupMember extends UserInfo implements Serializable{
 		return memberName;
 	}
 
-
 	public void setMemberName(String memberName) {
 		this.memberName = memberName;
 	}
 
+	public String getDynamic() {
+		return dynamic;
+	}
+
+	public void setDynamic(String dynamic) {
+		this.dynamic = dynamic;
+	}
 
 	public String getInstId() {
 		return instId;
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 030e3c605..2e51a4ecb 100644
--- a/maxkey-core/src/main/java/org/maxkey/entity/RoleMember.java
+++ b/maxkey-core/src/main/java/org/maxkey/entity/RoleMember.java
@@ -42,6 +42,7 @@ public class RoleMember extends UserInfo implements Serializable {
     @Column
     private String roleId;
     private String roleName;
+    private String dynamic;
     @Column
     private String memberId;
     private String memberName;
@@ -80,7 +81,15 @@ public class RoleMember extends UserInfo implements Serializable {
         this.roleName = roleName;
     }
 
-    public String getMemberId() {
+    public String getDynamic() {
+		return dynamic;
+	}
+
+	public void setDynamic(String dynamic) {
+		this.dynamic = dynamic;
+	}
+
+	public String getMemberId() {
         return memberId;
     }
 
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupMemberMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupMemberMapper.java
index a25e0e0dd..4b8c40ed7 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupMemberMapper.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupMemberMapper.java
@@ -34,7 +34,6 @@ import org.maxkey.entity.UserInfo;
 
 public  interface GroupMemberMapper extends IJpaBaseMapper<GroupMember> {
 	
-	public List<GroupMember> allMemberInGroup(GroupMember entity);
 	public List<GroupMember> memberInGroup(GroupMember entity);
 	public List<GroupMember> memberNotInGroup(GroupMember entity);
 	public List<GroupMember> groupMemberInGroup(GroupMember entity);
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RoleMemberMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RoleMemberMapper.java
index 3a5fb143f..93eee32a9 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RoleMemberMapper.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RoleMemberMapper.java
@@ -33,7 +33,6 @@ import org.maxkey.entity.Roles;
 
 public  interface RoleMemberMapper extends IJpaBaseMapper<RoleMember> {
 	
-	public List<RoleMember> allMemberInRole(RoleMember entity);
 	public List<RoleMember> memberInRole(RoleMember entity);
 	public List<RoleMember> memberNotInRole(RoleMember entity);
 	public List<RoleMember> roleMemberInRole(RoleMember entity);
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml
index fca4fe6e0..e6f9813da 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml
@@ -11,51 +11,12 @@
 		</if>
     </sql>
     
-
-    <!-- GROUP_MEMBER  User Member-->
-    <select id="allMemberInGroup" parameterType="GroupMember" resultType="GroupMember">
-		    select	distinct
-					u.id,
-					u.username,
-					u.usertype,
-					u.windowsaccount,
-					
-					u.displayname ,
-					u.nickname ,
-					u.namezhspell,
-					u.namezhshortspell,
-					u.givenname ,
-					u.middlename ,
-					u.familyname ,
-					
-					u.gender,
-		
-					u.authntype,
-					u.mobile,
-					u.email,
-					u.workemail,
-					u.workphonenumber,
-		
-					u.employeenumber,
-					u.division,
-					u.costcenter,
-					u.organization,
-					u.departmentid,
-					u.department,
-					u.jobtitle,
-					u.joblevel,
-					
-					u.createddate,
-					
-					u.status
-				from
-					mxk_userinfo u
-			where	instid  =   #{instId} 
-	</select>
-	
     <select id="memberInGroup" parameterType="GroupMember" resultType="GroupMember">
 			select	distinct
-				gm.id,
+				gm.id as id,
+				g.id as groupid,
+				g.name as groupname,
+				g.dynamic dynamic,
 				u.username,
 				u.usertype,
 				u.windowsaccount,
@@ -210,7 +171,7 @@
     		instid
     	)
     	select 
-    		concat('${id}',u.id) id,
+    		concat('${id}_',u.id) id,
     		'${id}' groupid,
     		u.id memberid,
     		'USER-DYNAMIC' type,
@@ -250,6 +211,8 @@
     
     <select id="queryMemberByGroupId" parameterType="string"  resultType="UserInfo">
             select  distinct
+                g.groupId,
+                g.groupName,
                 u.id,
                 u.username,
                 u.usertype,
@@ -296,7 +259,7 @@
     
     <delete id="deleteByGroupId" parameterType="string" >
     	delete from mxk_group_member gm
-    	where  gm.groupid=#{value}
+    	where  gm.groupid = #{value} and groupId != 'ROLE_ALL_USER'
     </delete>
 	
 </mapper>
\ No newline at end of file
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 7faf846ea..ecac5b19e 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
@@ -10,52 +10,13 @@
 			and name = #{name}
 		</if>
     </sql>
-    
-
-    <!-- ROLE_MEMBER  User Member-->
-    <select id="allMemberInRole" parameterType="RoleMember" resultType="RoleMember">
-		    select	distinct
-					u.id,
-					u.username,
-					u.usertype,
-					u.windowsaccount,
-					
-					u.displayname ,
-					u.nickname ,
-					u.namezhspell,
-					u.namezhshortspell,
-					u.givenname ,
-					u.middlename ,
-					u.familyname ,
-					
-					u.gender,
-		
-					u.authntype,
-					u.mobile,
-					u.email,
-					u.workemail,
-					u.workphonenumber,
-		
-					u.employeenumber,
-					u.division,
-					u.costcenter,
-					u.organization,
-					u.departmentid,
-					u.department,
-					u.jobtitle,
-					u.joblevel,
-					
-					u.createddate,
-					
-					u.status
-				from
-					mxk_userinfo u
-			where	instid   =   #{instId} 
-	</select>
-	
+   
     <select id="memberInRole" parameterType="RoleMember" resultType="RoleMember">
 			select	distinct
-				rm.id,
+			    r.id as roleid,
+			    r.name as rolename,
+			    r.dynamic dynamic,
+				rm.id as id,
 				u.username,
 				u.usertype,
 				u.windowsaccount,
@@ -211,7 +172,7 @@
     		type
     	)
     	select 
-    		concat('${id}',u.id) id,
+    		concat('${id}_',u.id) id,
     		'${id}' ROLEID,
     		u.id memberid,
     		'USER-DYNAMIC' type
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/group-members/group-members.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/group-members/group-members.component.html
index 7aedd66a0..cd1024cdf 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/group-members/group-members.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/group-members/group-members.component.html
@@ -76,6 +76,7 @@
         <thead>
           <tr>
             <th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate" (nzCheckedChange)="onTableAllChecked($event)"></th>
+            <th nzAlign="center">{{ 'mxk.groups.name' | i18n }}</th>
             <th nzAlign="center">{{ 'mxk.users.username' | i18n }}</th>
             <th nzAlign="center">{{ 'mxk.users.displayName' | i18n }}</th>
             <th nzAlign="center">{{ 'mxk.users.employeeNumber' | i18n }}</th>
@@ -94,6 +95,7 @@
               [nzDisabled]="data.disabled"
               (nzCheckedChange)="onTableItemChecked(data.id, $event)"
             ></td>
+            <td nzAlign="center"> {{ data.groupName }}</td>
             <td nzAlign="center"> {{ data.username }}</td>
             <td nzAlign="center"> {{ data.displayName }}</td>
             <td nzAlign="center"> {{ data.employeeNumber }}</td>
@@ -102,9 +104,15 @@
             <td nzAlign="center"> {{ data.gender == 1 ? ('mxk.users.gender.female' | i18n) : ('mxk.users.gender.male' | i18n) }}</td>
             <td nzAlign="left" nzBreakWord="false"
               ><div nz-col>
-                <button nz-button type="button" (click)="onDelete($event, data.id)" [nzType]="'primary'" nzDanger>{{
-                  'mxk.text.delete' | i18n
-                }}</button></div
+                <button
+                  *ngIf="data.dynamic == '0'"
+                  nz-button
+                  type="button"
+                  (click)="onDelete($event, data.id)"
+                  [nzType]="'primary'"
+                  nzDanger
+                  >{{ 'mxk.text.delete' | i18n }}</button
+                ></div
               ></td
             >
           </tr>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/groups/group-editer/group-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/groups/group-editer/group-editer.component.html
index d55a048ee..ed8ae58c2 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/groups/group-editer/group-editer.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/groups/group-editer/group-editer.component.html
@@ -27,7 +27,7 @@
         <ng-template #unCheckedTemplate><i nz-icon nzType="close"></i></ng-template>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
+    <nz-form-item *ngIf="form.model.switch_dynamic">
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="resumeTime">{{ 'mxk.groups.resumeTime' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid port!">
         <nz-time-picker
@@ -39,7 +39,7 @@
         ></nz-time-picker>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
+    <nz-form-item *ngIf="form.model.switch_dynamic">
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="suspendTime">{{ 'mxk.groups.suspendTime' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid suspendTime!">
         <nz-time-picker
@@ -51,13 +51,13 @@
         ></nz-time-picker>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
+    <nz-form-item *ngIf="form.model.switch_dynamic">
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="orgIdsList">{{ 'mxk.groups.orgIdsList' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid upperCase!">
         <input [(ngModel)]="form.model.orgIdsList" [ngModelOptions]="{ standalone: true }" nz-input name="orgIdsList" id="orgIdsList" />
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
+    <nz-form-item *ngIf="form.model.switch_dynamic">
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="filters">{{ 'mxk.groups.filters' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid filters!">
         <textarea
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members.component.html
index a7ef629e0..884c9e830 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members.component.html
@@ -76,6 +76,7 @@
         <thead>
           <tr>
             <th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate" (nzCheckedChange)="onTableAllChecked($event)"></th>
+            <th nzAlign="center">{{ 'mxk.roles.name' | i18n }}</th>
             <th nzAlign="center">{{ 'mxk.users.username' | i18n }}</th>
             <th nzAlign="center">{{ 'mxk.users.displayName' | i18n }}</th>
             <th nzAlign="center">{{ 'mxk.users.employeeNumber' | i18n }}</th>
@@ -94,6 +95,7 @@
               [nzDisabled]="data.disabled"
               (nzCheckedChange)="onTableItemChecked(data.id, $event)"
             ></td>
+            <td nzAlign="center"> {{ data.roleName }}</td>
             <td nzAlign="center"> {{ data.username }}</td>
             <td nzAlign="center"> {{ data.displayName }}</td>
             <td nzAlign="center"> {{ data.employeeNumber }}</td>
@@ -102,9 +104,15 @@
             <td nzAlign="center"> {{ data.gender == 1 ? ('mxk.users.gender.female' | i18n) : ('mxk.users.gender.male' | i18n) }}</td>
             <td nzAlign="left" nzBreakWord="false"
               ><div nz-col>
-                <button nz-button type="button" (click)="onDelete($event, data.id)" [nzType]="'primary'" nzDanger>{{
-                  'mxk.text.delete' | i18n
-                }}</button></div
+                <button
+                  *ngIf="data.dynamic == '0'"
+                  nz-button
+                  type="button"
+                  (click)="onDelete($event, data.id)"
+                  [nzType]="'primary'"
+                  nzDanger
+                  >{{ 'mxk.text.delete' | i18n }}</button
+                ></div
               ></td
             >
           </tr>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/roles/role-editer/role-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/roles/role-editer/role-editer.component.html
index a9441e1e6..4a674992d 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/roles/role-editer/role-editer.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/roles/role-editer/role-editer.component.html
@@ -27,7 +27,7 @@
         <ng-template #unCheckedTemplate><i nz-icon nzType="close"></i></ng-template>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
+    <nz-form-item *ngIf="form.model.switch_dynamic">
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="resumeTime">{{ 'mxk.roles.resumeTime' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid port!">
         <nz-time-picker
@@ -39,7 +39,7 @@
         ></nz-time-picker>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
+    <nz-form-item *ngIf="form.model.switch_dynamic">
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="suspendTime">{{ 'mxk.roles.suspendTime' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid suspendTime!">
         <nz-time-picker
@@ -51,13 +51,13 @@
         ></nz-time-picker>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
+    <nz-form-item *ngIf="form.model.switch_dynamic">
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="orgIdsList">{{ 'mxk.roles.orgIdsList' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid upperCase!">
         <input [(ngModel)]="form.model.orgIdsList" [ngModelOptions]="{ standalone: true }" nz-input name="orgIdsList" id="orgIdsList" />
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
+    <nz-form-item *ngIf="form.model.switch_dynamic">
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="filters">{{ 'mxk.roles.filters' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid filters!">
         <textarea
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/GroupMemberController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/GroupMemberController.java
index c873a8985..0ccc67a28 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/GroupMemberController.java
+++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/GroupMemberController.java
@@ -68,13 +68,9 @@ public class GroupMemberController {
 	public ResponseEntity<?> memberInGroup(@ModelAttribute GroupMember groupMember,@CurrentUser UserInfo currentUser) {
 		_logger.debug("groupMember : "+groupMember);
 		groupMember.setInstId(currentUser.getInstId());
-		if(groupMember.getGroupId()==null||groupMember.getGroupId().equals("")||groupMember.getGroupId().equals("ROLE_ALL_USER")){
-			return new Message<JpaPageResults<GroupMember>>(
-					groupMemberService.queryPageResults("allMemberInGroup",groupMember)).buildResponse();
-		}else{
-			return new Message<JpaPageResults<GroupMember>>(
-					groupMemberService.queryPageResults("memberInGroup",groupMember)).buildResponse();
-		}
+		return new Message<JpaPageResults<GroupMember>>(
+				groupMemberService.queryPageResults("memberInGroup",groupMember)).buildResponse();
+
 	}
 
 	
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/GroupsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/GroupsController.java
index 7f0f74229..389d929dd 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/GroupsController.java
+++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/GroupsController.java
@@ -105,7 +105,7 @@ public class GroupsController {
 	@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) {
 		_logger.debug("-delete ids : {}" , ids);
-		
+		ids = ids.replaceAll("ROLE_ALL_USER", "-1").replaceAll("ROLE_ADMINISTRATORS", "-1");
 		if (groupsService.deleteBatch(ids)) {
 			 return new Message<Groups>(Message.SUCCESS).buildResponse();
 		} else {
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/permissions/contorller/RoleMemberController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/permissions/contorller/RoleMemberController.java
index e1700f819..c9032a599 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/permissions/contorller/RoleMemberController.java
+++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/permissions/contorller/RoleMemberController.java
@@ -67,13 +67,8 @@ public class RoleMemberController {
 	public  ResponseEntity<?> memberInRole(@ModelAttribute  RoleMember roleMember,@CurrentUser UserInfo currentUser) {
 		_logger.debug("roleMember : "+roleMember);
 		roleMember.setInstId(currentUser.getInstId());
-		if(roleMember.getRoleId()==null||roleMember.getRoleId().equals("")||roleMember.getRoleId().equals("ALL_USER_ROLE")){
-			return new Message<JpaPageResults<RoleMember>>(
-					roleMemberService.queryPageResults("allMemberInRole",roleMember)).buildResponse();
-		}else{
-			return new Message<JpaPageResults<RoleMember>>(
-					roleMemberService.queryPageResults("memberInRole",roleMember)).buildResponse();
-		}
+		return new Message<JpaPageResults<RoleMember>>(
+				roleMemberService.queryPageResults("memberInRole",roleMember)).buildResponse();
 	}
 
 	@RequestMapping(value = { "/memberNotInRole" })