From b0107f0e54957b9dcae99be83ed98c736a01ebc7 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 15 Jan 2021 15:07:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0customerId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/RoleOperationDTO.java | 5 +++++ .../src/main/java/com/epmet/dto/RoleScopeDTO.java | 5 +++++ .../epmet/dto/form/InitDefaultOperationsFormDTO.java | 2 +- .../java/com/epmet/entity/RoleOperationEntity.java | 5 +++++ .../main/java/com/epmet/entity/RoleScopeEntity.java | 4 ++++ .../epmet/service/impl/RoleOperationServiceImpl.java | 12 ++++++++---- .../java/com/epmet/dto/CustomerHomeDetailDTO.java | 5 +++++ .../com/epmet/entity/CustomerHomeDetailEntity.java | 5 ++++- .../epmet/service/impl/CustomerHomeServiceImpl.java | 1 + .../epmet/service/impl/GovStaffRoleServiceImpl.java | 1 + 10 files changed, 39 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleOperationDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleOperationDTO.java index bda4931386..8b6cad6c1d 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleOperationDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleOperationDTO.java @@ -39,6 +39,11 @@ public class RoleOperationDTO implements Serializable { */ private String id; + /** + * 客户ID + */ + private String customerId; + /** * 角色ID */ diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleScopeDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleScopeDTO.java index 17f8866215..ee9a3dfa6e 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleScopeDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleScopeDTO.java @@ -33,6 +33,11 @@ public class RoleScopeDTO implements Serializable { private static final long serialVersionUID = 1L; + /** + * 客户ID + */ + private String customerId; + /** * */ diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/InitDefaultOperationsFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/InitDefaultOperationsFormDTO.java index d7b487ad67..670f26d2ce 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/InitDefaultOperationsFormDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/InitDefaultOperationsFormDTO.java @@ -13,7 +13,7 @@ public class InitDefaultOperationsFormDTO { public static class InitDefaultOpesRoleDTO { public InitDefaultOpesRoleDTO() { } - + private String customerId; private String roleId; private String roleKey; } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationEntity.java index 96f70de1be..e18ff011b5 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationEntity.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationEntity.java @@ -38,6 +38,11 @@ public class RoleOperationEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; + /** + * 客户ID + */ + private String customerId; + /** * 角色ID */ diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleScopeEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleScopeEntity.java index 2c3c6f21dc..c6e7b291e9 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleScopeEntity.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleScopeEntity.java @@ -37,6 +37,10 @@ import java.util.Date; public class RoleScopeEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; + /** + * 客户ID + */ + private String customerId; /** * 角色ID diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java index 28943e74b8..393bfdb12f 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java @@ -128,11 +128,12 @@ public class RoleOperationServiceImpl extends BaseServiceImpl defaultOperations = roleOperationDefaultDao.listByRoleKey(roleKey); if (!CollectionUtils.isEmpty(defaultOperations)) { // 有的角色并没有配置默认的操作权限，应该忽略 - initDefaultOperationsForRole(roleId, defaultOperations); - initDefaultOperationScopesForRole(roleId, roleKey, defaultOperations); + initDefaultOperationsForRole(roleId, customerId, defaultOperations); + initDefaultOperationScopesForRole(roleId, roleKey, customerId, defaultOperations); } } } @@ -140,13 +141,15 @@ public class RoleOperationServiceImpl extends BaseServiceImpl operations) { + public void initDefaultOperationsForRole(String roleId, String customerId, List operations) { for (RoleOperationDefaultResultDTO operation : operations) { RoleOperationEntity entity = new RoleOperationEntity(); entity.setOperationKey(operation.getOperationKey()); entity.setRoleId(roleId); + entity.setCustomerId(customerId); roleOperationDao.insert(entity); } } @@ -157,7 +160,7 @@ public class RoleOperationServiceImpl extends BaseServiceImpl operations) { + public void initDefaultOperationScopesForRole(String roleId, String roleKey, String customerId, List operations) { HashMap> opeScopeMap = listDefaultOpeScopesMap(roleKey); for (RoleOperationDefaultResultDTO operation : operations) { // 该角色，该操作的操作范围列表 @@ -168,6 +171,7 @@ public class RoleOperationServiceImpl extends BaseServiceImpl list = tempList.stream().map(temp -> { CustomerHomeDetailEntity detailEntity = new CustomerHomeDetailEntity(); + detailEntity.setCustomerId(customerId); detailEntity.setHomeId(entity.getId()); detailEntity.setComponentId(temp.getComponentId()); detailEntity.setConfiguration(temp.getConfiguration()); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java index 726be2370d..00e6008bcf 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java @@ -154,6 +154,7 @@ public class GovStaffRoleServiceImpl extends BaseServiceImpl