diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigOpesFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigOpesFormDTO.java index 8a84ddf960..648fbea210 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigOpesFormDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigOpesFormDTO.java @@ -11,6 +11,8 @@ public class AccessConfigOpesFormDTO { @NotBlank(message = "角色ID不能为空") private String roleId; + @NotBlank(message = "客户ID不能为空") + private String customerId; private List opes; } diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigSaveConfigDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigSaveConfigDTO.java index 6a918b5bb2..b2e2881fe7 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigSaveConfigDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigSaveConfigDTO.java @@ -15,4 +15,7 @@ public class AccessConfigSaveConfigDTO { private Set scopeKeys; private Set settingKeys; + @NotBlank(message = "客户ID不能为空") + private String customerId; + } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java index 0983ca46a4..49ab6f6f9d 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java @@ -51,7 +51,7 @@ public class AccessConfigController { */ @PostMapping("saveroleopes") public Result saveRoleOpes(@RequestBody AccessConfigOpesFormDTO formDTO) { - accessConfigService.saveRoleOpes(formDTO.getRoleId(), formDTO.getOpes()); + accessConfigService.saveRoleOpes(formDTO.getRoleId(), formDTO.getOpes(), formDTO.getCustomerId()); return new Result(); } @@ -77,7 +77,8 @@ public class AccessConfigController { String roleId = config.getRoleId(); String operationKey = config.getOperationKey(); Set scopeKeys = config.getScopeKeys(); - accessConfigService.saveConfig(roleId, operationKey, scopeKeys); + String customerId = config.getCustomerId(); + accessConfigService.saveConfig(roleId, operationKey, scopeKeys, customerId); return new Result(); } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java index a2b1850e04..4d50c59ebe 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java @@ -12,11 +12,11 @@ import java.util.Set; public interface AccessConfigService { List listOpesByRole(String roleId); - void saveRoleOpes(String roleId, List opes); + void saveRoleOpes(String roleId, List opes, String customerId); AccessConfigOptionsResultDTO listScopeOptionsForAccessConfig(String roleId, String operationKey); - void saveConfig(String roleId, String operationKey, Set scopeKeys); + void saveConfig(String roleId, String operationKey, Set scopeKeys, String customerId); List listRoleDefaultOpsByRoleKey(String roleKey); diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java index 52a0ae282c..ab5ef83012 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java @@ -54,7 +54,7 @@ public class AccessConfigServiceImpl implements AccessConfigService { @Override @Transactional(rollbackFor = Exception.class) - public void saveRoleOpes(String roleId, List opes) { + public void saveRoleOpes(String roleId, List opes, String customerId) { List operationsDB = roleOperationDao.listOperationsByRoleId(roleId); Set opeKeysDB = operationsDB.stream().map(opeDB -> opeDB.getOperationKey()).collect(Collectors.toSet()); Set opeKeysForm = opes.stream().map(opeForm -> opeForm.getOperationKey()).collect(Collectors.toSet()); @@ -80,6 +80,7 @@ public class AccessConfigServiceImpl implements AccessConfigService { RoleOperationEntity newRoleOpe = new RoleOperationEntity(); newRoleOpe.setRoleId(roleId); newRoleOpe.setOperationKey(s); + newRoleOpe.setCustomerId(customerId); roleOperationDao.insert(newRoleOpe); } } @@ -100,7 +101,7 @@ public class AccessConfigServiceImpl implements AccessConfigService { @Override @Transactional - public void saveConfig(String roleId, String operationKey, Set scopeKeys) { + public void saveConfig(String roleId, String operationKey, Set scopeKeys, String customerId) { List scopesDB = roleScopeDao.listScopeEntities(roleId, operationKey); // 数据库中已有的scopeKey列表 Set scopeKeysDB = scopesDB.stream().map(scope -> scope.getScopeKey()).collect(Collectors.toSet()); @@ -119,6 +120,7 @@ public class AccessConfigServiceImpl implements AccessConfigService { rs2Add.setRoleId(roleId); rs2Add.setOperationKey(operationKey); rs2Add.setScopeKey(scopeKey); + rs2Add.setCustomerId(customerId); roleScopeDao.insert(rs2Add); } });