From c8aee7b9bfd79cfd741d7e5692520f4f51a31a86 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期一, 18 五月 2020 18:30:01 +0800
Subject: [PATCH] bak 修改 获取版本数据前
---
src/main/java/com/highdatas/mdm/controller/SysAssembleDbController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/SysAssembleDbController.java b/src/main/java/com/highdatas/mdm/controller/SysAssembleDbController.java
index 2468dde..b4be4fb 100644
--- a/src/main/java/com/highdatas/mdm/controller/SysAssembleDbController.java
+++ b/src/main/java/com/highdatas/mdm/controller/SysAssembleDbController.java
@@ -17,6 +17,7 @@
import com.highdatas.mdm.service.ISysAssembleService;
import com.highdatas.mdm.util.Constant;
import com.highdatas.mdm.util.DbUtils;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -39,6 +40,7 @@
* @since 2020-02-19
*/
@RestController
+@Slf4j
@RequestMapping("/assemble/db")
public class SysAssembleDbController {
@Autowired
@@ -112,17 +114,20 @@
String username = sysAssembleDb.getDatasourceUser();
connection = dbService.getConnection(id);
DatabaseMetaData metaData = connection.getMetaData();
- ResultSet tables = metaData.getTables( null, username.toUpperCase(), null, new String[]{ "TABLE" } );
+ String dbStr = sysAssembleDb.toString();
+ log.info(dbStr);
+ ResultSet tables = metaData.getTables(null, "%", "%", new String[]{ "TABLE" } );
ArrayList<String> tableNameList = new ArrayList<>();
while (tables.next()) {
String tableName = tables.getString(Constant.TABLE_NAME);
+ log.info(tableName);
tableNameList.add(tableName);
}
+
List<SysAssembleDbTable> tableList = dbTableService.selectList(new EntityWrapper<SysAssembleDbTable>().eq(Constant.PARENT_ID, id));
List<String> selectedTableNameList = tableList.stream().map(sysAssembleDbTable -> sysAssembleDbTable.getTableName()).collect(Collectors.toList());
List<String> result = tableNameList.stream().filter(s -> !selectedTableNameList.contains(s)).collect(Collectors.toList());
-
return Result.success(result);
}
--
Gitblit v1.8.0