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 088625d..0c4d786 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 @@ -61,17 +61,16 @@ public class DataRunNameController { /** * 数据类型转换 - * @param basicId 数据类型转换ID + * @par 数据类型转换ID * @return 返回结果 */ @PostMapping("/findTableValue") @Operation(summary = "获取数据库名",description = "返回所有数据库以及所有表的结果集") public Result> findTableValue( - @RequestParam(name = "basicId") String basicId, @RequestParam(name = "dataId") String dataId, @RequestParam(name = "tableName") String tableName ){ - return Result.success(dataRunNameService.findTableValue(basicId,dataId,tableName)); + return Result.success(dataRunNameService.findTableValue(dataId,tableName)); } } 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 8124a2e..b890c80 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 @@ -35,8 +35,8 @@ public interface DataRunNameService { /** * 数据类型转换 - * @param basicId 数据类型转换ID + * @paracId 数据类型转换ID * @return 返回结果 */ - List findTableValue(String basicId, String dataId,String tableName); + List findTableValue( String dataId,String tableName); } 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 08ef2c6..e54b72b 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 @@ -147,14 +147,14 @@ public class DataRunNameServiceImpl implements DataRunNameService { /** * 数据类型转换 - * @param basicId 数据类型转换ID + * @para 数据类型转换ID * @return 返回结果 */ @Override - public List findTableValue(String basicId, String dataId,String tableName) { + public List findTableValue( String dataId,String tableName) { DataName byId = dataNameService.getById(dataId); MySqlQuery mySqlQuery = new MySqlQuery(); - mySqlQuery.setDataSourceId(String.valueOf(basicId)); + DruidDataSource connRs1 = JdbcHelper.getConnRs(byId.getName()); DruidPooledConnection conn = null; try {