feat: database数据表查询

src/main/java/cn/com/poc/common/utils/DatabaseUtil.java

@@ -19,7 +19,7 @@ public class DatabaseUtil {
 
     private static Logger logger = LoggerFactory.getLogger(DatabaseUtil.class);
 
-    private static final String DRIVER_NAME = "com.mysql.cj.jdbc.Driver";
+    private static final String DRIVER_NAME = "com.mysql.jdbc.Driver";
 
     private static final int CONNECT_TIMEOUT = 5000; // 连接超时时间（毫秒）
 

src/main/java/cn/com/poc/knowledge/rest/impl/DatabaseRestImpl.java

@@ -80,7 +80,7 @@ public class DatabaseRestImpl implements DatabaseRest {
         Long userId = userBaseEntity.getUserId();
 
         BizKnowledgeDatabaseEntity bizKnowledgeDatabaseEntity = bizKnowledgeDatabaseService.get(id.longValue());
-        if (bizKnowledgeDatabaseEntity == null && !bizKnowledgeDatabaseEntity.getMemberId().equals(userId.intValue())) {
+        if (bizKnowledgeDatabaseEntity == null || !bizKnowledgeDatabaseEntity.getMemberId().equals(userId.intValue())) {
             throw new BusinessException("no database found");
         }
         BizKnowledgeDatabaseDto bizKnowledgeDatabaseDto = BizKnowledgeDatabaseConvert.entityToDto(bizKnowledgeDatabaseEntity);
@@ -108,7 +108,7 @@ public class DatabaseRestImpl implements DatabaseRest {
         List<BizKnowledgeDatabaseDto> result = new ArrayList<>();
         for (Integer id : ids) {
             BizKnowledgeDatabaseEntity bizKnowledgeDatabaseEntity = bizKnowledgeDatabaseService.get(id.longValue());
-            if (bizKnowledgeDatabaseEntity == null && !bizKnowledgeDatabaseEntity.getMemberId().equals(userId.intValue())) {
+            if (bizKnowledgeDatabaseEntity == null || !bizKnowledgeDatabaseEntity.getMemberId().equals(userId.intValue())) {
                 continue;
             }
             BizKnowledgeDatabaseDto bizKnowledgeDatabaseDto = BizKnowledgeDatabaseConvert.entityToDto(bizKnowledgeDatabaseEntity);
@@ -142,13 +142,9 @@ public class DatabaseRestImpl implements DatabaseRest {
         List<KnowledgeDatabaseQueryInfoQueryItem> items = bizKnowledgeDatabaseService.queryKnowledgeDatabaseQueryInfo(condition, pagingInfo);
         List<BizKnowledgeDatabaseDto> result = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(items)) {
-            result = items.stream().map(
-                    item -> {
-                        BizKnowledgeDatabaseDto bizKnowledgeDatabaseDto =
-                                BizKnowledgeDatabaseConvert.itemToDto(item);
-
-                        List<DatabaseUtil.TableInfo> tableInfos = DatabaseTableInfoCache.getCache(item.getId().intValue());
-
+            for (KnowledgeDatabaseQueryInfoQueryItem item : items) {
+                BizKnowledgeDatabaseDto bizKnowledgeDatabaseDto = BizKnowledgeDatabaseConvert.itemToDto(item);
+                List<DatabaseUtil.TableInfo> tableInfos = DatabaseTableInfoCache.getCache(bizKnowledgeDatabaseDto.getId().intValue());
                 if (tableInfos == null) {
                     tableInfos = DatabaseUtil.getTableInfo(item.getDbHost(),
                             item.getDbPort(),
@@ -156,14 +152,13 @@ public class DatabaseRestImpl implements DatabaseRest {
                             item.getDbPassword(),
                             item.getDbName());
                     if (tableInfos == null) {
-                                return null;
+                        continue;
                     }
-                            bizKnowledgeDatabaseDto.setTableInfos(tableInfos);
-                            DatabaseTableInfoCache.updateOrSaveCache(item.getId().intValue(), tableInfos);
                 }
-                        return bizKnowledgeDatabaseDto;
+                bizKnowledgeDatabaseDto.setTableInfos(tableInfos);
+                DatabaseTableInfoCache.updateOrSaveCache(bizKnowledgeDatabaseDto.getId().intValue(), tableInfos);
+                result.add(bizKnowledgeDatabaseDto);
             }
-            ).collect(Collectors.toList());
         }
         return result;
     }
@@ -216,7 +211,7 @@ public class DatabaseRestImpl implements DatabaseRest {
         UserBaseEntity userBaseEntity = BlContext.getCurrentUserNotException();
         Long userId = userBaseEntity.getUserId();
         BizKnowledgeDatabaseEntity bizKnowledgeDatabaseEntity = bizKnowledgeDatabaseService.get(id.longValue());
-        if (bizKnowledgeDatabaseEntity == null && !bizKnowledgeDatabaseEntity.getMemberId().equals(userId.intValue())) {
+        if (bizKnowledgeDatabaseEntity == null || !bizKnowledgeDatabaseEntity.getMemberId().equals(userId.intValue())) {
             throw new BusinessException("no database found");
         }
         List<DatabaseUtil.TableInfo> tableInfos = DatabaseUtil.getTableInfo(bizKnowledgeDatabaseEntity.getDbHost(),