Add Support Type Query

chat2db-jerry · chat2db-jerry · commit b15f1acff023 · 2023-08-26T16:08:11.000+08:00
diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/DataSourceController.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/DataSourceController.java
@@ -63,6 +63,10 @@
 @Slf4j
 public class DataSourceController {
 
+    private static final DataSourceSelector DATA_SOURCE_SELECTOR= DataSourceSelector.builder()
+        .environment(Boolean.TRUE)
+        .build();
+
     @Autowired
     private DataSourceService dataSourceService;
 
@@ -166,7 +170,7 @@ public ActionResult closeConsole(@Valid @NotNull ConsoleCloseRequest request) {
     @GetMapping("/datasource/list")
     public WebPageResult<DataSourceVO> list(DataSourceQueryRequest request) {
         DataSourcePageQueryParam param = dataSourceWebConverter.queryReq2param(request);
-        PageResult<DataSource> result = dataSourceService.queryPage(param, new DataSourceSelector());
+        PageResult<DataSource> result = dataSourceService.queryPageWithPermission(param, DATA_SOURCE_SELECTOR);
         List<DataSourceVO> dataSourceVOS = dataSourceWebConverter.dto2vo(result.getData());
         return WebPageResult.of(dataSourceVOS, result.getTotal(), result.getPageNo(), result.getPageSize());
     }
diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/vo/DataSourceVO.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/vo/DataSourceVO.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import ai.chat2db.server.common.api.controller.vo.SimpleEnvironmentVO;
 import ai.chat2db.spi.config.DriverConfig;
 import ai.chat2db.spi.model.KeyValue;
 import ai.chat2db.spi.model.SSHInfo;
@@ -99,4 +100,9 @@ public class DataSourceVO {
      * 驱动配置
      */
     private DriverConfig driverConfig;
+
+    /**
+     * 环境
+     */
+    private SimpleEnvironmentVO environment;
 }
