fix(iam): 完善对接

laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/ResourceDto.java

@@ -44,6 +44,11 @@ public class ResourceDto {
      */
     private String redirect;
 
+    /**
+     * 路径
+     */
+    private String url;
+
     /**
      * 类型(0:一级菜单; 1:子菜单:2:按钮权限)
      */

laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java

@@ -578,7 +578,6 @@ public class SyncIamService {
      * 角色创建
      */
     public BpmcResponseDto roleCreateService(RoleDto roleDto){
-        try {
         SysRole sysRole = new SysRole();
         sysRole.setId(roleDto.getId());
         sysRole.setRoleName(roleDto.getName());
@@ -591,11 +590,6 @@ public class SyncIamService {
         sysRole.setAppId(roleDto.getAppId());
 
         sysRoleService.save(sysRole);
-        } catch (Exception e){
-            e.printStackTrace();
-            return BpmcResponseDto.error(e.getMessage());
-        }
-
         return BpmcResponseDto.success();
     }
 
@@ -603,7 +597,6 @@ public class SyncIamService {
      * 角色更新
      */
     public BpmcResponseDto roleUpdateService(RoleDto roleDto){
-        try {
         if (CharSequenceUtil.isEmpty(roleDto.getId())){
             return BpmcResponseDto.error("角色id为空，无法更新");
         }
@@ -639,10 +632,6 @@ public class SyncIamService {
         }
 
         sysRoleService.updateById(sysRole);
-        } catch (Exception e){
-            e.printStackTrace();
-            return BpmcResponseDto.error(e.getMessage());
-        }
 
         return BpmcResponseDto.success();
     }
@@ -651,16 +640,11 @@ public class SyncIamService {
      * 角色删除
      */
     public BpmcResponseDto roleDeleteService(RoleDto roleDto){
-        try {
         if (CharSequenceUtil.isEmpty(roleDto.getId())){
             return BpmcResponseDto.error("角色id为空，无法删除");
         }
 
         sysRoleService.deleteRole(roleDto.getId());
-        } catch (Exception e){
-            e.printStackTrace();
-            return BpmcResponseDto.error(e.getMessage());
-        }
 
         return BpmcResponseDto.success();
     }
@@ -669,7 +653,6 @@ public class SyncIamService {
      * 菜单创建
      */
     public BpmcResponseDto resourceCreateService(ResourceDto resourceDto){
-        try {
         SysPermission sysPermission = new SysPermission();
         sysPermission.setId(resourceDto.getId());
         if (StringUtils.isNotBlank(resourceDto.getParentId())){
@@ -682,8 +665,11 @@ public class SyncIamService {
             sysPermission.setPerms(resourceDto.getCode());
         }
         sysPermission.setComponent(resourceDto.getComponent()); // 组件的路径
-            if (StringUtils.isNotBlank(resourceDto.getRedirect())){
+        if (CharSequenceUtil.isNotEmpty(resourceDto.getRedirect())){
-                sysPermission.setUrl(resourceDto.getRedirect()); // 地址栏显示的路径
+            sysPermission.setRedirect(resourceDto.getRedirect()); // 地址栏显示的路径
+        }
+        if (CharSequenceUtil.isNotEmpty(resourceDto.getUrl())){
+            sysPermission.setUrl(resourceDto.getUrl()); // 路径
         }
         sysPermission.setAppId(resourceDto.getAppId()); // appId
         if (!Objects.isNull(resourceDto.getSort())){
@@ -728,10 +714,6 @@ public class SyncIamService {
         sysPermission.setInternalOrExternal(resourceDto.getInternal_or_external() == 0 ? false : true);
 
         sysPermissionService.addPermission(sysPermission);
-        } catch (Exception e){
-            e.printStackTrace();
-            return BpmcResponseDto.error(e.getMessage());
-        }
 
         return BpmcResponseDto.success();
     }
@@ -769,7 +751,11 @@ public class SyncIamService {
         }
 
         if (CharSequenceUtil.isNotEmpty(resourceDto.getRedirect())){
-            sysPermission.setUrl(resourceDto.getRedirect()); // 地址栏显示的路径
+            sysPermission.setRedirect(resourceDto.getRedirect()); // 地址栏显示的路径
+        }
+
+        if (CharSequenceUtil.isNotEmpty(resourceDto.getUrl())){
+            sysPermission.setUrl(resourceDto.getUrl()); // 路径
         }
 
         if (resourceDto.getSort() != null){
@@ -822,17 +808,10 @@ public class SyncIamService {
      * 菜单删除(真实删除)
      */
     public BpmcResponseDto resourceDeleteService(ResourceDto resourceDto){
-        try {
         if (CharSequenceUtil.isEmpty(resourceDto.getId())){
             return BpmcResponseDto.error("菜单id为空，无法删除");
         }
-
         sysPermissionService.deletePermission(resourceDto.getId());
-        } catch (Exception e){
-            e.printStackTrace();
-            return BpmcResponseDto.error(e.getMessage());
-        }
-
         return BpmcResponseDto.success();
     }
 
@@ -840,7 +819,6 @@ public class SyncIamService {
      * 用户角色关联 创建（批量）
      */
     public BpmcResponseDto userRoleCreateService(List<UserRoleDto> userRoleDtoList){
-        try {
         List<SysUserRole> userRoleList = new ArrayList<>();
 
         for (UserRoleDto userRoleDto : userRoleDtoList){
@@ -868,10 +846,6 @@ public class SyncIamService {
             }
         }
         this.sysUserRoleService.saveBatch(userRoleList);
-        } catch (Exception e){
-            e.printStackTrace();
-            return BpmcResponseDto.error(e.getMessage());
-        }
 
         return BpmcResponseDto.success();
     }
@@ -880,9 +854,8 @@ public class SyncIamService {
      * 用户角色关联 刪除（批量）
      */
     public BpmcResponseDto userRoleDeleteService(List<UserRoleDto> userRoleDtoList){
-        try {
         for (UserRoleDto userRoleDto : userRoleDtoList){
-                QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<SysUserRole>();
+            QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
             // 根据 accountCode 字段（即用户名username） 从数据库里查出来用户id，在给到sysUserRole
             LoginUser userInfo = sysBaseAPI.getUserByName(userRoleDto.getAccountCode());
             if (userInfo == null){
@@ -894,11 +867,6 @@ public class SyncIamService {
 
             this.sysUserRoleService.remove(queryWrapper);
         }
-        } catch (Exception e){
-            e.printStackTrace();
-            return BpmcResponseDto.error(e.getMessage());
-        }
-
         return BpmcResponseDto.success();
     }
 
@@ -906,7 +874,6 @@ public class SyncIamService {
      * 角色菜单关联 创建（批量）
      */
     public BpmcResponseDto roleResourceCreateService(List<RoleResourceDto> roleResourceDtoList){
-        try {
         List<SysRolePermission> sysRolePermissionList = new ArrayList<>();
 
         for (RoleResourceDto roleResourceDto : roleResourceDtoList){
@@ -923,11 +890,6 @@ public class SyncIamService {
             sysRolePermissionList.add(sysRolePermission);
         }
         this.sysRolePermissionService.saveBatch(sysRolePermissionList);
-        } catch (Exception e){
-            e.printStackTrace();
-            return BpmcResponseDto.error(e.getMessage());
-        }
-
         return BpmcResponseDto.success();
     }
 
@@ -935,7 +897,6 @@ public class SyncIamService {
      * 用户角色关联 刪除（批量）
      */
     public BpmcResponseDto roleResourceDeleteService(List<RoleResourceDto> roleResourceDtoList){
-        try {
         for (RoleResourceDto roleResourceDto : roleResourceDtoList){
             QueryWrapper<SysRolePermission> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("permission_id", roleResourceDto.getAmId());
@@ -943,10 +904,6 @@ public class SyncIamService {
 
             this.sysRolePermissionService.remove(queryWrapper);
         }
-        } catch (Exception e){
-            e.printStackTrace();
-            return BpmcResponseDto.error(e.getMessage());
-        }
 
         return BpmcResponseDto.success();
     }