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 ea26b56..088625d 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 @@ -66,8 +66,12 @@ public class DataRunNameController { */ @PostMapping("/findTableValue") @Operation(summary = "获取数据库名",description = "返回所有数据库以及所有表的结果集") - public Result> findTableValue(@RequestParam(name = "basicId") String basicId,@RequestParam(name = "dataId") String dataId){ + 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)); + return Result.success(dataRunNameService.findTableValue(basicId,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 27d2ad9..8124a2e 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 @@ -38,5 +38,5 @@ public interface DataRunNameService { * @param basicId 数据类型转换ID * @return 返回结果 */ - List findTableValue(String basicId, String dataId); + List findTableValue(String basicId, 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 04eb0f1..9732bb8 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 @@ -151,7 +151,7 @@ public class DataRunNameServiceImpl implements DataRunNameService { * @return 返回结果 */ @Override - public List findTableValue(String basicId, String dataId) { + public List findTableValue(String basicId, String dataId,String tableName) { DataName byId = dataNameService.getById(dataId); MySqlQuery mySqlQuery = new MySqlQuery(); mySqlQuery.setDataSourceId(String.valueOf(basicId)); @@ -167,7 +167,7 @@ public class DataRunNameServiceImpl implements DataRunNameService { List list = new ArrayList<>(); try { - PreparedStatement preparedStatement = conn.prepareStatement("select field,type,annotation FROM tablefie WHERE table_id="+basicId); + PreparedStatement preparedStatement = conn.prepareStatement("select field,type,annotation FROM "+tableName+" WHERE table_id="+basicId); ResultSet resultSet = preparedStatement.executeQuery(); ResultSetMetaData metaData = resultSet.getMetaData();