diff --git a/muyu-source-server/src/main/java/com/muyu/source/controller/DictDataController.java b/muyu-source-server/src/main/java/com/muyu/source/controller/DictDataController.java index 0e1ed5f..395e2df 100644 --- a/muyu-source-server/src/main/java/com/muyu/source/controller/DictDataController.java +++ b/muyu-source-server/src/main/java/com/muyu/source/controller/DictDataController.java @@ -10,6 +10,8 @@ import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @author Lenovo * @ Tool:IntelliJ IDEA @@ -20,7 +22,7 @@ import org.springframework.web.bind.annotation.*; */ @Log4j2 @RestController -@RequestMapping("/dict_data") +@RequestMapping("/dictData") @Tag(name = "数据字典控制层", description = "进行数据字典管理,查看等相关操作") public class DictDataController { public DictDataController() { @@ -30,6 +32,16 @@ public class DictDataController { @Autowired private DictDataService dictDataService; + /** + * 查询字典数据 + * @return 查询结果 + */ + @GetMapping("/selectDictDataList") + public Result> selectDictDataList() { + List list = dictDataService.list(); + return Result.success(list); + } + /** * 添加字典数据 * 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 d97d62a..75f68c8 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 @@ -137,19 +137,24 @@ public class DataSourceServiceImpl extends ServiceImpl() {{ eq(AssetDataSource::getId, dataSource.getId()); }}); - //如果存在 删除 + //如果存在则进行删除 if (StringUtils.isNotNull(dataSourceServiceOne)) { + // 根据资产数据源ID查询所有的表 List childrenList = childrenService.list(new LambdaQueryWrapper<>() {{ eq(Children::getAssetId, dataSourceServiceOne.getId()); }}); + childrenList.forEach(children -> { + //删除表结构中表的所有数据 tableDataService.remove(new LambdaQueryWrapper<>() {{ eq(TableData::getChildrenId, children.getId()); }}); }); + // 删除数据库结构中所有的数据 childrenService.remove(new LambdaQueryWrapper<>() {{ eq(Children::getAssetId, dataSourceServiceOne.getId()); }}); @@ -163,9 +168,11 @@ public class DataSourceServiceImpl extends ServiceImpl childrenList = addChildren(build); + //循环遍历添加表结构的数据 字段 childrenList.forEach(children -> { addTable(build, children.getName()); });