diff --git a/muyu-source-server/src/main/java/com/muyu/source/controller/DataValueController.java b/muyu-source-server/src/main/java/com/muyu/source/controller/DataValueController.java index 81c21a0..2c21d0d 100644 --- a/muyu-source-server/src/main/java/com/muyu/source/controller/DataValueController.java +++ b/muyu-source-server/src/main/java/com/muyu/source/controller/DataValueController.java @@ -30,8 +30,7 @@ public class DataValueController { /** * 根据基础表ID和SQL语句查询数据 * - * @param basicId 基础表ID - * @param sql SQL语句 + * @param dataValueModel 基础表ID和sql语句 * @return DataValue{kltv} */ @PostMapping("/findTableValue") diff --git a/muyu-source-server/src/main/java/com/muyu/source/controller/TableInfoController.java b/muyu-source-server/src/main/java/com/muyu/source/controller/TableInfoController.java index b0dbc05..0c02dd6 100644 --- a/muyu-source-server/src/main/java/com/muyu/source/controller/TableInfoController.java +++ b/muyu-source-server/src/main/java/com/muyu/source/controller/TableInfoController.java @@ -258,6 +258,4 @@ public class TableInfoController { } return Result.success(tableInfoList); } - - } diff --git a/muyu-source-server/src/main/java/com/muyu/source/service/Impl/DataSourceServiceImpl.java b/muyu-source-server/src/main/java/com/muyu/source/service/Impl/DataSourceServiceImpl.java index eb5431b..2c7ad1a 100644 --- a/muyu-source-server/src/main/java/com/muyu/source/service/Impl/DataSourceServiceImpl.java +++ b/muyu-source-server/src/main/java/com/muyu/source/service/Impl/DataSourceServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.source.domain.AssetAuthorization; import com.muyu.source.domain.DataSource; import com.muyu.source.domain.Structure; import com.muyu.source.domain.TableInfo; @@ -46,6 +47,8 @@ public class DataSourceServiceImpl extends ServiceImpl() {{ + eq(TableInfo::getBasicId, etlDataScore.getId()); + }}); + //如果存在就删除 + if(StringUtils.isNotNull(tableInfoServiceOne)){ + List list = tableInfoService.list(new LambdaQueryWrapper<>() {{ + eq(TableInfo::getBasicId, etlDataScore.getId()); + }}); + list.forEach(tableInfo -> { + structureService.remove(new LambdaQueryWrapper<>(){{ + eq(Structure::getTableId, tableInfo.getId()); + }}); + }); + tableInfoService.remove(new LambdaQueryWrapper<>(){{ + eq(TableInfo::getBasicId, etlDataScore.getId()); + }}); + assetAuthorizationService.remove(new LambdaQueryWrapper<>(){{ + eq(AssetAuthorization::getTableId, tableInfoServiceOne.getId()) + .eq(AssetAuthorization::getBasicId, etlDataScore.getId()); + }}); + } TableInfo tableInfoInsert = TableInfo.builder() .basicId(etlDataScore.getId())