saveconfig和saveroleopes接口，增加customerId

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<AccessConfigOpesResultDTO> opes;
 
 }

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<String> scopeKeys;
     private Set<String> settingKeys;
 
+    @NotBlank(message = "客户ID不能为空")
+    private String customerId;
+
 }

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<String> scopeKeys = config.getScopeKeys();
-        accessConfigService.saveConfig(roleId, operationKey, scopeKeys);
+        String customerId = config.getCustomerId();
+        accessConfigService.saveConfig(roleId, operationKey, scopeKeys, customerId);
         return new Result();
     }
 

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<AccessConfigOpesResultDTO> listOpesByRole(String roleId);
 
-    void saveRoleOpes(String roleId, List<AccessConfigOpesResultDTO> opes);
+    void saveRoleOpes(String roleId, List<AccessConfigOpesResultDTO> opes, String customerId);
 
     AccessConfigOptionsResultDTO listScopeOptionsForAccessConfig(String roleId, String operationKey);
 
-    void saveConfig(String roleId, String operationKey, Set<String> scopeKeys);
+    void saveConfig(String roleId, String operationKey, Set<String> scopeKeys, String customerId);
 
     List<RoleOperationDefaultResultDTO> listRoleDefaultOpsByRoleKey(String roleKey);
 

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<AccessConfigOpesResultDTO> opes) {
+    public void saveRoleOpes(String roleId, List<AccessConfigOpesResultDTO> opes, String customerId) {
         List<RoleOperationResultDTO> operationsDB = roleOperationDao.listOperationsByRoleId(roleId);
         Set<String> opeKeysDB = operationsDB.stream().map(opeDB -> opeDB.getOperationKey()).collect(Collectors.toSet());
         Set<String> 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<String> scopeKeys) {
+    public void saveConfig(String roleId, String operationKey, Set<String> scopeKeys, String customerId) {
         List<RoleScopeEntity> scopesDB = roleScopeDao.listScopeEntities(roleId, operationKey);
         // 数据库中已有的scopeKey列表
         Set<String> 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);
                 }
             });