diff --git a/cloud-property-server/src/main/java/com/muyu/server/controller/DataRunNameController.java b/cloud-property-server/src/main/java/com/muyu/server/controller/DataRunNameController.java index 84d1d27..65c15a5 100644 --- a/cloud-property-server/src/main/java/com/muyu/server/controller/DataRunNameController.java +++ b/cloud-property-server/src/main/java/com/muyu/server/controller/DataRunNameController.java @@ -120,15 +120,7 @@ public class DataRunNameController { return success(list); } - /** - * 获取授权的用户表或者部门 闪闪 - * @return 返回结果 - */ - @PostMapping("/extractDataTableNames") - public Result extractDataTableNames(@RequestBody AssetAuthorization assetAuthorization){ - List list = dataRunNameService.extractDataTableNames(assetAuthorization); - return success(list); - } + /** * 添加用户权限的信息 diff --git a/cloud-property-server/src/main/java/com/muyu/server/service/DataRunNameService.java b/cloud-property-server/src/main/java/com/muyu/server/service/DataRunNameService.java index afc7746..972eb8d 100644 --- a/cloud-property-server/src/main/java/com/muyu/server/service/DataRunNameService.java +++ b/cloud-property-server/src/main/java/com/muyu/server/service/DataRunNameService.java @@ -67,15 +67,9 @@ public interface DataRunNameService { */ List selectDeptList(SysDept dept); - /** - * 获取授权的用户表或者部门 闪闪 - * @return 返回结果 - */ - List extractDataTableNames(AssetAuthorization assetAuthorization); - /** * 添加用户权限的信息 - * @param req 相应参数 + * @param authorization 相应参数 * @return 返回结果 */ boolean addUserAssetAuthorization(AssetAuthorization authorization); diff --git a/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java b/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java index 64bb763..9f7f19e 100644 --- a/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java +++ b/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java @@ -442,104 +442,6 @@ public class DataRunNameServiceImpl implements DataRunNameService { return dataRunNameMapper.selectDeptList(dept); } - /** - * 获取授权的用户表或者部门 闪闪 - * @return 返回结果 - */ - @Override - public List extractDataTableNames(AssetAuthorization assetAuthorization) { - - - HashSet hashSet = new HashSet<>(); - tableIdAndBasicIdByUserId.forEach(assetAuthorization1 -> { - //获取资产信息中的基本ID - Integer basicId = assetAuthorization1.getBasicId(); - //获取资产信息中的表ID - Integer tableId = assetAuthorization1.getTableId(); - - //如果当前表ID主键不为空,则进行查询 - if (null != tableId) { - //调用服务方法,根据表ID获取TableInfo对象 - TableNames tableInfoById = tableRunNameService.getById(tableId); - //将查询到的TableInfo对象添加到HashSet集合中 - hashSet.add(tableInfoById); - //获取TableInfo对象的父ID - Integer parentId = tableInfoById.getId(); - //如果父ID不为空,则根据父ID查询父TableInfo对象 - TableNames tableInfoByIdParentId = tableRunNameService.getById(parentId); - //将父TableInfo对象添加到HashSet集合中 - hashSet.add(tableInfoByIdParentId); - } - hashSet.forEach(tableNames -> { - HashSet tableFies = new HashSet<>(); - //如果基本原来表的ID不为空,则进行查询 - if (null != basicId) { - //创建一个LambdaQueryWrapper,用于构建查询条件 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - //添加查询条件,筛选出基本ID等于当前基本ID的TableInfo对象 - queryWrapper.eq(TableFie::getId, basicId); - //调用服务方法,获取符合条件的TableInfo列表 - List tableInfoBasicIdList = tableFieldService.list(queryWrapper); - //将查询结果添加到HashSet集合中 - tableFies.addAll(tableInfoBasicIdList); - ArrayList fieArrayList = new ArrayList<>(); - fieArrayList.addAll(tableFies); - tableNames.setTableFie(fieArrayList); - } - }); - }); - //遍历包含用户授权信息的集合,这个集合可能是根据部门ID获取的 - idByDeptId.forEach(assetAuthorization1 -> { - //获取资产信息中的基本ID - Integer basicId = assetAuthorization1.getBasicId(); - //获取资产信息中的表ID - Integer tableId = assetAuthorization1.getTableId(); - - //如果当前表ID主键不为空,则进行查询 - if (null != tableId) { - //调用服务方法,根据表ID获取TableInfo对象 - TableNames tableInfoById = tableRunNameService.getById(tableId); - //将查询到的TableInfo对象添加到HashSet集合中 - hashSet.add(tableInfoById); - //获取TableInfo对象的父ID - Integer parentId = tableInfoById.getId(); - //如果父ID不为空,则根据父ID查询父TableInfo对象 - TableNames tableInfoByIdParentId = tableRunNameService.getById(parentId); - //将父TableInfo对象添加到HashSet集合中 - hashSet.add(tableInfoByIdParentId); - } - hashSet.forEach(tableNames -> { - HashSet tableFies = new HashSet<>(); - //如果基本原来表的ID不为空,则进行查询 - if (null != basicId) { - //创建一个LambdaQueryWrapper,用于构建查询条件 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - //添加查询条件,筛选出基本ID等于当前基本ID的TableInfo对象 - queryWrapper.eq(TableFie::getId, basicId); - //调用服务方法,获取符合条件的TableInfo列表 - List tableInfoBasicIdList = tableFieldService.list(queryWrapper); - //将查询结果添加到HashSet集合中 - tableFies.addAll(tableInfoBasicIdList); - ArrayList fieArrayList = new ArrayList<>(); - fieArrayList.addAll(tableFies); - tableNames.setTableFie(fieArrayList); - } - }); - }); - List list = hashSet.stream().filter(tableNames -> tableNames.getId() == 0) - .map(tableNames -> { - tableNames.tableNamesBuild(tableNames); - ArrayList tableFie = tableNames.getTableFie(); - tableFie.stream().filter(tableFie1 -> tableFie1.getId() == 0) - .map(tableFie1 -> { - return tableFie1.customerBuildName(tableFie1); - }); - return tableNames; - }) - .toList(); - return list; - } - /** * 添加用户权限的信息 * @param authorization 相应参数