|
@@ -6,13 +6,11 @@
|
|
package com.aizuda.boot.modules.system.service.impl;
|
|
package com.aizuda.boot.modules.system.service.impl;
|
|
|
|
|
|
import com.aizuda.boot.modules.system.entity.SysResource;
|
|
import com.aizuda.boot.modules.system.entity.SysResource;
|
|
-import com.aizuda.boot.modules.system.entity.SysResourceApi;
|
|
|
|
import com.aizuda.boot.modules.system.entity.dto.ResourceDTO;
|
|
import com.aizuda.boot.modules.system.entity.dto.ResourceDTO;
|
|
import com.aizuda.boot.modules.system.entity.enums.ResourceType;
|
|
import com.aizuda.boot.modules.system.entity.enums.ResourceType;
|
|
import com.aizuda.boot.modules.system.entity.vo.MenuVO;
|
|
import com.aizuda.boot.modules.system.entity.vo.MenuVO;
|
|
import com.aizuda.boot.modules.system.entity.vo.ResourceTreeVO;
|
|
import com.aizuda.boot.modules.system.entity.vo.ResourceTreeVO;
|
|
import com.aizuda.boot.modules.system.mapper.SysResourceMapper;
|
|
import com.aizuda.boot.modules.system.mapper.SysResourceMapper;
|
|
-import com.aizuda.boot.modules.system.service.ISysResourceApiService;
|
|
|
|
import com.aizuda.boot.modules.system.service.ISysResourceService;
|
|
import com.aizuda.boot.modules.system.service.ISysResourceService;
|
|
import com.aizuda.boot.modules.system.service.ISysRoleResourceService;
|
|
import com.aizuda.boot.modules.system.service.ISysRoleResourceService;
|
|
import com.aizuda.core.api.ApiAssert;
|
|
import com.aizuda.core.api.ApiAssert;
|
|
@@ -23,7 +21,6 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
@@ -38,7 +35,6 @@ import java.util.*;
|
|
@Service
|
|
@Service
|
|
@AllArgsConstructor
|
|
@AllArgsConstructor
|
|
public class SysResourceServiceImpl extends BaseServiceImpl<SysResourceMapper, SysResource> implements ISysResourceService {
|
|
public class SysResourceServiceImpl extends BaseServiceImpl<SysResourceMapper, SysResource> implements ISysResourceService {
|
|
- private ISysResourceApiService sysResourceApiService;
|
|
|
|
private ISysRoleResourceService sysRoleResourceService;
|
|
private ISysRoleResourceService sysRoleResourceService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -159,21 +155,6 @@ public class SysResourceServiceImpl extends BaseServiceImpl<SysResourceMapper, S
|
|
ApiAssert.isEmpty(dto.getId(), "主键不存在无法更新");
|
|
ApiAssert.isEmpty(dto.getId(), "主键不存在无法更新");
|
|
SysResource sysResource = dto.convert(SysResource.class);
|
|
SysResource sysResource = dto.convert(SysResource.class);
|
|
ApiAssert.fail(!super.updateById(sysResource), "更新失败");
|
|
ApiAssert.fail(!super.updateById(sysResource), "更新失败");
|
|
- // 保存资源接口
|
|
|
|
- List<SysResourceApi> apiList = dto.getApiList();
|
|
|
|
- if (CollectionUtils.isNotEmpty(apiList)) {
|
|
|
|
- // 移除空字符串
|
|
|
|
- apiList = apiList.stream().filter(t -> StringUtils.isNoneBlank(t.getUrl()) && StringUtils.isNoneBlank(t.getCode())).toList();
|
|
|
|
- if (CollectionUtils.isNotEmpty(apiList)) {
|
|
|
|
- sysResourceApiService.removeByResourceId(dto.getId());
|
|
|
|
- apiList.forEach(t -> {
|
|
|
|
- t.setResourceId(dto.getId());
|
|
|
|
- t.setUrl(t.getUrl().trim());
|
|
|
|
- t.setCode(t.getCode().trim());
|
|
|
|
- });
|
|
|
|
- ApiAssert.fail(!sysResourceApiService.saveBatch(apiList), "接口权限保存失败");
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
}
|